- Wine-Commits - list.winehq.org

Zebediah Figura : ntoskrnl: Set SPDRP_CONFIGFLAGS in install_device_driver().
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: f801ac97fbcbef5618eadf1fb922a2d0f0873c4d URL: https://gitlab.winehq.org/wine/wine/-/commit/f801ac97fbcbef5618eadf1fb922a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:53:54 2022 -0600 ntoskrnl: Set SPDRP_CONFIGFLAGS in install_device_driver(). --- dlls/ntoskrnl.exe/pnp.c | 9 +++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 +++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index a70190db7ce..7c77a9a7145 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -256,6 +256,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN DIF_INSTALLDEVICE, DIF_NEWDEVICEWIZARD_FINISHINSTALL, }; + static const DWORD config_flags = 0; NTSTATUS status; unsigned int i; @@ -281,6 +282,14 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN sizeof_multiszW( ids ) * sizeof(WCHAR) ); ExFreePool( ids ); + /* Set the config flags. setupapi won't do this for us if we couldn't find + * a driver to install, but raw devices should still have this key + * populated. */ + + if (!SetupDiSetDeviceRegistryPropertyW( set, sp_device, SPDRP_CONFIGFLAGS, + (BYTE *)&config_flags, sizeof(config_flags) )) + ERR("Failed to set config flags, error %#lx.\n", GetLastError()); + if (!SetupDiBuildDriverInfoList( set, sp_device, SPDIT_COMPATDRIVER )) { ERR("Failed to build compatible driver list, error %#lx.\n", GetLastError()); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d2e02c7c130..02af7ca230b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1633,12 +1633,9 @@ static void test_pnp_devices(void) ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, &type, (BYTE *)&dword, sizeof(dword), NULL); - todo_wine ok(ret, "got error %#lx\n", GetLastError()); - if (ret) - { - ok(!dword, "got flags %#lx\n", dword); - ok(type == REG_DWORD, "got type %lu\n", type); - } + ok(ret, "got error %#lx\n", GetLastError()); + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVTYPE, &type, (BYTE *)&dword, sizeof(dword), NULL);

1 0

Zebediah Figura : d3dcompiler: Print message output with ERR() in D3DPreprocess().
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 7926253d821855db6312b5a8405260c115fa7dcd URL: https://gitlab.winehq.org/wine/wine/-/commit/7926253d821855db6312b5a8405260… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 4 19:35:15 2022 -0500 d3dcompiler: Print message output with ERR() in D3DPreprocess(). --- dlls/d3dcompiler_43/compiler.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ef7bde9aa7f..174fbc98280 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -235,8 +235,25 @@ static HRESULT preprocess_shader(const void *data, SIZE_T data_size, const char preprocess_info.include_context = include; ret = vkd3d_shader_preprocess(&compile_info, &byte_code, &messages); + + if (ret) + ERR("Failed to preprocess shader, vkd3d result %d.\n", ret); + if (messages) { + if (*messages && ERR_ON(d3dcompiler)) + { + const char *ptr = messages; + const char *line; + + ERR("Shader log:\n"); + while ((line = get_line(&ptr))) + { + ERR(" %.*s", (int)(ptr - line), line); + } + ERR("\n"); + } + if (messages_blob) { size_t size = strlen(messages);

1 0

