January 2018 - Wine-Commits

Stefan Dösinger : ws2_32/tests: Fix the printed value in a few ok lines.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 5c421e5fccad5e551bfe603db2dc27eee740c346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c421e5fccad5e551bfe603d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 21 18:44:17 2018 +0100 ws2_32/tests: Fix the printed value in a few ok lines. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96631ae..e188724 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,8 +1768,8 @@ todo_wine ok(!csinfoA.cs.LocalAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); ok(csinfoA.cs.LocalAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); @@ -1781,8 +1781,8 @@ todo_wine ok(csinfoA.cs.LocalAddr.iSockaddrLength, "Expected non-zero\n"); ok(csinfoA.cs.LocalAddr.lpSockaddr != NULL, "Expected non-null\n"); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err);

1 0

Huw Davies : oleaut32/tests: Remove some no longer needed test work-arounds.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 138f75f19f2ac9f774fb5a1e06fdd6db87dc23a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=138f75f19f2ac9f774fb5a1e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:01:41 2018 +0000 oleaut32/tests: Remove some no longer needed test work-arounds. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 47 ++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=138f75f19f2ac9f774fb…

1 0

Nikolay Sivov : comctl32/listview: Always return zero state mask for subitems.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 6b2675dc8fefde3d12675762581f23b1f544f6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2675dc8fefde3d12675762… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:53:30 2018 +0300 comctl32/listview: Always return zero state mask for subitems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 11 +++++++---- dlls/comctl32/tests/listview.c | 43 ++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 589d5c4..c085578 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6679,16 +6679,19 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* make a local copy */ isubitem = lpLVItem->iSubItem; + if (isubitem && (lpLVItem->mask & LVIF_STATE)) + lpLVItem->state = 0; + /* a quick optimization if all we're asked is the focus state * these queries are worth optimising since they are common, * and can be answered in constant time, without the heavy accesses */ if ( (lpLVItem->mask == LVIF_STATE) && (lpLVItem->stateMask == LVIS_FOCUSED) && !(infoPtr->uCallbackMask & LVIS_FOCUSED) ) { - lpLVItem->state = 0; - if (infoPtr->nFocusedItem == lpLVItem->iItem) - lpLVItem->state |= LVIS_FOCUSED; - return TRUE; + lpLVItem->state = 0; + if (infoPtr->nFocusedItem == lpLVItem->iItem && isubitem == 0) + lpLVItem->state |= LVIS_FOCUSED; + return TRUE; } ZeroMemory(&dispInfo, sizeof(dispInfo)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8efd3da..18e874a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6152,16 +6152,17 @@ static void test_state_image(void) insert_column(hwnd, 0); insert_column(hwnd, 1); - item.mask = LVIF_TEXT; + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = 0; item.iSubItem = 0; item.pszText = text; + item.lParam = 123456; r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(r == 0, "Failed to insert an item.\n"); item.mask = LVIF_STATE; - item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED | LVIS_FOCUSED; item.iItem = 0; item.iSubItem = 0; r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); @@ -6174,27 +6175,49 @@ static void test_state_image(void) r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); ok(r, "Failed to set subitem text.\n"); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; item.state = 0; item.iItem = 0; item.iSubItem = 0; + item.lParam = 0; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get item state.\n"); - ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED), "Unexpected item state %#x.\n", item.state); + ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED), + "Unexpected item state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = 0; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 1; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get subitem state.\n"); - todo_wine + ok(item.state == INDEXTOSTATEIMAGEMASK(2), "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 1; + item.lParam = 0; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_FOCUSED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); ok(item.state == 0, "Unexpected state %#x.\n", item.state); item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 2;

1 0

Hans Leidekker : dnsapi: Use default server list if passed in array is empty.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: dfe48bab07aee196284b2c02641d353eb390f08d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe48bab07aee196284b2c02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 10:19:05 2018 +0100 dnsapi: Use default server list if passed in array is empty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index a66db37..74b7096 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -547,6 +547,7 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { int i; + if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS; if (addrs->AddrCount > MAXNS) { WARN( "too many servers: %d only using the first: %d\n", @@ -716,8 +717,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser initialise_resolver(); _res.options |= dns_map_options( options ); - if (servers && (ret = dns_set_serverlist( servers ))) - return ret; + if ((ret = dns_set_serverlist( servers ))) return ret; ret = dns_do_query( name, type, options, result );

1 0

André Hentschel : ntdll: Determine write fault based on failed instruction on ARM64.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: dfe813e34fe5389dc1af024ca58ab8e0df87f480 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe813e34fe5389dc1af024c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 21 20:22:55 2018 +0100 ntdll: Determine write fault based on failed instruction on ARM64. Based on code from Qemu. Reported by Stefan Dösinger. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a04fe93..57ec13a 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -568,6 +568,23 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } +static inline DWORD is_write_fault( ucontext_t *context ) +{ + DWORD inst = *(DWORD *)PC_sig(context); + if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || + (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || + (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || + (inst & 0xbfc00000) == 0x0d800000 /* C3.3.4 */ || + (inst & 0x3f400000) == 0x08000000 /* C3.3.6 */ || + (inst & 0x3bc00000) == 0x38000000 /* C3.3.8-12 */ || + (inst & 0x3fe00000) == 0x3c800000 /* C3.3.8-12 128bit */ || + (inst & 0x3bc00000) == 0x39000000 /* C3.3.13 */ || + (inst & 0x3fc00000) == 0x3d800000 /* C3.3.13 128bit */ || + (inst & 0x3a400000) == 0x28000000) /* C3.3.7,14-16 */ + return EXCEPTION_WRITE_FAULT; + return EXCEPTION_READ_FAULT; +} + /********************************************************************** * segv_handler * @@ -604,8 +621,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - /* FIXME: Currently the kernel provides no way to determine if it's read or write */ - rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[0] = is_write_fault(context); rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */

1 0

Nikolay Sivov : comctl32/updown: Remove window subclass right before window is destroyed.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 2859e7d143d40a5cec330cd6c5b37b919a04a9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2859e7d143d40a5cec330cd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:51:36 2018 +0300 comctl32/updown: Remove window subclass right before window is destroyed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/updown.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 4f44b90..67b646d 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -592,14 +592,22 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, switch(uMsg) { case WM_KEYDOWN: - UPDOWN_KeyPressed(infoPtr, (int)wParam); - if ((wParam == VK_UP) || (wParam == VK_DOWN)) return 0; - break; + if (infoPtr) + { + UPDOWN_KeyPressed(infoPtr, (int)wParam); + if (wParam == VK_UP || wParam == VK_DOWN) + return 0; + } + break; case WM_MOUSEWHEEL: - UPDOWN_MouseWheel(infoPtr, (int)wParam); - break; + if (infoPtr) + UPDOWN_MouseWheel(infoPtr, (int)wParam); + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID); + break; default: break; } @@ -607,6 +615,11 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +static void UPDOWN_ResetSubclass (UPDOWN_INFO *infoPtr) +{ + SetWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID, 0); +} + /*********************************************************************** * UPDOWN_SetBuddy * @@ -628,9 +641,8 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) old_buddy = infoPtr->Buddy; - /* there is already a buddy assigned */ - if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); + if (!IsWindow(bud)) bud = NULL; /* Store buddy window handle */ @@ -942,10 +954,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case WM_DESTROY: Free (infoPtr->AccelVect); - - if (infoPtr->Buddy) - RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); Free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd);

