December 2015 - Wine-Commits

André Hentschel : wineboot: Remove dead code (Clang).
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 054ca8f3c7a5a449f619d3b825a5ce33780432d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054ca8f3c7a5a449f619d3b82… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:27 2015 +0100 wineboot: Remove dead code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/shutdown.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index 52d37e7..b7752c4 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -133,7 +133,6 @@ static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LP { case WM_INITDIALOG: SetWindowLongPtrW( hwnd, DWLP_USER, lparam ); - data = (struct endtask_dlg_data *)lparam; ShowWindow( hwnd, SW_SHOWNORMAL ); return TRUE; case WM_COMMAND:

1 0

André Hentschel : secur32: Ignore pfQOP in VerifySignature (Clang).
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 63b392b144f27da6ab8740239f2c17969d66ab11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b392b144f27da6ab8740239… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 22:00:38 2015 +0100 secur32: Ignore pfQOP in VerifySignature (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 2 -- dlls/secur32/tests/ntlm.c | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 0fe64ed..a38d81a 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1630,7 +1630,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { PNegoHelper helper; - ULONG fQOP = 0; UINT i; int token_idx; SECURITY_STATUS ret; @@ -1689,7 +1688,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, ret = SEC_E_OK; HeapFree(GetProcessHeap(), 0, local_buff); - pfQOP = &fQOP; return ret; diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 8adbbb4..154d86b 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -928,7 +928,7 @@ static void testSignSeal(void) static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt; SecBuffer data[2], fake_data[2], complex_data[4]; - ULONG qop = 0; + ULONG qop = 0xdeadbeef; SecPkgContext_Sizes ctxt_sizes; static char test_user[] = "testuser", workgroup[] = "WORKGROUP", @@ -1041,12 +1041,13 @@ static void testSignSeal(void) ok(sec_status == SEC_E_MESSAGE_ALTERED, "VerifySignature returned %s, not SEC_E_MESSAGE_ALTERED.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); memcpy(data[0].pvBuffer, message_signature, data[0].cbBuffer); - sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); if (sec_status == SEC_E_UNSUPPORTED_FUNCTION) @@ -1093,6 +1094,7 @@ static void testSignSeal(void) ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, crypt.pBuffers[1].cbBuffer), "Failed to decrypt message correctly.\n"); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); } else trace( "A different session key is being used\n" ); @@ -1130,6 +1132,7 @@ static void testSignSeal(void) sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", @@ -1161,6 +1164,7 @@ static void testSignSeal(void) sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); end:

1 0

Sebastian Lackner : pdh: Fix prototype of PdhGetLogFileType[A/W].
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 4933f08316ac78ae55be7e35de57472725e7bab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4933f08316ac78ae55be7e35d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 24 23:08:08 2015 +0100 pdh: Fix prototype of PdhGetLogFileType[A/W]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 529b92d..41900c8 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -62,8 +62,8 @@ @ stub PdhGetFormattedCounterArrayW @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) @ stub PdhGetLogFileSize -@ stdcall PdhGetLogFileTypeA(ptr ptr) -@ stdcall PdhGetLogFileTypeW(ptr ptr) +@ stdcall PdhGetLogFileTypeA(str ptr) +@ stdcall PdhGetLogFileTypeW(wstr ptr) @ stub PdhGetLogSetGUID @ stub PdhGetRawCounterArrayA @ stub PdhGetRawCounterArrayW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 036d28b..8854fd7 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1273,17 +1273,17 @@ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) /*********************************************************************** * PdhGetLogFileTypeA (PDH.@) */ -PDH_STATUS WINAPI PdhGetLogFileTypeA(PDH_HLOG log, DWORD *type) +PDH_STATUS WINAPI PdhGetLogFileTypeA(const char *log, DWORD *type) { - FIXME("%p, %p: stub\n", log, type); + FIXME("%s, %p: stub\n", debugstr_a(log), type); return PDH_NOT_IMPLEMENTED; } /*********************************************************************** * PdhGetLogFileTypeW (PDH.@) */ -PDH_STATUS WINAPI PdhGetLogFileTypeW(PDH_HLOG log, DWORD *type) +PDH_STATUS WINAPI PdhGetLogFileTypeW(const WCHAR *log, DWORD *type) { - FIXME("%p, %p: stub\n", log, type); + FIXME("%s, %p: stub\n", debugstr_w(log), type); return PDH_NOT_IMPLEMENTED; }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: d94032403d922e9b70987b75cd08ec18461f6aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94032403d922e9b70987b75c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Dec 25 02:22:50 2015 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fi.po b/po/fi.po index e41c1cd..97a9128 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1036,7 +1036,7 @@ msgstr "Valitse kansio" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Fonttikoon täytyy olla luku." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

André Hentschel : winedbg: Remove a dead assignment ( Clang).
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 4f1ed54c7d3274201657eaef6492e727c4c6ab66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1ed54c7d3274201657eaef6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:24 2015 +0100 winedbg: Remove a dead assignment (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index c21336a..cabb75f 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -234,7 +234,7 @@ static int source_display(const char* sourcefile, int start, int end) * OK, I guess the user doesn't really want to see it * after all. */ - ol = source_add_file(sourcefile, NULL); + source_add_file(sourcefile, NULL); return FALSE; } }

1 0

Nikolay Sivov : dwrite/tests: One more test for duplicates in IDWriteTypography.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: f845cca0dc4e9f2194e0ab60798a3e586cd4ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f845cca0dc4e9f2194e0ab607… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:57:56 2015 +0300 dwrite/tests: One more test for duplicates in IDWriteTypography. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6ea2734..5e38a07 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1611,13 +1611,13 @@ static void test_typography(void) count = IDWriteTypography_GetFontFeatureCount(typography); ok(count == 2, "got %u\n", count); - memset(&feature, 0, sizeof(feature)); + memset(&feature, 0xcc, sizeof(feature)); hr = IDWriteTypography_GetFontFeature(typography, 0, &feature); ok(hr == S_OK, "got 0x%08x\n", hr); ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); ok(feature.parameter == 1, "got %u\n", feature.parameter); - memset(&feature, 0, sizeof(feature)); + memset(&feature, 0xcc, sizeof(feature)); hr = IDWriteTypography_GetFontFeature(typography, 1, &feature); ok(hr == S_OK, "got 0x%08x\n", hr); ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); @@ -1626,6 +1626,21 @@ static void test_typography(void) hr = IDWriteTypography_GetFontFeature(typography, 2, &feature); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* duplicated with same parameter value */ + feature.nameTag = DWRITE_FONT_FEATURE_TAG_KERNING; + feature.parameter = 0; + hr = IDWriteTypography_AddFontFeature(typography, feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = IDWriteTypography_GetFontFeatureCount(typography); + ok(count == 3, "got %u\n", count); + + memset(&feature, 0xcc, sizeof(feature)); + hr = IDWriteTypography_GetFontFeature(typography, 2, &feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); + ok(feature.parameter == 0, "got %u\n", feature.parameter); + IDWriteTypography_Release(typography); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Store per-range typography property.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: e9d4725326ab8d9d3be50c2f4d75606abded2363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d4725326ab8d9d3be50c2f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:57:57 2015 +0300 dwrite: Store per-range typography property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 101 +++++++++++++++++++++++++++++++-------------- dlls/dwrite/tests/layout.c | 57 +++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9d4725326ab8d9d3be50…

1 0

Nikolay Sivov : dwrite: Optimize for the most common case of layout object initialization.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 7a83be7bd273a02a6c558f75e9d8a4af6145de5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a83be7bd273a02a6c558f75e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:57:58 2015 +0300 dwrite: Optimize for the most common case of layout object initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 66998b6..b341ad5 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -326,6 +326,8 @@ static inline struct dwrite_textformat *impl_from_IDWriteTextFormat1(IDWriteText return CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat1_iface); } +static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat*); + static inline struct dwrite_trimmingsign *impl_from_IDWriteInlineObject(IDWriteInlineObject *iface) { return CONTAINING_RECORD(iface, struct dwrite_trimmingsign, IDWriteInlineObject_iface); @@ -3896,10 +3898,29 @@ static const IDWriteTextAnalysisSourceVtbl dwritetextlayoutsourcevtbl = { static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) { + struct dwrite_textformat *textformat; IDWriteTextFormat1 *format1; UINT32 len; HRESULT hr; + if ((textformat = unsafe_impl_from_IDWriteTextFormat(format))) { + layout->format = textformat->format; + + layout->format.locale = heap_strdupW(textformat->format.locale); + layout->format.family_name = heap_strdupW(textformat->format.family_name); + if (!layout->format.locale || !layout->format.family_name) + return E_OUTOFMEMORY; + + if (layout->format.trimmingsign) + IDWriteInlineObject_AddRef(layout->format.trimmingsign); + if (layout->format.collection) + IDWriteFontCollection_AddRef(layout->format.collection); + if (layout->format.fallback) + IDWriteFontFallback_AddRef(layout->format.fallback); + + return S_OK; + } + layout->format.weight = IDWriteTextFormat_GetFontWeight(format); layout->format.style = IDWriteTextFormat_GetFontStyle(format); layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); @@ -4599,6 +4620,12 @@ static const IDWriteTextFormat1Vtbl dwritetextformatvtbl = { dwritetextformat1_GetFontFallback }; +static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface) +{ + return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ? + CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat1_iface) : NULL; +} + HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) {

1 0

Austin English : api-ms-win-security-lsalookup-l1-1-0: New dll.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 6767ac4bb79ad774f0c850a8c4753a2e6fdea75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6767ac4bb79ad774f0c850a8c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 19:16:16 2015 -0600 api-ms-win-security-lsalookup-l1-1-0: New dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 4d513c2..287f4ab 100755 --- a/configure +++ b/configure @@ -956,6 +956,7 @@ enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 +enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 @@ -17350,6 +17351,7 @@ wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_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-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 diff --git a/configure.ac b/configure.ac index 02eb144..a1d3f97 100644 --- a/configure.ac +++ b/configure.ac @@ -2688,6 +2688,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in new file mode 100644 index 0000000..f686396 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l1-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec new file mode 100644 index 0000000..9b45265 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub LookupAccountNameLocalA +@ stub LookupAccountNameLocalW +@ stub LookupAccountSidLocalA +@ stub LookupAccountSidLocalW +@ stub LsaLookupClose +@ stub LsaLookupFreeMemory +@ stub LsaLookupGetDomainInfo +@ stub LsaLookupManageSidNameMapping +@ stub LsaLookupOpenLocalPolicy +@ stub LsaLookupTranslateNames +@ stub LsaLookupTranslateSids diff --git a/tools/make_specfiles b/tools/make_specfiles index 986070f..16db908 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -153,6 +153,7 @@ my @dll_groups = "api-ms-win-core-registry-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-2-0", + "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-sddl-l1-1-0", "api-ms-win-service-core-l1-1-1", "api-ms-win-service-management-l1-1-0",

1 0

Nikolay Sivov : ole32/tests: Remove some casts we don't need, fix a couple of others.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 88111ca2c03570f85f9bda94e1ac22f679c2c9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88111ca2c03570f85f9bda94e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:58 2015 +0300 ole32/tests: Remove some casts we don't need, fix a couple of others. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 28370ca..058e5ec 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -484,7 +484,7 @@ static IOleObject OleObject = { &OleObjectVtbl }; static HRESULT WINAPI OleObjectPersistStg_QueryInterface(IPersistStorage *iface, REFIID riid, void **ppv) { trace("OleObjectPersistStg_QueryInterface\n"); - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectPersistStg_AddRef(IPersistStorage *iface) @@ -582,7 +582,7 @@ static IPersistStorage OleObjectPersistStg = { &OleObjectPersistStgVtbl }; static HRESULT WINAPI OleObjectCache_QueryInterface(IOleCache *iface, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectCache_AddRef(IOleCache *iface) @@ -708,7 +708,7 @@ static ULONG WINAPI OleObjectCF_Release(IClassFactory *iface) static HRESULT WINAPI OleObjectCF_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static HRESULT WINAPI OleObjectCF_LockServer(IClassFactory *iface, BOOL lock) @@ -729,7 +729,7 @@ static IClassFactory OleObjectCF = { &OleObjectCFVtbl }; static HRESULT WINAPI OleObjectRunnable_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectRunnable_AddRef(IRunnableObject *iface) @@ -1912,13 +1912,13 @@ static void test_data_cache_dib_contents_stream(int num) CLSID cls; SIZEL sz; - hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void *)&unk ); + hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void **)&unk ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void *)&persist ); + hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void **)&persist ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void *)&data ); + hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void **)&data ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void *)&view ); + hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void **)&view ); ok( SUCCEEDED(hr), "got %08x\n", hr ); stg = create_storage( num ); @@ -2333,7 +2333,7 @@ static void test_OleLockRunning(void) { HRESULT hr; - hr = OleLockRunning((LPUNKNOWN)&unknown, TRUE, FALSE); + hr = OleLockRunning(&unknown, TRUE, FALSE); ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); }

1 0