wine-devel February 2018

wine-devel@winehq.org

74 participants
746 discussions

Start a nNew thread

[PATCH] winedbg: fix compilation warning - enum value scope
by vlad.bespalov＠jetstreamsoft.com 02 Feb '18

02 Feb '18

1 0

[PATCH] user32/tests: Add some tests for GetClassName() and versioned classes
by Nikolay Sivov 02 Feb '18

02 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/class.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 88e4bfcfa4..13d7b9d477 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1211,12 +1211,15 @@ static void test_actctx_classes(void) "<windowClass>MyTestClass</windowClass>" "</file>" "</assembly>"; + static const char *testclass = "MyTestClass"; WNDCLASSA wc; ULONG_PTR cookie; HANDLE context; BOOL ret; ATOM class; HINSTANCE hinst; + char buff[64]; + HWND hwnd; create_manifest_file("main.manifest", main_manifest); context = create_test_actctx("main.manifest"); @@ -1228,29 +1231,56 @@ static void test_actctx_classes(void) memset(&wc, 0, sizeof(wc)); wc.lpfnWndProc = ClassTest_WndProc; wc.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); - wc.lpszClassName = "MyTestClass"; + wc.lpszClassName = testclass; hinst = GetModuleHandleW(0); - ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ret = GetClassInfoA(hinst, testclass, &wc); ok(!ret, "Expected failure.\n"); class = RegisterClassA(&wc); ok(class != 0, "Failed to register class.\n"); /* Class info is available by versioned and regular names. */ - ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ret = GetClassInfoA(hinst, testclass, &wc); ok(ret, "Failed to get class info.\n"); + hwnd = CreateWindowExA(0, testclass, "test", 0, 0, 0, 0, 0, 0, 0, hinst, 0); + ok(hwnd != NULL, "Failed to create a window.\n"); + + ret = GetClassNameA(hwnd, buff, sizeof(buff)); + ok(ret, "Failed to get class name.\n"); +todo_wine + ok(!strcmp(buff, testclass), "Unexpected class name.\n"); + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); ok(ret, "Failed to get class info.\n"); - ret = UnregisterClassA("MyTestClass", hinst); - ok(ret, "Failed to unregister class.\n"); + ret = UnregisterClassA(testclass, hinst); + ok(!ret, "Failed to unregister class.\n"); ret = DeactivateActCtx(0, cookie); ok(ret, "Failed to deactivate context.\n"); + ret = GetClassInfoA(hinst, testclass, &wc); + ok(!ret, "Unexpected ret val %d.\n", ret); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); + ok(ret, "Failed to get class info.\n"); + + ret = GetClassNameA(hwnd, buff, sizeof(buff)); + ok(ret, "Failed to get class name.\n"); +todo_wine + ok(!strcmp(buff, testclass), "Unexpected class name.\n"); + + DestroyWindow(hwnd); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(!ret, "Unexpected ret value %d.\n", ret); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + /* Register versioned class without active context. */ wc.lpszClassName = "4.3.2.1!MyTestClass"; class = RegisterClassA(&wc); -- 2.15.1

1 0

[PATCH 3/3] kerberos: Use the global memory allocation helpers.
by Hans Leidekker 02 Feb '18

02 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index d2280e5129..8b5b6128ac 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -43,6 +43,7 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" +#include "wine/heap.h" #include "wine/library.h" #include "wine/debug.h" @@ -106,21 +107,6 @@ MAKE_FUNCPTR(krb5_free_unparsed_name); MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR -static inline void *heap_alloc(SIZE_T size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void *heap_realloc(void *p, SIZE_T size) -{ - return HeapReAlloc(GetProcessHeap(), 0, p, size); -} - -static inline void heap_free(void *p) -{ - HeapFree(GetProcessHeap(), 0, p); -} - static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -757,7 +743,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam gss_buffer_desc buf; buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; - if (!(buf.value = HeapAlloc( GetProcessHeap(), 0, buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(buf.value = heap_alloc( buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); buf.length--; @@ -765,7 +751,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - HeapFree( GetProcessHeap(), 0, buf.value ); + heap_free( buf.value ); return status_gss_to_sspi( ret ); } -- 2.11.0

