August 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Introduce wined3d_swapchain_resize_target().
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 28f24b9ddf4f4cf848cdafa08508bc5b07a033c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f24b9ddf4f4cf848cdafa08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 4 17:23:42 2016 +0200 wined3d: Introduce wined3d_swapchain_resize_target(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 52 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 802e2bc..e405457 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1397,6 +1397,55 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha return WINED3D_OK; } +HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, + const struct wined3d_display_mode *mode) +{ + struct wined3d_device *device = swapchain->device; + struct wined3d_display_mode current_mode; + RECT original_window_rect, window_rect; + HRESULT hr; + + TRACE("swapchain %p, mode %p.\n", swapchain, mode); + + SetRect(&window_rect, 0, 0, mode->width, mode->height); + + if (swapchain->desc.windowed) + { + AdjustWindowRectEx(&window_rect, + GetWindowLongW(swapchain->device_window, GWL_STYLE), FALSE, + GetWindowLongW(swapchain->device_window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(swapchain->device_window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) + { + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, mode))) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + } + else + { + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, + &current_mode, NULL))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + + SetRect(&window_rect, 0, 0, current_mode.width, current_mode.height); + } + + MoveWindow(swapchain->device_window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, + window_rect.bottom - window_rect.top, TRUE); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e0cc501..5b9b12b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -242,6 +242,7 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) +@ cdecl wined3d_swapchain_resize_target(ptr ptr) @ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 661191d..166fecc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2527,6 +2527,8 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); +HRESULT __cdecl wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain,

1 0

Józef Kucia : wined3d: Fix window rect restoring.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: fb2540f8b18cc9c0856c9ccbe66305a4f8a6b3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2540f8b18cc9c0856c9ccbe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 4 17:23:41 2016 +0200 wined3d: Fix window rect restoring. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9a4f0d3..1bafd5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -954,7 +954,8 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic rect = *window_rect; else window_pos_flags |= (SWP_NOMOVE | SWP_NOSIZE); - SetWindowPos(window, 0, rect.left, rect.top, rect.right, rect.bottom, window_pos_flags); + SetWindowPos(window, 0, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); device->filter_messages = filter_messages;

1 0

Bernhard Übelacker : dinput8/tests: Add valid wide string termination to actionName member.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 86cdf0b1cb7a15cb43dd0c600b66f6665aea87d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cdf0b1cb7a15cb43dd0c600… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Aug 5 00:50:51 2016 +0200 dinput8/tests: Add valid wide string termination to actionName member. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 15 ++++++++++----- dlls/dinput8/tests/dinput.c | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index fc415b7..6753b73 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -49,16 +49,21 @@ enum { static DIACTIONA actionMapping[]= { /* axis */ - { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer.\0" } }, /* button */ - { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } }, + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift.\0" } }, /* keyboard key */ - { 2, DIKEYBOARD_SPACE , 0, { "Missile" } }, + { 2, DIKEYBOARD_SPACE, 0, { "Missile.\0" } }, /* mouse button */ - { 3, DIMOUSE_BUTTON0, 0, { "Select" } }, + { 3, DIMOUSE_BUTTON0, 0, { "Select\0" } }, /* mouse axis */ - { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } + { 4, DIMOUSE_YAXIS, 0, { "Y Axis\0" } } }; +/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS + * one can find out that the regular ansi string termination is not respected by EnumDevicesBySemantics. + * Adding a double termination, making it a valid wide string termination, made the test succeed. + * Therefore it looks like ansi version of EnumDevicesBySemantics forwards the string to + * the wide variant without conversation. */ static void flush_events(void) { diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 57f5505..c3f80c6 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -443,16 +443,21 @@ struct enum_semantics_test static DIACTIONA actionMapping[]= { /* axis */ - { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer" } }, + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer.\0" } }, /* button */ - { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift" } }, + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift.\0" } }, /* keyboard key */ - { 2, DIKEYBOARD_SPACE, 0, { "Missile" } }, + { 2, DIKEYBOARD_SPACE, 0, { "Missile.\0" } }, /* mouse button */ - { 3, DIMOUSE_BUTTON0, 0, { "Select" } }, + { 3, DIMOUSE_BUTTON0, 0, { "Select\0" } }, /* mouse axis */ - { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } + { 4, DIMOUSE_YAXIS, 0, { "Y Axis\0" } } }; +/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS + * one can find out that the regular ansi string termination is not respected by EnumDevicesBySemantics. + * Adding a double termination, making it a valid wide string termination, made the test succeed. + * Therefore it looks like ansi version of EnumDevicesBySemantics forwards the string to + * the wide variant without conversation. */ static BOOL CALLBACK enum_semantics_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) {

1 0

Józef Kucia : wined3d: Add R32G32B32A32_SINT vertex format.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: ecd305708a4e156ae6ddbec1e2d5ec29c6a70b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd305708a4e156ae6ddbec1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 4 17:23:40 2016 +0200 wined3d: Add R32G32B32A32_SINT vertex format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 93b610d..31d5014 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -369,6 +369,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT, GL_FALSE}, {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT, GL_FALSE}, }; struct wined3d_format_texture_info