1 0

Huw Davies : oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: dd012af92a93fdf77ec648e422b4fb96369b42eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd012af92a93fdf77ec648e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:01:42 2018 +0000 oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 46 ++++++++++++++----------------------------- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 17 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd012af92a93fdf77ec6…

1 0

Francois Gouget : testbot: Try to reconnect to the database in case of error.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: tools Branch: master Commit: ab9ab58d52ec99e12b2098cf81578020a9776bc5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab9ab58d52ec99e12b2098c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 22 03:04:32 2018 +0100 testbot: Try to reconnect to the database in case of error. We set RaiseError in our DBI options so programming errors are easier to debug and have a better chance of being caught. However this means DBI::connect() will raise an exception if the database server is not running (like if it's being upgraded just at the wrong time). Furthermore the higher layers cannot meaningfully deal with a broken connection. So catch these exceptions and try reconnecting until successful. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 4082a0a..0594951 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -53,9 +53,18 @@ sub GetDb($) } if (!defined $self->{Db}) { - $self->{Db} = DBI->connect(@{$self->{ConnectArgs}}); + while (1) + { + # Protect this call so we can retry in case RaiseError is set + eval { $self->{Db} = DBI->connect(@{$self->{ConnectArgs}}) }; + last if ($self->{Db}); + + # Prints errors on stderr like DBI normally does + $@ ||= "DBI::connect() returned undef without setting an error"; + print STDERR "$@\n"; + sleep(30); + } } - return $self->{Db}; }

1 0

Francois Gouget : winetest: Remove unneeded colons in titles.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: tools Branch: master Commit: f62cc452a9165ad577465957b27250963a20bf4a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f62cc452a9165ad57746595… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 22 03:02:02 2018 +0100 winetest: Remove unneeded colons in titles. Removing the colon makes the titles flow more naturally and improves the chance they are fully visible when multiple tabs are open. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index ac6c350..a894377 100755 --- a/winetest/gather +++ b/winetest/gather @@ -732,14 +732,14 @@ sub write_build_index_and_summary($) { $group_name = $group->{name}; $header_footer = build_header_footer($group->{reports}); - $title = "$short_date: $group_name results"; + $title = "$short_date $group_name results"; $filename = "index_$group_name.html"; } else { $group_name = "global"; $header_footer = build_header_footer(\@groups); - $title = "$short_date: Summary"; + $title = "$short_date Summary"; $filename = "index.html"; } @@ -773,7 +773,7 @@ EOF print OUT " | <a href=\"..\">index</a>\n"; print OUT "</div>\n"; print OUT "<div class=\"group\">\n"; - print OUT "<h1>$short_date: $group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; + print OUT "<h1>$short_date $group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; } else @@ -784,7 +784,7 @@ EOF print OUT " | <a href=\"..\">index</a>"; print OUT "</div>\n"; print OUT "<div class=\"main\">\n"; - print OUT "<h1>$short_date: Summary for build $short_build</h1>\n"; + print OUT "<h1>$short_date Summary for build $short_build</h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; }

1 0

Andrey Gusev : d3d8/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 8aac7a224db5721e0f3d9dc586f2fe24daf2f0ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aac7a224db5721e0f3d9dc5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 15 19:55:04 2018 +0200 d3d8/tests: Use GetModuleHandleA instead of LoadLibraryA. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9188f0..9efa943 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8494,7 +8494,7 @@ static void test_clip_planes_limits(void) START_TEST(device) { - HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); + HMODULE d3d8_handle = GetModuleHandleA( "d3d8.dll" ); WNDCLASSA wc = {0}; IDirect3D8 *d3d8; DEVMODEW current_mode;

1 0