1 0

[PATCH 2/3] kerberos: Fix parameter check in kerberos_SpUnsealMessage.
by Hans Leidekker 02 Feb '18

02 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0345469cc5..d2280e5129 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1339,7 +1339,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); - if (context) return SEC_E_INVALID_HANDLE; + if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; -- 2.11.0

1 0

[PATCH 1/3] kerberos: Don't check for GSS_S_CONTINUE_NEEDED from gss_acquire_cred.
by Hans Leidekker 02 Feb '18

02 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 78e4e932c1..0345469cc5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -860,7 +860,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( &cred_handle, NULL, &expiry_time ); TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + if (ret == GSS_S_COMPLETE) { credhandle_gss_to_sspi( cred_handle, credential ); expirytime_gss_to_sspi( expiry_time, ts_expiry ); -- 2.11.0

1 0

[PATCH] api-ms-win-security-lsalookup-l2-1-0: Add dll.
by Andrey Gusev 02 Feb '18

02 Feb '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l2-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) create mode 100644 dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in create mode 100644 dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec diff --git a/configure b/configure index b891454312..3e7feecf05 100755 --- a/configure +++ b/configure @@ -1067,6 +1067,7 @@ enable_api_ms_win_security_credentials_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 +enable_api_ms_win_security_lsalookup_l2_1_0 enable_api_ms_win_security_lsalookup_l2_1_1 enable_api_ms_win_security_lsapolicy_l1_1_0 enable_api_ms_win_security_provider_l1_1_0 @@ -18497,6 +18498,7 @@ wine_fn_config_dll api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_secu wine_fn_config_dll api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 +wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-0 enable_api_ms_win_security_lsalookup_l2_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 wine_fn_config_dll api-ms-win-security-lsapolicy-l1-1-0 enable_api_ms_win_security_lsapolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-provider-l1-1-0 enable_api_ms_win_security_provider_l1_1_0 diff --git a/configure.ac b/configure.ac index 8b48d2e03c..23f297b469 100644 --- a/configure.ac +++ b/configure.ac @@ -2980,6 +2980,7 @@ WINE_CONFIG_DLL(api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsapolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-provider-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in new file mode 100644 index 0000000000..cf41467f57 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l2-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec new file mode 100644 index 0000000000..25b293939d --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW +@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW +@ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW +@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/tools/make_specfiles b/tools/make_specfiles index 4dae97f245..e5b2617187 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -129,6 +129,7 @@ my @dll_groups = "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", + "api-ms-win-security-lsalookup-l2-1-0", "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-lsapolicy-l1-1-0", "api-ms-win-security-provider-l1-1-0", -- 2.13.6

1 0

[PATCH] api-ms-win-core-shutdown-l1-1-0: Add dll.
by Andrey Gusev 02 Feb '18

02 Feb '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-shutdown-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) create mode 100644 dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec diff --git a/configure b/configure index 3818f68bef..b891454312 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 +enable_api_ms_win_core_shutdown_l1_1_0 enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 @@ -18408,6 +18409,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-1-0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-2-0 enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 +wine_fn_config_dll api-ms-win-core-shutdown-l1-1-0 enable_api_ms_win_core_shutdown_l1_1_0 wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_sidebyside_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 diff --git a/configure.ac b/configure.ac index 2d2b7bef57..8b48d2e03c 100644 --- a/configure.ac +++ b/configure.ac @@ -2892,6 +2892,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-shutdown-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) diff --git a/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in b/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in new file mode 100644 index 0000000000..f51a5193be --- /dev/null +++ b/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-shutdown-l1-1-0.dll diff --git a/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec b/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec new file mode 100644 index 0000000000..3f353e5f8a --- /dev/null +++ b/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall AbortSystemShutdownW(ptr) advapi32.AbortSystemShutdownW +@ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) advapi32.InitiateSystemShutdownExW diff --git a/tools/make_specfiles b/tools/make_specfiles index 417cf50ac3..4dae97f245 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -116,6 +116,7 @@ my @dll_groups = "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", "api-ms-win-core-registry-l2-1-0", + "api-ms-win-core-shutdown-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0", "api-ms-win-eventing-controller-l1-1-0", -- 2.13.6

1 0

[PATCH] user32: Try harder to find a target for mouse messages (resend)
by Fabian Maurer 02 Feb '18

02 Feb '18

Fixes bug 12007 and bug 44012. This is an old patch from staging. It seems to have been rejected back then, but I couldn't find any info on why. From: Dmitry Timoshkov <dmitry(a)codeweavers.com> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/message.c | 2 +- dlls/user32/tests/input.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 172d6593f6..46e39c8bcb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2502,7 +2502,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H } else { - msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + msg->hwnd = WINPOS_WindowFromPoint( 0, msg->pt, &hittest ); } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e52f7d215f..437e70cfb6 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2029,8 +2029,8 @@ static void test_Input_mouse(void) } } ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); - todo_wine ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); - todo_wine ok(got_button_up, "expected WM_LBUTTONUP message\n"); + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); DestroyWindow(static_win); /* click on HTTRANSPARENT top-level window that belongs to other thread */ -- 2.16.1

3 2

[PATCH] ole32: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 02 Feb '18

02 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/compobj_private.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0f10a7c0c4..9e65c3ec0c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -30,6 +30,7 @@ #include <stdarg.h> #include "wine/list.h" +#include "wine/heap.h" #include "windef.h" #include "winbase.h" @@ -259,7 +260,7 @@ void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; static inline struct oletls *COM_CurrentInfo(void) { if (!NtCurrentTeb()->ReservedForOle) - NtCurrentTeb()->ReservedForOle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct oletls)); + NtCurrentTeb()->ReservedForOle = heap_alloc_zero(sizeof(struct oletls)); return NtCurrentTeb()->ReservedForOle; } @@ -323,16 +324,6 @@ extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) { *dst = *src; -- 2.14.3

2 1

[PATCH] gameux/tests: Drop game stats test workarounds for Windows <= 2000
by Alex Henrie 02 Feb '18

02 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This resolves a Coverity warning. dlls/gameux/tests/Makefile.in | 2 +- dlls/gameux/tests/gamestatistics.c | 29 +---------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in index c90132d0ac..7b3f2f9cd1 100644 --- a/dlls/gameux/tests/Makefile.in +++ b/dlls/gameux/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gameux.dll -IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 +IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 shell32 C_SRCS = \ gameexplorer.c \ diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index dd9bd3748a..ff247fcb17 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -32,25 +32,6 @@ */ static WCHAR sExeName[MAX_PATH] = {0}; static GUID gameInstanceId; -static HRESULT WINAPI (*pSHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); -/******************************************************************************* - *_loadDynamicRoutines - * - * Helper function, prepares pointers to system procedures which may be not - * available on older operating systems. - * - * Returns: - * TRUE procedures were loaded successfully - * FALSE procedures were not loaded successfully - */ -static BOOL _loadDynamicRoutines(void) -{ - HMODULE hModule = LoadLibraryA( "shell32.dll" ); - - pSHGetFolderPathW = (LPVOID)GetProcAddress(hModule, "SHGetFolderPathW"); - if (!pSHGetFolderPathW) return FALSE; - return TRUE; -} /******************************************************************************* * Registers test suite executable as game in Games Explorer. Required to test @@ -117,7 +98,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta HRESULT hr; WCHAR sGuid[49], sPath[MAX_PATH]; - hr = pSHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); + hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); if(SUCCEEDED(hr)) hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); @@ -396,14 +377,6 @@ START_TEST(gamestatistics) IGameStatisticsMgr* gsm; IGameExplorer *ge; - if (!_loadDynamicRoutines()) - { - /* this is not a failure, because a procedure loaded by address - * is always available on systems which has gameux.dll */ - win_skip("too old system, cannot load required dynamic procedures\n"); - return; - } - hr = CoInitialize( NULL ); ok(hr == S_OK, "failed to init COM\n"); -- 2.16.1

2 1

← Newer
1
...
66
67
68
69
70
71
72
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2018