1 0

Nikolay Sivov : msvcp140: Added __crtInitializeCriticalSectionEx().
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: e3c5c7d03d732ddbd771362d7e5298bcdad74500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c5c7d03d732ddbd771362d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 12:31:28 2016 +0200 msvcp140: Added __crtInitializeCriticalSectionEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1e8f85f..922aa9e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3770,7 +3770,7 @@ @ stub __crtGetSystemTimePreciseAsFileTime @ stub __crtGetTickCount64 @ stub __crtInitOnceExecuteOnce -@ stub __crtInitializeCriticalSectionEx +@ cdecl __crtInitializeCriticalSectionEx(ptr long long) MSVCP__crtInitializeCriticalSectionEx @ stub __crtIsPackagedApp @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 81a5fbb..2037e69 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1066,6 +1066,16 @@ void __asm_dummy_vtables(void) { } #endif +/********************************************************************* + * __crtInitializeCriticalSectionEx (MSVCP140.@) + */ +BOOL CDECL MSVCP__crtInitializeCriticalSectionEx( + CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) +{ + TRACE("(%p %x %x)\n", cs, spin_count, flags); + return InitializeCriticalSectionEx(cs, spin_count, flags); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Michael Stefaniuc : mmdevapi/tests: Make use of todo_wine_if().
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: d7b7bdae1db7baee933cb2a3aa6e6c64ea405734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b7bdae1db7baee933cb2a3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:43:27 2016 +0200 mmdevapi/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index e68c38d..749272a 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -244,10 +244,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - if(qpc2 != qpc) + todo_wine_if(qpc2 != qpc) /* FIXME: Some drivers fail */ - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); - else ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); }

1 0

Michael Stefaniuc : urlmon/tests: Make use of todo_wine_if().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 0b49495b8ed9e725b47b7ca791312a2a3c3e3c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b49495b8ed9e725b47b7ca79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:46:30 2016 +0200 urlmon/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 4 +--- dlls/urlmon/tests/url.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a55db96..dad87ed 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2574,9 +2574,7 @@ static void test_file_protocol_url(LPCWSTR url) hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - if(file_with_hash) /* FIXME: An effect of UnlockRequest call? */ - todo_wine ok(hres == S_OK, "Read failed: %08x\n", hres); - else + todo_wine_if(file_with_hash) /* FIXME: An effect of UnlockRequest call? */ ok(hres == S_OK, "Read failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); ok(hres == S_OK, "Terminate failed: %08x\n", hres); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ad27c3d..4fa11c7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3087,14 +3087,10 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(!no_callback) { CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); /* IE 8 */ CHECK_CALLED(GetBindInfo); - if(abort_start) - todo_wine CHECK_CALLED(QueryInterface_IInternetProtocol); - else + todo_wine_if(abort_start) CHECK_CALLED(QueryInterface_IInternetProtocol); if(!emulate_protocol) { - if(abort_start) - todo_wine CHECK_CALLED(QueryService_IInternetProtocol); - else + todo_wine_if(abort_start) CHECK_CALLED(QueryService_IInternetProtocol); } CHECK_CALLED(OnStartBinding);

1 0

Michael Stefaniuc : comctl32/tests: Make use of todo_wine_if().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: ce17196995dd1a065c80e756eedc2c2421f65053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce17196995dd1a065c80e756e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:39:25 2016 +0200 comctl32/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 811800c..ec87e3b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1830,9 +1830,7 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM clr = GetBkColor(nmlvcd->nmcd.hdc); ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); - if (nmlvcd->iSubItem) - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); - else + todo_wine_if(nmlvcd->iSubItem) ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM:

