February 2016 - Wine-Commits

Charles Davis : server: Fix int-to-pointer conversion warning (Clang).
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 1c862ca479f1cacb9827c7491b7b8915417a2091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c862ca479f1cacb9827c7491… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 26 02:46:06 2016 -0700 server: Fix int-to-pointer conversion warning (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index e995380..1fd1ce7 100644 --- a/server/fd.c +++ b/server/fd.c @@ -574,8 +574,8 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) if (kqueue_fd == -1) return; - EV_SET( &ev[0], fd->unix_fd, EVFILT_READ, 0, NOTE_LOWAT, 1, (void *)user ); - EV_SET( &ev[1], fd->unix_fd, EVFILT_WRITE, 0, NOTE_LOWAT, 1, (void *)user ); + EV_SET( &ev[0], fd->unix_fd, EVFILT_READ, 0, NOTE_LOWAT, 1, (void *)(long)user ); + EV_SET( &ev[1], fd->unix_fd, EVFILT_WRITE, 0, NOTE_LOWAT, 1, (void *)(long)user ); if (events == -1) /* stop waiting on this fd completely */ {

1 0

Jacek Caban : user32: Ignore WM_CHILDACTIVATE on disabled windows in DefMDIChildProc.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: aa5762d5c20a6f1281b9018813169a67c79896b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5762d5c20a6f1281b901881… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 12:35:34 2016 +0100 user32: Ignore WM_CHILDACTIVATE on disabled windows in DefMDIChildProc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 3 ++- dlls/user32/tests/msg.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/win.c | 6 ----- 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b360528..bda2b00 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1485,7 +1485,8 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, break; case WM_CHILDACTIVATE: - MDI_ChildActivate( client, hwnd ); + if (IsWindowEnabled( hwnd )) + MDI_ChildActivate( client, hwnd ); return 0; case WM_SYSCOMMAND: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cc92acf..bd02c89 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2343,6 +2343,28 @@ static const struct message WmCreateMDIchildVisibleSeq[] = { { WM_MDIACTIVATE, sent|defwinproc }, { 0 } }; +/* WM_CHILDACTIVATE sent to disabled window */ +static const struct message WmChildActivateDisabledWindowSeq[] = { + { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +/* WM_CHILDACTIVATE sent to enabled window */ +static const struct message WmChildActivateWindowSeq[] = { + { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, + { WM_NCACTIVATE, sent|wparam|defwinproc, 0 }, + { WM_MDIACTIVATE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|defwinproc }, + { WM_SETFOCUS, sent }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_MDIACTIVATE, sent|defwinproc }, + { 0 } +}; /* CreateWindow for MDI child window with invisible parent */ static const struct message WmCreateMDIchildInvisibleParentSeq[] = { { HCBT_CREATEWND, hook }, @@ -3618,6 +3640,50 @@ static void test_mdi_messages(void) ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == 0, "wrong focus window %p\n", GetFocus()); + trace("Testing WM_CHILDACTIVATE\n"); + + mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_DISABLED, + 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, GetModuleHandleA(0), NULL); + + mdi_child2 = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX, + 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, GetModuleHandleA(0), NULL); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + + flush_sequence(); + SendMessageW(mdi_child, WM_CHILDACTIVATE, 0, 0); + ok_sequence(WmChildActivateDisabledWindowSeq, "WM_CHILDACTIVATE sent to disabled window", FALSE); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + flush_sequence(); + + EnableWindow(mdi_child, TRUE); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + + flush_sequence(); + SendMessageW(mdi_child, WM_CHILDACTIVATE, 0, 0); + ok_sequence(WmChildActivateWindowSeq, "WM_CHILDACTIVATE sent to enabled window", FALSE); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + flush_sequence(); + + DestroyWindow(mdi_child); + DestroyWindow(mdi_child2); + flush_sequence(); + /* test for maximized MDI children */ trace("creating maximized visible MDI child window 1\n"); mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 988aa6c..4a09e39 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1411,7 +1411,6 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1428,7 +1427,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1484,7 +1482,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1505,7 +1502,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1562,7 +1558,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1583,7 +1578,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n");

1 0

Jacek Caban : user32: Always enable owner window in EndDialog.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 142133ae6c973a06e90b6de32c55fae757372a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142133ae6c973a06e90b6de32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 25 17:32:54 2016 +0100 user32: Always enable owner window in EndDialog. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 8 ++------ dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e841152..f3c8289 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -921,7 +921,6 @@ INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCDLGTEMPLATEW temp */ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) { - BOOL wasEnabled; DIALOGINFO * dlgInfo; HWND owner; @@ -934,10 +933,9 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) } dlgInfo->idResult = retval; dlgInfo->flags |= DF_END; - wasEnabled = (dlgInfo->flags & DF_OWNERENABLED); owner = GetWindow( hwnd, GW_OWNER ); - if (wasEnabled && owner) + if (owner) DIALOG_EnableOwner( owner ); /* Windows sets the focus to the dialog itself in EndDialog */ @@ -953,9 +951,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) if (hwnd == GetActiveWindow()) { - /* If this dialog was given an owner then set the focus to that owner - even when the owner is disabled (normally when a window closes any - disabled windows cannot receive the focus). */ + /* If this dialog was given an owner then set the focus to that owner. */ if (owner) SetForegroundWindow( owner ); else diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 98bf53d..cc92acf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12226,7 +12226,7 @@ static void test_EndDialog(void) hother = CreateWindowExA(0, "TestParentClass", "Test parent 2", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 100, 100, 200, 200, 0, 0, 0, NULL); + 200, 100, 200, 200, 0, 0, 0, NULL); ok (hother != 0, "Failed to create parent window\n"); ok(GetClassInfoA(0, "#32770", &cls), "GetClassInfo failed\n"); @@ -12240,20 +12240,40 @@ static void test_EndDialog(void) hactive = GetForegroundWindow(); ok(hother == hactive, "Wrong window has focus (%p != %p)\n", hother, hactive); - /* create a dialog where the parent is disabled, this parent should still - receive the focus when the dialog exits (even though "normally" a - disabled window should not receive the focus) */ + /* create a dialog where the parent is disabled, this parent should be + * enabled and receive focus when dialog exits */ hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hparent, test_dlg_proc, 0); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); SetForegroundWindow(hdlg); hactive = GetForegroundWindow(); ok(hdlg == hactive, "Wrong window has focus (%p != %p)\n", hdlg, hactive); EndDialog(hdlg, 0); + ok(IsWindowEnabled(hparent), "parent is not enabled\n"); hactive = GetForegroundWindow(); ok(hparent == hactive, "Wrong window has focus (parent != active) (active: %p, parent: %p, dlg: %p, other: %p)\n", hactive, hparent, hdlg, hother); DestroyWindow(hdlg); flush_sequence(); + /* create a dialog where the parent is disabled and set active window to other window before calling EndDialog */ + EnableWindow(hparent, FALSE); + hdlg = CreateWindowExA(0, "TestDialogClass", NULL, + WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_DLGFRAME, + 0, 0, 100, 100, hparent, 0, 0, NULL); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + flush_sequence(); + SetForegroundWindow(hother); + flush_sequence(); + hactive = GetForegroundWindow(); + ok(hactive == hother, "Wrong foreground (%p != %p)\n", hactive, hother); + hactive = GetActiveWindow(); + ok(hactive == hother, "Wrong active window (%p != %p)\n", hactive, hother); + EndDialog(hdlg, 0); + ok(IsWindowEnabled(hparent), "parent is not enabled\n"); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong window has focus (other != active) (active: %p, parent: %p, dlg: %p, other: %p)\n", hactive, hparent, hdlg, hother); + DestroyWindow(hdlg); + flush_sequence(); + DestroyWindow( hother ); DestroyWindow( hparent ); UnregisterClassA(cls.lpszClassName, cls.hInstance);

