February 2022 - Wine-Commits

Francois Gouget : ws2_32/tests: Remove the todo_wine on a test_recv() ok() call.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 98f2922d2e1ce640727c195ebbd2a7101264d092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f2922d2e1ce640727c195e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 17 16:29:58 2022 +0100 ws2_32/tests: Remove the todo_wine on a test_recv() ok() call. This test has been succeeding ever since the try_recv() call has been removed before the server call in sock_recv(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d8a78947de4..befd9fc702e 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1460,7 +1460,7 @@ static void test_recv(void) memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); - todo_wine ok(ret == STATUS_PIPE_DISCONNECTED, "got %#x\n", ret); + ok(ret == STATUS_PIPE_DISCONNECTED, "got %#x\n", ret); ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information);

1 0

Francois Gouget : xinput1_3: Fix the spelling of a WARN() message and helper.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 30ab3557e9542cc4a1e29a980f6d2aa39aa77994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ab3557e9542cc4a1e29a98… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 17 20:53:59 2022 +0100 xinput1_3: Fix the spelling of a WARN() message and helper. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index c8ce6622dcb..909ef9e7dfd 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -470,7 +470,7 @@ static void get_registry_keys(HKEY *defkey, HKEY *appkey) } } -static BOOL device_is_overriden(HANDLE device) +static BOOL device_is_overridden(HANDLE device) { WCHAR name[MAX_PATH], buffer[MAX_PATH]; DWORD size = sizeof(buffer); @@ -519,8 +519,8 @@ static BOOL try_add_device(const WCHAR *device_path) else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (device_is_overriden(device)) - WARN("ignoring HID device, overriden for dinput\n"); + else if (device_is_overridden(device)) + WARN("ignoring HID device, overridden for dinput\n"); else if (!controller_init(&controllers[i], preparsed, &caps, device, device_path)) WARN("ignoring HID device, failed to initialize\n"); else

1 0

Jacek Caban : win32u: Move NtUserGetForegroundWindow implementation from user32.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: fa3bd8f417123848c343c45f93a152cd42b3e5ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa3bd8f417123848c343c45f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:43:07 2022 +0100 win32u: Move NtUserGetForegroundWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 19 +------------------ dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 2 +- dlls/user32/winpos.c | 2 +- dlls/win32u/input.c | 16 ++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 1 + 12 files changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 4ba2bfef193..a5fc376bdc6 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -161,7 +161,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (IsWindow(hwnd)) { - SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); + SendMessageW( hwnd, WM_NCACTIVATE, hwnd == NtUserGetForegroundWindow(), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ), (LPARAM)previous ); @@ -371,23 +371,6 @@ HWND WINAPI GetFocus(void) } -/******************************************************************* - * GetForegroundWindow (USER32.@) - */ -HWND WINAPI GetForegroundWindow(void) -{ - HWND ret = 0; - - SERVER_START_REQ( get_thread_input ) - { - req->tid = 0; - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->foreground ); - } - SERVER_END_REQ; - return ret; -} - - /*********************************************************************** * SetShellWindowEx (USER32.@) * hwndShell = Progman[Program Manager] diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a5fcc9068a7..b4850cc1937 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1876,7 +1876,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR if (is_desktop_window( hwnd )) return 0; return WIN_SetStyle(hwnd, wparam, lparam); case WM_WINE_SETACTIVEWINDOW: - if (!wparam && GetForegroundWindow() == hwnd) return 0; + if (!wparam && NtUserGetForegroundWindow() == hwnd) return 0; return (LRESULT)SetActiveWindow( (HWND)wparam ); case WM_WINE_KEYBOARD_LL_HOOK: case WM_WINE_MOUSE_LL_HOOK: diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d60b424321b..3baa7594e84 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -302,7 +302,7 @@ @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) @ stdcall GetFocus() -@ stdcall GetForegroundWindow() +@ stdcall GetForegroundWindow() NtUserGetForegroundWindow @ stdcall GetGestureConfig(long long long ptr ptr long) @ stdcall GetGestureInfo(long ptr) @ stdcall GetGUIThreadInfo(long ptr) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index a91db57cdb4..8ca55b283f7 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -97,7 +97,7 @@ static HPALETTE WINAPI UserSelectPalette( HDC hDC, HPALETTE hPal, BOOL bForceBac HWND hwnd = WindowFromDC( hDC ); if (hwnd) { - HWND hForeground = GetForegroundWindow(); + HWND hForeground = NtUserGetForegroundWindow(); /* set primary palette if it's related to current active */ if (hForeground == hwnd || IsChild(hForeground,hwnd)) { diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ee16144b179..1a037297ac1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3843,7 +3843,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) hwnd = wndPtr->obj.handle; /* make it a full handle */ if (pfinfo->dwFlags) wparam = !(wndPtr->flags & WIN_NCACTIVATED); - else wparam = (hwnd == GetForegroundWindow()); + else wparam = (hwnd == NtUserGetForegroundWindow()); WIN_ReleasePtr( wndPtr ); SendMessageW( hwnd, WM_NCACTIVATE, wparam, 0 ); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index abf9c25e6c6..db3408c63ba 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1640,7 +1640,7 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) } done: - fg = GetForegroundWindow(); + fg = NtUserGetForegroundWindow(); TRACE("win = %p fg = %p\n", hwndTo, fg); if (!fg || (hwnd == fg)) { diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index d73b03fe7fd..9c7a7e75253 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1004,3 +1004,19 @@ int WINAPI NtUserGetMouseMovePointsEx( UINT size, MOUSEMOVEPOINT *ptin, MOUSEMOV return copied; } + +/******************************************************************* + * NtUserGetForegroundWindow (win32u.@) + */ +HWND WINAPI NtUserGetForegroundWindow(void) +{ + HWND ret = 0; + + SERVER_START_REQ( get_thread_input ) + { + req->tid = 0; + if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->foreground ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d97688d7c8c..2d37d605479 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -115,6 +115,7 @@ static void * const syscalls[] = NtUserGetCursor, NtUserGetDoubleClickTime, NtUserGetDpiForMonitor, + NtUserGetForegroundWindow, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardLayoutName, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 20faca70c5e..03ab1ff885c 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -926,7 +926,7 @@ @ stub NtUserGetDpiForCurrentProcess @ stdcall -syscall NtUserGetDpiForMonitor(long long ptr ptr) @ stub NtUserGetExtendedPointerDeviceProperty -@ stub NtUserGetForegroundWindow +@ stdcall -syscall NtUserGetForegroundWindow() @ stub NtUserGetGUIThreadInfo @ stub NtUserGetGestureConfig @ stub NtUserGetGestureExtArgs diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 47e95a98a4b..22140c33f80 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -102,6 +102,7 @@ SYSCALL_ENTRY( NtUserGetCursor ) \ SYSCALL_ENTRY( NtUserGetDoubleClickTime ) \ SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \ + SYSCALL_ENTRY( NtUserGetForegroundWindow ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index cd4dc32d407..a2be5fedb36 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -415,3 +415,8 @@ NTSTATUS WINAPI wow64_NtUserUnhookWindowsHookEx( UINT *args ) return NtUserUnhookWindowsHookEx( handle ); } + +NTSTATUS WINAPI wow64_NtUserGetForegroundWindow( UINT *args ) +{ + return HandleToUlong( NtUserGetForegroundWindow() ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 6e941c29c6d..51f1c624ba6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -156,6 +156,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path UINT32 *num_mode_info ); UINT WINAPI NtUserGetDoubleClickTime(void); BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ); +HWND WINAPI NtUserGetForegroundWindow(void); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Huw Davies : winealsa: Use the global lock to lock the session.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 10d44c9a8a402dd6bcd9853d3b566a2401cea6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10d44c9a8a402dd6bcd9853d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:48 2022 +0000 winealsa: Use the global lock to lock the session. Mainly just for simplicity. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index abec9dc969a..0549752dc3f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -77,8 +77,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -748,9 +746,6 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); - InitializeCriticalSection(&ret->lock); - ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); - session_init_vols(ret, num_channels); ret->master_vol = 1.f; @@ -3283,11 +3278,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3573,11 +3568,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3623,12 +3618,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; }