Zebediah Figura : setupapi: Set SPDRP_CONFIGFLAGS in SetupDiInstallDevice().
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: b682102db4f685a818bbc9203f1f591c17e0a897 URL: https://gitlab.winehq.org/wine/wine/-/commit/b682102db4f685a818bbc9203f1f59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:50:46 2022 -0600 setupapi: Set SPDRP_CONFIGFLAGS in SetupDiInstallDevice(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53387 --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 +++------ dlls/setupapi/devinst.c | 5 +++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 948253608ae..d2e02c7c130 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1820,12 +1820,9 @@ static void test_pnp_driver(struct testsign_context *ctx) ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, &type, (BYTE *)&dword, sizeof(dword), NULL); - todo_wine ok(ret, "got error %#lx\n", GetLastError()); - if (ret) - { - ok(!dword, "got flags %#lx\n", dword); - ok(type == REG_DWORD, "got type %lu\n", type); - } + ok(ret, "got error %#lx\n", GetLastError()); + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); /* Tests. */ diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 896e77d9b38..ef7b4dccf0d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -5163,6 +5163,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + static const DWORD config_flags = 0; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; SC_HANDLE manager, service; @@ -5210,6 +5211,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) return FALSE; } + if (!SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CONFIGFLAGS, + (BYTE *)&config_flags, sizeof(config_flags))) + ERR("Failed to set config flags, error %#lx.\n", GetLastError()); + if (device->params.Flags & DI_NOFILECOPY) install_flags &= ~SPINST_FILES;

1 0

Zebediah Figura : d3dcompiler: Print message output with ERR() in D3DCompile2().
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: cee21cf3b8cf46233cfabf7556316cacf6b5a0ac URL: https://gitlab.winehq.org/wine/wine/-/commit/cee21cf3b8cf46233cfabf7556316c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 4 19:34:05 2022 -0500 d3dcompiler: Print message output with ERR() in D3DCompile2(). --- dlls/d3dcompiler_43/compiler.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index bb9b7ce54eb..ef7bde9aa7f 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -173,6 +173,23 @@ static void close_include(const struct vkd3d_shader_code *code, void *context) ID3DInclude_Close(iface, code->code); } +static const char *get_line(const char **ptr) +{ + const char *p, *q; + + p = *ptr; + if (!(q = strstr(p, "\n"))) + { + if (!*p) + return NULL; + *ptr += strlen(p); + return p; + } + *ptr = q + 1; + + return p; +} + static HRESULT preprocess_shader(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader_blob, ID3DBlob **messages_blob) @@ -486,8 +503,25 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen } ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); + + if (ret) + ERR("Failed to compile shader, vkd3d result %d.\n", ret); + if (messages) { + if (*messages && ERR_ON(d3dcompiler)) + { + const char *ptr = messages; + const char *line; + + ERR("Shader log:\n"); + while ((line = get_line(&ptr))) + { + ERR(" %.*s", (int)(ptr - line), line); + } + ERR("\n"); + } + if (messages_blob) { size_t size = strlen(messages);

1 0