1 0

Michael Müller : user32: Preserve beginning of extra data for MDI windows.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 3c888a74c5c5811c46f09fc9a598fad722e9727b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c888a74c5c5811c46f09fc9a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 26 07:24:51 2016 +0100 user32: Preserve beginning of extra data for MDI windows. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 1 + dlls/user32/tests/msg.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b5a0473..b360528 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -127,6 +127,7 @@ typedef struct * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ + LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 94fe4cb..98bf53d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3380,6 +3380,7 @@ static void test_mdi_messages(void) BOOL zoomed; RECT rc; HMENU hMenu = CreateMenu(); + LONG val; if (!mdi_RegisterWindowClasses()) assert(0); @@ -3408,8 +3409,9 @@ static void test_mdi_messages(void) rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, mdi_frame, 0, GetModuleHandleA(0), &client_cs); assert(mdi_client); - ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); + SetWindowLongA(mdi_client, 0, 0xdeadbeef); + ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus()); @@ -3867,6 +3869,8 @@ static void test_mdi_messages(void) SetFocus(0); flush_sequence(); + val = GetWindowLongA(mdi_client, 0); + ok(val == 0xdeadbeef || broken(val == 0) /* >= Win Vista */, "Expected 0xdeadbeef, got 0x%x\n", val); DestroyWindow(mdi_client); ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);

1 0

André Hentschel : ntdll: Set TPIDRURW also on ARMv8-A.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: b363f386cda116901db126be3f4688c4cc5c481c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b363f386cda116901db126be3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 25 21:29:26 2016 +0100 ntdll: Set TPIDRURW also on ARMv8-A. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1f6da96..5ee9f45 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -926,7 +926,7 @@ void signal_init_thread( TEB *teb ) init_done = TRUE; } -#ifdef __ARM_ARCH_7A__ +#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); #endif

