Eric Pouech : joy.cpl: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Fri Feb 11 14:33:57 CST 2022
Module: wine
Branch: master
Commit: 0b2fd91596081fb1ce679d2a960bf5aebb434157
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2fd91596081fb1ce679d2a960bf5aebb434157
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Fri Feb 11 08:41:05 2022 +0100
joy.cpl: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/joy.cpl/Makefile.in | 1 -
dlls/joy.cpl/main.c | 24 ++++++++++++------------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in
index 265f9e6add8..d9b2aff3724 100644
--- a/dlls/joy.cpl/Makefile.in
+++ b/dlls/joy.cpl/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = joy.cpl
IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index 8ea3892b750..3ecef2d9aa8 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -43,7 +43,7 @@ DECLSPEC_HIDDEN HMODULE hcpl;
*/
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)
{
@@ -297,7 +297,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
static struct JoystickData *data;
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)
{
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)
{
int i;
- TRACE("Ax (% 5d,% 5d,% 5d)\n", st->lX,st->lY, st->lZ);
- TRACE("RAx (% 5d,% 5d,% 5d)\n", st->lRx, st->lRy, st->lRz);
- TRACE("Slider (% 5d,% 5d)\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("Ax (% 5ld,% 5ld,% 5ld)\n", st->lX,st->lY, st->lZ);
+ TRACE("RAx (% 5ld,% 5ld,% 5ld)\n", st->lRx, st->lRy, st->lRz);
+ TRACE("Slider (% 5ld,% 5ld)\n", st->rglSlider[0], st->rglSlider[1]);
+ TRACE("Pov (% 5ld,% 5ld,% 5ld,% 5ld)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]);
TRACE("Buttons ");
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 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)
{
@@ -876,7 +876,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)
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;
}
@@ -903,7 +903,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
{
static HANDLE thread;
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)
{
@@ -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)
{
- 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)
{
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)
{
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)
{
@@ -1073,7 +1073,7 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2)
if (FAILED(hr))
{
- ERR("Failed to initialize DirectInput: 0x%08x\n", hr);
+ ERR("Failed to initialize DirectInput: 0x%08lx\n", hr);
return FALSE;
}
More information about the wine-cvs
mailing list