1 0

Michael Stefaniuc : user32/tests: Make use of todo_wine_if().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: c80ba5386443f664a19b5ecbf18d091f1cc8b2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80ba5386443f664a19b5ecbf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:45:19 2016 +0200 user32/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2823f06..07d10b4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12125,11 +12125,7 @@ static void test_ShowWindow(void) "expected %d,%d got %d,%d\n", sw[i].wp_min.x, sw[i].wp_min.y, wp.ptMinPosition.x, wp.ptMinPosition.y); } - if (wp.ptMaxPosition.x != sw[i].wp_max.x || wp.ptMaxPosition.y != sw[i].wp_max.y) - todo_wine - ok(wp.ptMaxPosition.x == sw[i].wp_max.x && wp.ptMaxPosition.y == sw[i].wp_max.y, - "expected %d,%d got %d,%d\n", sw[i].wp_max.x, sw[i].wp_max.y, wp.ptMaxPosition.x, wp.ptMaxPosition.y); - else + todo_wine_if(wp.ptMaxPosition.x != sw[i].wp_max.x || wp.ptMaxPosition.y != sw[i].wp_max.y) ok(wp.ptMaxPosition.x == sw[i].wp_max.x && wp.ptMaxPosition.y == sw[i].wp_max.y, "expected %d,%d got %d,%d\n", sw[i].wp_max.x, sw[i].wp_max.y, wp.ptMaxPosition.x, wp.ptMaxPosition.y);

1 0

Sebastian Lackner : winedevice: Get rid of static driver_module variable.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: e3321faf14beef308919a34f4ec5fe3979accf7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3321faf14beef308919a34f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 4 19:00:00 2016 +0200 winedevice: Get rid of static driver_module variable. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 2da9446..e31318c 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -43,7 +43,6 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; static DRIVER_OBJECT *driver_obj; -static HMODULE driver_module; /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) @@ -216,22 +215,22 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING NTSTATUS status; const IMAGE_NT_HEADERS *nt; const WCHAR *driver_name; + HMODULE module; /* Retrieve driver name from the keyname */ driver_name = strrchrW( keyname->Buffer, '\\' ); driver_name++; - driver_module = load_driver( driver_name, keyname ); - if (!driver_module) + module = load_driver( driver_name, keyname ); + if (!module) return STATUS_DLL_INIT_FAILED; driver_obj = driver_object; + driver_object->DriverSection = find_ldr_module( module ); - nt = RtlImageNtHeader( driver_module ); + nt = RtlImageNtHeader( module ); if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; - - driver_object->DriverSection = find_ldr_module( driver_module ); - driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)driver_module + nt->OptionalHeader.AddressOfEntryPoint); + driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); if (WINE_TRACE_ON(relay)) WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), @@ -254,8 +253,10 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING } /* call the driver unload function */ -static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) +static void unload_driver( DRIVER_OBJECT *driver_obj ) { + LDR_MODULE *ldr = driver_obj->DriverSection; + if (driver_obj->DriverUnload) { if (WINE_TRACE_ON(relay)) @@ -268,7 +269,8 @@ static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), driver_obj->DriverUnload, driver_obj ); } - FreeLibrary( module ); + + FreeLibrary( ldr->BaseAddress ); IoDeleteDriver( driver_obj ); } @@ -349,7 +351,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) SetServiceStatus( service_handle, &status ); wine_ntoskrnl_main_loop( stop_event ); - unload_driver( driver_module, driver_obj ); + unload_driver( driver_obj ); } else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) );

1 0