1 0

Daniel Lehman : winedbg: Handle the 4th parameter for 64-bit C++ exceptions.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 26b37c40e753c0741e543f1b72332ca0546cb695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b37c40e753c0741e543f1b7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 24 16:19:39 2010 -0800 winedbg: Handle the 4th parameter for 64-bit C++ exceptions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 08ac938..e521252 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -953,6 +953,10 @@ void info_win32_exception(void) if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + dbg_printf("C++ exception(object = %p, type = %p, base = %p)", + (void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2], + (void*)rec->ExceptionInformation[3]); else dbg_printf("C++ exception with strange parameter count %d or magic 0x%08lx", rec->NumberParameters, rec->ExceptionInformation[0]);

1 0

Sebastian Lackner : winedevice: Get rid of global driver_hkey variable and fix some leaks.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: e931f0e83daa30bc19b6139bfe3987425b9e76ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e931f0e83daa30bc19b6139bf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 06:11:36 2016 +0100 winedevice: Get rid of global driver_hkey variable and fix some leaks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 43963b6..94132ed 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -42,7 +42,6 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static WCHAR *driver_name; static SERVICE_STATUS_HANDLE service_handle; -static HKEY driver_hkey; static HANDLE stop_event; static DRIVER_OBJECT driver_obj; static DRIVER_EXTENSION driver_extension; @@ -203,6 +202,7 @@ static HMODULE load_driver(void) '\\','S','e','r','v','i','c','e','s','\\',0}; UNICODE_STRING keypath; + HKEY driver_hkey; HMODULE module; LPWSTR path = NULL, str; DWORD type, size; @@ -215,7 +215,7 @@ static HMODULE load_driver(void) { WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(str), GetLastError() ); HeapFree( GetProcessHeap(), 0, str); - return FALSE; + return NULL; } RtlInitUnicodeString( &keypath, str ); @@ -231,7 +231,12 @@ static HMODULE load_driver(void) ExpandEnvironmentStringsW(str,path,size); } HeapFree( GetProcessHeap(), 0, str ); - if (!path) return FALSE; + if (!path) + { + RtlFreeUnicodeString( &keypath ); + RegCloseKey( driver_hkey ); + return NULL; + } if (!strncmpiW( path, systemrootW, 12 )) { @@ -265,12 +270,17 @@ static HMODULE load_driver(void) lstrcatW(path, postfixW); str = path; } + RegCloseKey( driver_hkey ); WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); - if (!module) return NULL; + if (!module) + { + RtlFreeUnicodeString( &keypath ); + return NULL; + } init_driver( module, &keypath ); return module;

1 0

Sebastian Lackner : winedevice: Use LdrFindEntryForAddress to find LDR_MODULE address.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 4bed3d231e96687efbdba3ff4c96fbbdfe450ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bed3d231e96687efbdba3ff4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 06:11:26 2016 +0100 winedevice: Use LdrFindEntryForAddress to find LDR_MODULE address. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index ef1e1ef..43963b6 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -50,15 +50,18 @@ static DRIVER_EXTENSION driver_extension; /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) { - LIST_ENTRY *entry, *list = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + LDR_MODULE *ldr; + ULONG_PTR magic; - for (entry = list->Flink; entry != list; entry = entry->Flink) + LdrLockLoaderLock( 0, NULL, &magic ); + if (LdrFindEntryForAddress( module, &ldr )) { - LDR_MODULE *ldr = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); - if (ldr->BaseAddress == module) return ldr; - if (ldr->BaseAddress > (void *)module) break; + WARN( "module not found for %p\n", module ); + ldr = NULL; } - return NULL; + LdrUnlockLoaderLock( 0, magic ); + + return ldr; } /* load the driver module file */

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_GetVolumeLevel().
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 17ce029f55cb65285c5b687958324d64ace43f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ce029f55cb65285c5b68795… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:40 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_GetVolumeLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index adc33ad..9cf10ae 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1117,19 +1117,17 @@ static HRESULT WINAPI d3d9_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture9 *if UINT level, IDirect3DVolume9 **volume) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_volume *volume_impl; TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - volume_impl = wined3d_resource_get_parent(sub_resource); *volume = &volume_impl->IDirect3DVolume9_iface; IDirect3DVolume9_AddRef(*volume); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_UnlockBox().
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 6f98e85783e2aa04178eebe549c566a89c7af5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f98e85783e2aa04178eebe54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:39 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_UnlockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index a47c439..adc33ad 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1160,20 +1160,16 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, UINT level) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_volume *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume9_UnlockBox(&volume_impl->IDirect3DVolume9_iface); - } wined3d_mutex_unlock(); return hr;

1 0