Zebediah Figura : ntoskrnl/tests: Test retrieving SPDRP_CONFIGFLAGS.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 3a254079b9b609dd0b626a106240acb2aba5f814 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a254079b9b609dd0b626a106240ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:42:22 2022 -0600 ntoskrnl/tests: Test retrieving SPDRP_CONFIGFLAGS. --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6d8513ffa35..948253608ae 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1631,6 +1631,15 @@ static void test_pnp_devices(void) if (ret) ok(GetLastError() == ERROR_INVALID_DATA, "got error %#lx\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, + &type, (BYTE *)&dword, sizeof(dword), NULL); + todo_wine ok(ret, "got error %#lx\n", GetLastError()); + if (ret) + { + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); + } + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVTYPE, &type, (BYTE *)&dword, sizeof(dword), NULL); ok(!ret, "expected failure\n"); @@ -1740,6 +1749,7 @@ static void test_pnp_driver(struct testsign_context *ctx) SC_HANDLE manager, service; BOOL ret, need_reboot; HANDLE catalog, file; + DWORD dword, type; unsigned int i; HDEVINFO set; FILE *f; @@ -1798,11 +1808,25 @@ static void test_pnp_driver(struct testsign_context *ctx) ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(ret, "failed to register device, error %#lx\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, + &type, (BYTE *)&dword, sizeof(dword), NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "got error %#lx\n", GetLastError()); + GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); ret = UpdateDriverForPlugAndPlayDevicesA(NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot); ok(ret, "failed to install device, error %#lx\n", GetLastError()); ok(!need_reboot, "expected no reboot necessary\n"); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, + &type, (BYTE *)&dword, sizeof(dword), NULL); + todo_wine ok(ret, "got error %#lx\n", GetLastError()); + if (ret) + { + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); + } + /* Tests. */ test_pnp_devices();

1 0

Alexandre Julliard : winemac: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 34031227ca07d5d386ab7418fd39a031f7d14b99 URL: https://gitlab.winehq.org/wine/wine/-/commit/34031227ca07d5d386ab7418fd39a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 12:11:59 2022 +0100 winemac: Build without -DWINE_NO_LONG_TYPES. --- dlls/winemac.drv/Makefile.in | 1 - dlls/winemac.drv/dllmain.c | 8 +++---- dlls/winemac.drv/dragdrop.c | 36 +++++++++++++++---------------- dlls/winemac.drv/ime.c | 50 ++++++++++++++++++++++---------------------- 4 files changed, 47 insertions(+), 48 deletions(-)

1 0

Alexandre Julliard : wineandroid: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: e1de92208ef5d7f4f0cc7ef65e11442ffefb8610 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1de92208ef5d7f4f0cc7ef65e1144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 12:11:24 2022 +0100 wineandroid: Build without -DWINE_NO_LONG_TYPES. --- dlls/wineandroid.drv/Makefile.in | 1 - dlls/wineandroid.drv/device.c | 4 ++-- dlls/wineandroid.drv/dllmain.c | 4 ++-- dlls/wineandroid.drv/init.c | 6 +++--- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 22 +++++++++++----------- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 117534f975d..abd893db71f 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineandroid.drv UNIXLIB = wineandroid.so IMPORTS = ntoskrnl diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index b7292b5faf1..e50336c779c 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -675,7 +675,7 @@ static NTSTATUS android_error_to_status( int err ) } } -static int status_to_android_error( NTSTATUS status ) +static int status_to_android_error( unsigned int status ) { switch (status) { @@ -1147,7 +1147,7 @@ NTSTATUS android_dispatch_ioctl( void *arg ) } else { - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %x not supported\n", (int)irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; } return STATUS_SUCCESS; diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index b10491a22d8..ca3583b574f 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -74,14 +74,14 @@ static DWORD CALLBACK device_thread( void *arg ) NTSTATUS status; DWORD ret; - TRACE( "starting process %x\n", GetCurrentProcessId() ); + TRACE( "starting process %lx\n", GetCurrentProcessId() ); if (ANDROID_CALL( java_init, NULL )) return 0; /* not running under Java */ RtlInitUnicodeString( &nameW, driver_nameW ); if ((status = IoCreateDriver( &nameW, init_android_driver ))) { - FIXME( "failed to create driver error %x\n", status ); + FIXME( "failed to create driver error %lx\n", status ); return status; } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 4308725dcee..acf6b9abbbe 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -264,7 +264,7 @@ static BOOL CDECL ANDROID_DeleteDC( PHYSDEV dev ) */ LONG ANDROID_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ) { - FIXME( "(%p,%s,%p,0x%08x,%p)\n", displays, debugstr_w(primary_name), hwnd, flags, lpvoid ); + FIXME( "(%p,%s,%p,0x%08x,%p)\n", displays, debugstr_w(primary_name), hwnd, (int)flags, lpvoid ); return DISP_CHANGE_SUCCESSFUL; } @@ -320,8 +320,8 @@ BOOL ANDROID_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODE devmode->dmFields = DM_POSITION | DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; TRACE( "current mode -- %dx%d %d bpp @%d Hz\n", - devmode->dmPelsWidth, devmode->dmPelsHeight, - devmode->dmBitsPerPel, devmode->dmDisplayFrequency ); + (int)devmode->dmPelsWidth, (int)devmode->dmPelsHeight, + (int)devmode->dmBitsPerPel, (int)devmode->dmDisplayFrequency ); return TRUE; } diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 82035cc14dd..7c55c481353 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -812,7 +812,7 @@ INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) if (len) buffer[--len] = 0; } - TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); + TRACE( "lparam 0x%08x -> %s\n", (int)lparam, debugstr_w( buffer )); return len; } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 9406236a405..a339c20ceda 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -490,16 +490,16 @@ static int process_events( DWORD mask ) if (event->data.motion.input.u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN|MOUSEEVENTF_MIDDLEDOWN)) TRACE( "BUTTONDOWN pos %d,%d hwnd %p flags %x\n", - event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy, - event->data.motion.hwnd, event->data.motion.input.u.mi.dwFlags ); + (int)event->data.motion.input.u.mi.dx, (int)event->data.motion.input.u.mi.dy, + event->data.motion.hwnd, (int)event->data.motion.input.u.mi.dwFlags ); else if (event->data.motion.input.u.mi.dwFlags & (MOUSEEVENTF_LEFTUP|MOUSEEVENTF_RIGHTUP|MOUSEEVENTF_MIDDLEUP)) TRACE( "BUTTONUP pos %d,%d hwnd %p flags %x\n", - event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy, - event->data.motion.hwnd, event->data.motion.input.u.mi.dwFlags ); + (int)event->data.motion.input.u.mi.dx, (int)event->data.motion.input.u.mi.dy, + event->data.motion.hwnd, (int)event->data.motion.input.u.mi.dwFlags ); else TRACE( "MOUSEMOVE pos %d,%d hwnd %p flags %x\n", - event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy, - event->data.motion.hwnd, event->data.motion.input.u.mi.dwFlags ); + (int)event->data.motion.input.u.mi.dx, (int)event->data.motion.input.u.mi.dy, + event->data.motion.hwnd, (int)event->data.motion.input.u.mi.dwFlags ); if (!capture && (event->data.motion.input.u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE)) { RECT rect; @@ -735,8 +735,8 @@ static void android_surface_flush( struct window_surface *window_surface ) TRACE( "flushing %p hwnd %p surface %s rect %s bits %p alpha %02x key %08x region %u rects\n", surface, surface->hwnd, wine_dbgstr_rect( &surface->header.rect ), - wine_dbgstr_rect( &rect ), surface->bits, surface->alpha, surface->color_key, - surface->region_data ? surface->region_data->rdh.nCount : 0 ); + wine_dbgstr_rect( &rect ), surface->bits, surface->alpha, (int)surface->color_key, + surface->region_data ? (int)surface->region_data->rdh.nCount : 0 ); rc.left = rect.left; rc.top = rect.top; @@ -1302,7 +1302,7 @@ BOOL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, TRACE( "win %p window %s client %s style %08x flags %08x\n", hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), - NtUserGetWindowLongW( hwnd, GWL_STYLE ), swp_flags ); + (int)NtUserGetWindowLongW( hwnd, GWL_STYLE ), swp_flags ); if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return TRUE; @@ -1351,7 +1351,7 @@ void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, struct window_surface *surface ) { struct android_win_data *data; - DWORD new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); + UINT new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); HWND owner = 0; if (!(data = get_win_data( hwnd ))) return; @@ -1665,7 +1665,7 @@ LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) } return 0; default: - FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); + FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (long)wp, lp ); return 0; } }

1 0

Alexandre Julliard : winecrt0: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: e85f5aa6de9779aa3e61b958ee569da30e8adc37 URL: https://gitlab.winehq.org/wine/wine/-/commit/e85f5aa6de9779aa3e61b958ee569d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 10:23:26 2022 +0100 winecrt0: Build without -DWINE_NO_LONG_TYPES. --- dlls/winecrt0/Makefile.in | 1 - dlls/winecrt0/debug.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6915e69eb4b..17da4da29c6 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES STATICLIB = libwinecrt0.a C_SRCS = \ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 918fb67b140..2ac4505fb85 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -191,11 +191,11 @@ static int __cdecl fallback__wine_dbg_header( enum __wine_debug_class cls, if (TRACE_ON(timestamp)) { - ULONG ticks = GetTickCount(); + UINT ticks = GetTickCount(); pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); } - if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); - pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", (UINT)GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", (UINT)GetCurrentThreadId() ); if (function && cls < ARRAY_SIZE( debug_classes )) snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", debug_classes[cls], channel->name, function );

1 0

Alexandre Julliard : wineusb.sys: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 46341ec62b2baff1c67812a26c63c74f15bb3c04 URL: https://gitlab.winehq.org/wine/wine/-/commit/46341ec62b2baff1c67812a26c63c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 11:17:42 2022 +0100 wineusb.sys: Build without -DWINE_NO_LONG_TYPES. --- dlls/wineusb.sys/Makefile.in | 1 - dlls/wineusb.sys/unixlib.c | 2 +- dlls/wineusb.sys/wineusb.c | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index 66a9f56b213..a7c93f24c8e 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineusb.sys UNIXLIB = wineusb.so IMPORTS = ntoskrnl diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index f2356fcb06a..f269d3e96fd 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -502,7 +502,7 @@ static NTSTATUS usb_submit_urb(void *args) if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) req_type |= LIBUSB_ENDPOINT_IN; if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN) - FIXME("Unhandled flags %#x.\n", req->TransferFlags); + FIXME("Unhandled flags %#x.\n", (int)req->TransferFlags); if (req->TransferBufferMDL) FIXME("Unhandled MDL output buffer.\n"); diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 2f918cdeeb7..63b723503c9 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -119,7 +119,7 @@ static void add_unix_device(const struct usb_add_device_event *event) if ((status = IoCreateDevice(driver_obj, sizeof(*device), &string, FILE_DEVICE_USB, 0, FALSE, &device_obj))) { - ERR("Failed to create device, status %#x.\n", status); + ERR("Failed to create device, status %#lx.\n", status); return; } @@ -586,7 +586,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp NTSTATUS status = STATUS_NOT_IMPLEMENTED; BOOL removed; - TRACE("device_obj %p, irp %p, code %#x.\n", device_obj, irp, code); + TRACE("device_obj %p, irp %p, code %#lx.\n", device_obj, irp, code); EnterCriticalSection(&wineusb_cs); removed = device->removed; @@ -606,7 +606,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp break; default: - FIXME("Unhandled ioctl %#x (device %#x, access %#x, function %#x, method %#x).\n", + FIXME("Unhandled ioctl %#lx (device %#lx, access %#lx, function %#lx, method %#lx).\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); } @@ -626,7 +626,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *p if ((ret = IoCreateDevice(driver, 0, NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &bus_fdo))) { - ERR("Failed to create FDO, status %#x.\n", ret); + ERR("Failed to create FDO, status %#lx.\n", ret); return ret; } @@ -652,7 +652,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) if ((status = NtQueryVirtualMemory(GetCurrentProcess(), instance, MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL))) { - ERR("Failed to initialize Unix library, status %#x.\n", status); + ERR("Failed to initialize Unix library, status %#lx.\n", status); return status; }

1 0

Alexandre Julliard : opengl32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: ce951c9ca73aff0adfdc46fed854993fdc4f16bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ce951c9ca73aff0adfdc46fed85499… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 11:14:28 2022 +0100 opengl32: Build without -DWINE_NO_LONG_TYPES. --- dlls/opengl32/Makefile.in | 2 +- dlls/opengl32/make_opengl | 14 +- dlls/opengl32/thunks.c | 6240 ++++++++++++++++++++++----------------------- dlls/opengl32/unix_wgl.c | 10 +- dlls/opengl32/wgl.c | 19 +- 5 files changed, 3143 insertions(+), 3142 deletions(-)

1 0