1 0

Zebediah Figura : wined3d: Protect wined3d_chunk_gl map fields with a mutex.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 4f54f4591af0bf8b060e716c3e622414338dd38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f54f4591af0bf8b060e716c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 17 00:13:52 2022 -0600 wined3d: Protect wined3d_chunk_gl map fields with a mutex. Parallel to a5efc1d5e06bf1d88148b4800dc489a527e797c8. Unlike with the Vulkan backend, we cannot map chunks from the client thread, but we can access the mapped pointer and increase the map count of already mapped chunks. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 25 ++++++++++++++++++------- dlls/wined3d/device.c | 3 +-- dlls/wined3d/wined3d_private.h | 15 +++++++++++++++ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8217d04686c..b82849f8470 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2778,9 +2778,12 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; + void *map_ptr; TRACE("chunk %p, gl_buffer %u, map_ptr %p.\n", chunk_gl, chunk_gl->gl_buffer, chunk_gl->c.map_ptr); + wined3d_allocator_chunk_gl_lock(chunk_gl); + if (!chunk_gl->c.map_ptr) { unsigned int flags = wined3d_device_gl_get_memory_type_flags(chunk_gl->memory_type) & ~GL_CLIENT_STORAGE_BIT; @@ -2795,6 +2798,7 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c 0, WINED3D_ALLOCATOR_CHUNK_SIZE, flags)); if (!chunk_gl->c.map_ptr) { + wined3d_allocator_chunk_gl_unlock(chunk_gl); ERR("Failed to map chunk memory.\n"); return NULL; } @@ -2803,8 +2807,11 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c } ++chunk_gl->c.map_count; + map_ptr = chunk_gl->c.map_ptr; - return chunk_gl->c.map_ptr; + wined3d_allocator_chunk_gl_unlock(chunk_gl); + + return map_ptr; } static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl *chunk_gl, @@ -2814,14 +2821,18 @@ static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl * TRACE("chunk_gl %p, context_gl %p.\n", chunk_gl, context_gl); - if (--chunk_gl->c.map_count) - return; + wined3d_allocator_chunk_gl_lock(chunk_gl); - wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); - GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); - chunk_gl->c.map_ptr = NULL; + if (!--chunk_gl->c.map_count) + { + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + chunk_gl->c.map_ptr = NULL; + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); + } - adapter_adjust_mapped_memory(context_gl->c.device->adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); + wined3d_allocator_chunk_gl_unlock(chunk_gl); } static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9488e8c642e..f163e77fcf1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -993,14 +993,13 @@ static struct wined3d_allocator_chunk *wined3d_allocator_gl_create_chunk(struct static void wined3d_allocator_gl_destroy_chunk(struct wined3d_allocator_chunk *chunk) { + struct wined3d_device_gl *device_gl = wined3d_device_gl_from_allocator(chunk->allocator); struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(chunk); const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_device_gl *device_gl; TRACE("chunk %p.\n", chunk); - device_gl = CONTAINING_RECORD(chunk_gl->c.allocator, struct wined3d_device_gl, allocator); context_gl = wined3d_context_gl(context_acquire(&device_gl->d, NULL, 0)); gl_info = context_gl->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96ce75fbb58..c8c9bb7c8c6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4213,6 +4213,11 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +static inline struct wined3d_device_gl *wined3d_device_gl_from_allocator(struct wined3d_allocator *allocator) +{ + return CONTAINING_RECORD(allocator, struct wined3d_device_gl, allocator); +} + static inline void wined3d_device_gl_allocator_lock(struct wined3d_device_gl *device_gl) { EnterCriticalSection(&device_gl->allocator_cs); @@ -4223,6 +4228,16 @@ static inline void wined3d_device_gl_allocator_unlock(struct wined3d_device_gl * LeaveCriticalSection(&device_gl->allocator_cs); } +static inline void wined3d_allocator_chunk_gl_lock(struct wined3d_allocator_chunk_gl *chunk_gl) +{ + wined3d_device_gl_allocator_lock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); +} + +static inline void wined3d_allocator_chunk_gl_unlock(struct wined3d_allocator_chunk_gl *chunk_gl) +{ + wined3d_device_gl_allocator_unlock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); +} + bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN;

1 0

Eric Pouech : setupapi: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: e498e0ec9bf5a3f9cdb965f8668888697ac642ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=e498e0ec9bf5a3f9cdb965f8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:13:03 2022 +0100 setupapi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/devinst.c | 160 ++++++++++++++++++++++---------------------- dlls/setupapi/dialog.c | 6 +- dlls/setupapi/dirid.c | 4 +- dlls/setupapi/diskspace.c | 2 +- dlls/setupapi/fakedll.c | 16 ++--- dlls/setupapi/install.c | 18 ++--- dlls/setupapi/misc.c | 16 ++--- dlls/setupapi/parser.c | 10 +-- dlls/setupapi/query.c | 24 +++---- dlls/setupapi/queue.c | 32 ++++----- dlls/setupapi/setupcab.c | 4 +- dlls/setupapi/stringtable.c | 14 ++-- dlls/setupapi/stubs.c | 100 +++++++++++++-------------- 14 files changed, 204 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e498e0ec9bf5a3f9cdb9…

1 0

Eric Pouech : secur32: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 01c73f8573e68d6c5d5edd27e75ed508eec906d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c73f8573e68d6c5d5edd27… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:45 2022 +0100 secur32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/lsa.c | 46 +++++++++++++------------- dlls/secur32/negotiate.c | 26 +++++++-------- dlls/secur32/schannel.c | 74 +++++++++++++++++++++--------------------- dlls/secur32/schannel_gnutls.c | 7 ++-- dlls/secur32/secur32.c | 10 +++--- dlls/secur32/thunks.c | 32 +++++++++--------- dlls/secur32/wrapper.c | 36 ++++++++++---------- 8 files changed, 116 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01c73f8573e68d6c5d5e…

1 0

Eric Pouech : schedsvc: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: a9bb87763154bd93721fc8ca95ac295b295e6aff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9bb87763154bd93721fc8ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:33 2022 +0100 schedsvc: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/Makefile.in | 1 - dlls/schedsvc/atsvc.c | 38 +++++++++++++++++++------------------- dlls/schedsvc/schedsvc.c | 30 +++++++++++++++--------------- dlls/schedsvc/svc_main.c | 34 +++++++++++++++++----------------- 4 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9bb87763154bd93721f…

1 0

Eric Pouech : rstrtmgr: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: f0849f7dbc70fa5be21bf9f52c64777c39df9bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0849f7dbc70fa5be21bf9f5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:03 2022 +0100 rstrtmgr: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/Makefile.in | 1 - dlls/rstrtmgr/main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in index 9770a4b3408..8e9610ee5c9 100644 --- a/dlls/rstrtmgr/Makefile.in +++ b/dlls/rstrtmgr/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rstrtmgr.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index b9f29c7060c..238bcc20b1a 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rstrtmgr); DWORD WINAPI RmGetList(DWORD dwSessionHandle, UINT *pnProcInfoNeeded, UINT *pnProcInfo, RM_PROCESS_INFO *rgAffectedApps[], LPDWORD lpdwRebootReasons) { - FIXME("%d, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); + FIXME("%ld, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); if (pnProcInfoNeeded) *pnProcInfoNeeded = 0; if (pnProcInfo) @@ -51,7 +51,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs UINT nApplications, RM_UNIQUE_PROCESS *rgApplications, UINT nServices, LPCWSTR rgsServiceNames[]) { - FIXME("%d, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, + FIXME("%ld, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, nApplications, rgApplications, nServices, rgsServiceNames); return ERROR_SUCCESS; } @@ -63,7 +63,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs */ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[]) { - FIXME("%p, %d, %p stub!\n", sessionhandle, flags, sessionkey); + FIXME("%p, %ld, %p stub!\n", sessionhandle, flags, sessionkey); if (sessionhandle) *sessionhandle = 0xdeadbeef; return ERROR_SUCCESS; @@ -74,7 +74,7 @@ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[ */ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK status) { - FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + FIXME("%lu, 0x%08lx, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } @@ -83,7 +83,7 @@ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK statu */ DWORD WINAPI RmEndSession(DWORD handle) { - FIXME("%u stub!\n", handle); + FIXME("%lu stub!\n", handle); return ERROR_SUCCESS; } @@ -92,7 +92,7 @@ DWORD WINAPI RmEndSession(DWORD handle) */ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) { - FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + FIXME("%lu, 0x%08lx, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } @@ -102,7 +102,7 @@ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK stat DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, LPCWSTR serviceShortName, RM_FILTER_ACTION filter) { - FIXME("%u, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, + FIXME("%lu, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, debugstr_w(serviceShortName), filter); return ERROR_SUCCESS; } @@ -113,7 +113,7 @@ DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *pr DWORD WINAPI RmRemoveFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, LPCWSTR serviceShortName) { - FIXME("%u, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, + FIXME("%lu, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, debugstr_w(serviceShortName)); return ERROR_SUCCESS; }

