ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

joy.cpl: Enable compilation with long types. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-11 08:41:05 +01:00 committed by Alexandre Julliard
parent 097fc377e2
commit 0b2fd91596
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/joy.cpl/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = joy.cpl MODULE = joy.cpl
IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32

24
dlls/joy.cpl/main.c
View File

@ -43,7 +43,7 @@ DECLSPEC_HIDDEN HMODULE hcpl;
*/ */
BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
{ {
TRACE("(%p, %d, %p)\n", hdll, reason, reserved); TRACE("(%p, %ld, %p)\n", hdll, reason, reserved);
switch (reason) switch (reason)
{ {
@ -297,7 +297,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
static struct JoystickData *data; static struct JoystickData *data;
int sel; int sel;
TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
switch (msg) switch (msg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -417,10 +417,10 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
static void dump_joy_state(DIJOYSTATE* st) static void dump_joy_state(DIJOYSTATE* st)
{ {
int i; int i;
TRACE("Ax (% 5d,% 5d,% 5d)\n", st->lX,st->lY, st->lZ); TRACE("Ax (% 5ld,% 5ld,% 5ld)\n", st->lX,st->lY, st->lZ);
TRACE("RAx (% 5d,% 5d,% 5d)\n", st->lRx, st->lRy, st->lRz); TRACE("RAx (% 5ld,% 5ld,% 5ld)\n", st->lRx, st->lRy, st->lRz);
TRACE("Slider (% 5d,% 5d)\n", st->rglSlider[0], st->rglSlider[1]); TRACE("Slider (% 5ld,% 5ld)\n", st->rglSlider[0], st->rglSlider[1]);
TRACE("Pov (% 5d,% 5d,% 5d,% 5d)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]); TRACE("Pov (% 5ld,% 5ld,% 5ld,% 5ld)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]);
TRACE("Buttons "); TRACE("Buttons ");
for(i=0; i < TEST_MAX_BUTTONS; i++) for(i=0; i < TEST_MAX_BUTTONS; i++)
@ -616,7 +616,7 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
{ {
static HANDLE thread; static HANDLE thread;
static struct JoystickData *data; static struct JoystickData *data;
TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
switch (msg) switch (msg)
{ {
@ -876,7 +876,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)
if (FAILED(hr)) if (FAILED(hr))
{ {
FIXME("Failed to create effect with type %s, hr %#x\n", debugstr_guid(&pdei->guid), hr); FIXME("Failed to create effect with type %s, hr %#lx\n", debugstr_guid(&pdei->guid), hr);
return DIENUM_CONTINUE; return DIENUM_CONTINUE;
} }
@ -903,7 +903,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
{ {
static HANDLE thread; static HANDLE thread;
static struct JoystickData *data; static struct JoystickData *data;
TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
switch (msg) switch (msg)
{ {
@ -973,7 +973,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
*/ */
static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam) static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam)
{ {
TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
switch (msg) switch (msg)
{ {
case PSCB_INITIALIZED: case PSCB_INITIALIZED:
@ -1060,7 +1060,7 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data)
LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2)
{ {
static struct JoystickData data; static struct JoystickData data;
TRACE("(%p, %u, 0x%lx, 0x%lx)\n", hwnd, command, lParam1, lParam2); TRACE("(%p, %u, 0x%Ix, 0x%Ix)\n", hwnd, command, lParam1, lParam2);
switch (command) switch (command)
{ {
@ -1073,7 +1073,7 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2)
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Failed to initialize DirectInput: 0x%08x\n", hr); ERR("Failed to initialize DirectInput: 0x%08lx\n", hr);
return FALSE; return FALSE;
} }