1 0

Eric Pouech : rpcrt4: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: b67a843c1a25b3dcce653b14d213b904f883c009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67a843c1a25b3dcce653b14… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:49 2022 +0100 rpcrt4: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/cproxy.c | 6 +- dlls/rpcrt4/cstub.c | 8 +-- dlls/rpcrt4/ndr_clientserver.c | 4 +- dlls/rpcrt4/ndr_contexthandle.c | 12 ++-- dlls/rpcrt4/ndr_es.c | 32 ++++----- dlls/rpcrt4/ndr_fullpointer.c | 8 +-- dlls/rpcrt4/ndr_marshall.c | 150 ++++++++++++++++++++-------------------- dlls/rpcrt4/ndr_ole.c | 8 +-- dlls/rpcrt4/ndr_stubless.c | 30 ++++---- dlls/rpcrt4/ndr_typelib.c | 6 +- dlls/rpcrt4/rpc_assoc.c | 2 +- dlls/rpcrt4/rpc_async.c | 2 +- dlls/rpcrt4/rpc_binding.c | 58 ++++++++-------- dlls/rpcrt4/rpc_epmap.c | 20 +++--- dlls/rpcrt4/rpc_message.c | 62 ++++++++--------- dlls/rpcrt4/rpc_server.c | 40 +++++------ dlls/rpcrt4/rpc_transport.c | 76 ++++++++++---------- dlls/rpcrt4/rpcrt4_main.c | 12 ++-- 19 files changed, 269 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b67a843c1a25b3dcce65…

1 0