September 2018 - Wine-commits

Gabriel Ivăncescu : user32/listbox: Update the size in SetColumnWidth before calling UpdatePage.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 84ac7e1571dc1e11211edccddafe9d1e290ea27e URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ac7e1571dc1e11211edccd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 5 18:51:51 2018 +0300 user32/listbox: Update the size in SetColumnWidth before calling UpdatePage. Some applications don't forward WM_SIZE from DefWindowProc to the control, but instead only send a LB_SETCOLUMNWIDTH message, even when the column width doesn't change (but the listbox size does). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 05fcc44..c8bd148 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1262,12 +1262,19 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) /*********************************************************************** * LISTBOX_SetColumnWidth */ -static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) +static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT column_width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); - descr->column_width = width; - LISTBOX_UpdatePage( descr ); + RECT rect; + + TRACE("[%p]: new column width = %d\n", descr->self, column_width); + + GetClientRect(descr->self, &rect); + descr->width = rect.right - rect.left; + descr->height = rect.bottom - rect.top; + descr->column_width = column_width; + + LISTBOX_UpdatePage(descr); + LISTBOX_UpdateScroll(descr); return LB_OKAY; }

1 0

Alexandre Julliard : user32: Ignore application-specified DPI awareness when DPI scaling is disabled.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 15059052904910b9efab898b43a264bc91e261f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15059052904910b9efab898b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 18:16:10 2018 +0200 user32: Ignore application-specified DPI awareness when DPI scaling is disabled. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 028a0a9..224d2f9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1460,7 +1460,11 @@ void SYSPARAMS_Init(void) /* FIXME: what do the DpiScalingVer flags mean? */ get_dword_entry( (union sysparam_all_entry *)&entry_DPISCALINGVER, 0, &dpi_scaling, 0 ); - if (!dpi_scaling) default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; + if (!dpi_scaling) + { + default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; + if (dpi_awareness) dpi_awareness = 0x10 | default_awareness; + } if (volatile_base_key && dispos == REG_CREATED_NEW_KEY) /* first process, initialize entries */ {

1 0

Nikolay Sivov : shlwapi/tests: Add some tests for memory stream.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 917b2a36419c949aacb869b63ea4644374ee94b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917b2a36419c949aacb869b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 14:55:59 2018 +0300 shlwapi/tests: Add some tests for memory stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/istream.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 7d0cd61..560a822 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -733,6 +733,43 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) DeleteFileW( dstFileName ); } +static void test_SHCreateMemStream(void) +{ + static const BYTE initial[10]; + IStream *stream, *stream2; + IUnknown *unk; + char buff[10]; + HRESULT hr; + + stream = SHCreateMemStream(initial, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 10); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + + hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* WinXP */, "Failed to QI, hr %#x.\n", hr); + if (unk) + IUnknown_Release(unk); + + hr = IStream_Read(stream, buff, sizeof(buff), NULL); +todo_wine + ok(hr == S_FALSE || broken(hr == S_OK) /* WinXP */, "Unexpected hr %#x.\n", hr); + + hr = IStream_Clone(stream, &stream2); +todo_wine + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* < Win8 */, "Failed to clone a stream, hr %#x.\n", hr); + if (hr == S_OK) + IStream_Release(stream2); + + IStream_Release(stream); +} START_TEST(istream) { @@ -773,4 +810,5 @@ START_TEST(istream) } test_SHCreateStreamOnFileEx_CopyTo(); + test_SHCreateMemStream(); }

1 0

André Hentschel : api-ms-win-core-comm-l1-1-0: Add dll.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: be974da9f6d245c21b0e4c0d35a939360d6fbadb URL: https://source.winehq.org/git/wine.git/?a=commit;h=be974da9f6d245c21b0e4c0d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 14:06:38 2018 +0200 api-ms-win-core-comm-l1-1-0: Add dll. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-comm-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-comm-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 23 insertions(+) diff --git a/configure b/configure index b800fd2..c9ab5af 100755 --- a/configure +++ b/configure @@ -911,6 +911,7 @@ enable_api_ms_win_core_bem_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_com_private_l1_1_0 +enable_api_ms_win_core_comm_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_crt_l1_1_0 @@ -19005,6 +19006,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-bem-l1-1-0 enable_api_ms_win_core_b wine_fn_config_makefile dlls/api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com_private_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-comm-l1-1-0 enable_api_ms_win_core_comm_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 diff --git a/configure.ac b/configure.ac index d7d5e8e..69f641d 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-bem-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-private-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) diff --git a/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in new file mode 100644 index 0000000..1780e24 --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-comm-l1-1-0.dll diff --git a/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec new file mode 100644 index 0000000..4842c98 --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall ClearCommBreak(long) kernel32.ClearCommBreak +@ stdcall ClearCommError(long ptr ptr) kernel32.ClearCommError +@ stdcall EscapeCommFunction(long long) kernel32.EscapeCommFunction +@ stdcall GetCommConfig(long ptr ptr) kernel32.GetCommConfig +@ stdcall GetCommMask(long ptr) kernel32.GetCommMask +@ stdcall GetCommModemStatus(long ptr) kernel32.GetCommModemStatus +@ stdcall GetCommProperties(long ptr) kernel32.GetCommProperties +@ stdcall GetCommState(long ptr) kernel32.GetCommState +@ stdcall GetCommTimeouts(long ptr) kernel32.GetCommTimeouts +@ stdcall PurgeComm(long long) kernel32.PurgeComm +@ stdcall SetCommBreak(long) kernel32.SetCommBreak +@ stdcall SetCommConfig(long ptr long) kernel32.SetCommConfig +@ stdcall SetCommMask(long long) kernel32.SetCommMask +@ stdcall SetCommState(long ptr) kernel32.SetCommState +@ stdcall SetCommTimeouts(long ptr) kernel32.SetCommTimeouts +@ stdcall SetupComm(long long long) kernel32.SetupComm +@ stdcall TransmitCommChar(long long) kernel32.TransmitCommChar +@ stdcall WaitCommEvent(long ptr ptr) kernel32.WaitCommEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index cd3af87..24514fc 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -198,6 +198,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", + "api-ms-win-core-comm-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-delayload-l1-1-0",

1 0

André Hentschel : api-ms-win-core-stringloader-l1-1-1 : Add dll.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 82f0bb3754cac4ee0483a3a29fc45f8fd4af55ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=82f0bb3754cac4ee0483a3a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 14:07:08 2018 +0200 api-ms-win-core-stringloader-l1-1-1: Add dll. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-stringloader-l1-1-1.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index c9ab5af..6961193 100755 --- a/configure +++ b/configure @@ -1000,6 +1000,7 @@ enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 enable_api_ms_win_core_stringansi_l1_1_0 +enable_api_ms_win_core_stringloader_l1_1_1 enable_api_ms_win_core_synch_ansi_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 @@ -19095,6 +19096,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-string-l1-1-0 enable_api_ms_win_cor wine_fn_config_makefile dlls/api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-stringansi-l1-1-0 enable_api_ms_win_core_stringansi_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-stringloader-l1-1-1 enable_api_ms_win_core_stringloader_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-synch-ansi-l1-1-0 enable_api_ms_win_core_synch_ansi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 diff --git a/configure.ac b/configure.ac index 69f641d..f8af8a3 100644 --- a/configure.ac +++ b/configure.ac @@ -2953,6 +2953,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-stringansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-stringloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-2-0) diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in b/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in new file mode 100644 index 0000000..a390a74 --- /dev/null +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-stringloader-l1-1-1.dll diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec new file mode 100644 index 0000000..a60736e --- /dev/null +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec @@ -0,0 +1,2 @@ +@ stdcall LoadStringA(long long ptr long) user32.LoadStringA +@ stdcall LoadStringW(long long ptr long) user32.LoadStringW diff --git a/tools/make_specfiles b/tools/make_specfiles index 24514fc..d69563b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -366,6 +366,7 @@ my @dll_groups = [ "user32", "api-ms-win-core-stringansi-l1-1-0", + "api-ms-win-core-stringloader-l1-1-1", "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0",

1 0

André Hentschel : api-ms-win-security-cryptoapi-l1-1-0: Add dll.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 18461f64f65f79526ee5a9fcc82cdb4ec9b01b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18461f64f65f79526ee5a9fc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 14:07:29 2018 +0200 api-ms-win-security-cryptoapi-l1-1-0: Add dll. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-security-cryptoapi-l1-1-0.spec | 39 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 44 insertions(+) diff --git a/configure b/configure index 6961193..a3916ee 100755 --- a/configure +++ b/configure @@ -1089,6 +1089,7 @@ enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_base_private_l1_1_1 enable_api_ms_win_security_credentials_l1_1_0 +enable_api_ms_win_security_cryptoapi_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 @@ -19185,6 +19186,7 @@ wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_s wine_fn_config_makefile dlls/api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-security-base-private-l1-1-1 enable_api_ms_win_security_base_private_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_security_credentials_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-security-cryptoapi-l1-1-0 enable_api_ms_win_security_cryptoapi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 diff --git a/configure.ac b/configure.ac index f8af8a3..006f7d9 100644 --- a/configure.ac +++ b/configure.ac @@ -3042,6 +3042,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1) diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in b/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in new file mode 100644 index 0000000..48c0d82 --- /dev/null +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-cryptoapi-l1-1-0.dll diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec new file mode 100644 index 0000000..357af4c --- /dev/null +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec @@ -0,0 +1,39 @@ +@ stdcall CryptAcquireContextA(ptr str str long long) advapi32.CryptAcquireContextA +@ stdcall CryptAcquireContextW(ptr wstr wstr long long) advapi32.CryptAcquireContextW +@ stdcall CryptContextAddRef(long ptr long) advapi32.CryptContextAddRef +@ stdcall CryptCreateHash(long long long long ptr) advapi32.CryptCreateHash +@ stdcall CryptDecrypt(long long long long ptr ptr) advapi32.CryptDecrypt +@ stdcall CryptDeriveKey(long long long long ptr) advapi32.CryptDeriveKey +@ stdcall CryptDestroyHash(long) advapi32.CryptDestroyHash +@ stdcall CryptDestroyKey(long) advapi32.CryptDestroyKey +@ stdcall CryptDuplicateHash(long ptr long ptr) advapi32.CryptDuplicateHash +@ stdcall CryptDuplicateKey(long ptr long ptr) advapi32.CryptDuplicateKey +@ stdcall CryptEncrypt(long long long long ptr ptr long) advapi32.CryptEncrypt +@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesA +@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesW +@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersA +@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersW +@ stdcall CryptExportKey(long long long long ptr ptr) advapi32.CryptExportKey +@ stdcall CryptGenKey(long long long ptr) advapi32.CryptGenKey +@ stdcall CryptGenRandom(long long ptr) advapi32.CryptGenRandom +@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderA +@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderW +@ stdcall CryptGetHashParam(long long ptr ptr long) advapi32.CryptGetHashParam +@ stdcall CryptGetKeyParam(long long ptr ptr long) advapi32.CryptGetKeyParam +@ stdcall CryptGetProvParam(long long ptr ptr long) advapi32.CryptGetProvParam +@ stdcall CryptGetUserKey(long long ptr) advapi32.CryptGetUserKey +@ stdcall CryptHashData(long ptr long long) advapi32.CryptHashData +@ stdcall CryptHashSessionKey(long long long) advapi32.CryptHashSessionKey +@ stdcall CryptImportKey(long ptr long long long ptr) advapi32.CryptImportKey +@ stdcall CryptReleaseContext(long long) advapi32.CryptReleaseContext +@ stdcall CryptSetHashParam(long long ptr long) advapi32.CryptSetHashParam +@ stdcall CryptSetKeyParam(long long ptr long) advapi32.CryptSetKeyParam +@ stdcall CryptSetProvParam(long long ptr long) advapi32.CryptSetProvParam +@ stdcall CryptSetProviderA(str long) advapi32.CryptSetProviderA +@ stdcall CryptSetProviderExA(str long ptr long) advapi32.CryptSetProviderExA +@ stdcall CryptSetProviderExW(wstr long ptr long) advapi32.CryptSetProviderExW +@ stdcall CryptSetProviderW(wstr long) advapi32.CryptSetProviderW +@ stdcall CryptSignHashA(long long str long ptr ptr) advapi32.CryptSignHashA +@ stdcall CryptSignHashW(long long wstr long ptr ptr) advapi32.CryptSignHashW +@ stdcall CryptVerifySignatureA(long ptr long long str long) advapi32.CryptVerifySignatureA +@ stdcall CryptVerifySignatureW(long ptr long long wstr long) advapi32.CryptVerifySignatureW diff --git a/tools/make_specfiles b/tools/make_specfiles index d69563b..7d4a85b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", + "api-ms-win-security-cryptoapi-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",

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: cssFloat property implementation.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 78d0aab45b433ed69a0d6dd6ba46f0240a5ab406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d0aab45b433ed69a0d6dd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:44:24 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::cssFloat property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 479c1df..fbdf633 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -7284,15 +7284,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_clipLeft(IHTMLCSSStyleDeclarat static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssFloat(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_FLOAT, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssFloat(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_FLOAT, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundClip(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9addbcf..ca1909c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2861,6 +2861,26 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_styleFloat(style, &str); ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + if(css_style) { + str = NULL; + hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); + ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("right"); + hres = IHTMLCSSStyleDeclaration_put_cssFloat(css_style, str); + ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); + ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "right"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: put_cssStyle implementation.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 45f8c03cc73a84201db8e5e7570d62fa518bde7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f8c03cc73a84201db8e5e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:44:50 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::put_cssStyle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 28 +++++++++++++++------------- dlls/mshtml/tests/style.c | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index fbdf633..2e2777a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2463,20 +2463,10 @@ static HRESULT WINAPI HTMLStyle_get_pageBreakAfter(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - nsAString text_str; - nsresult nsres; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_InitDepend(&text_str, v); - nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); - nsAString_Finish(&text_str); - if(NS_FAILED(nsres)) { - FIXME("SetCssStyle failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + return IHTMLCSSStyleDeclaration_put_cssText(&This->IHTMLCSSStyleDeclaration_iface, v); } static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) @@ -5793,8 +5783,20 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_pageBreakAfter(IHTMLCSSStyleDe static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssText(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&text_str, v); + nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + FIXME("SetCssStyle failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssText(IHTMLCSSStyleDeclaration *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ca1909c..b33cd01 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -355,7 +355,9 @@ static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char * static void test_set_csstext(IHTMLStyle *style) { + IHTMLCSSStyleDeclaration *css_style; VARIANT v; + BSTR str; HRESULT hres; test_style_set_csstext(style, "background-color: black;"); @@ -365,6 +367,27 @@ static void test_set_csstext(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "black"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLCSSStyleDeclaration, (void**)&css_style); + ok(hres == S_OK || broken(!is_ie9plus && hres == E_NOINTERFACE), + "Could not get IHTMLCSSStyleDeclaration interface: %08x\n", hres); + if(FAILED(hres)) + return; + + str = a2bstr("float: left;"); + hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, str); + ok(hres == S_OK, "put_cssText failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); + ok(hres == S_OK, "get_cssText failed: %08x\n", hres); + ok(!strcmp_wa(str, "left"), "cssFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, NULL); + ok(hres == S_OK, "put_cssText failed: %08x\n", hres); + + IHTMLCSSStyleDeclaration_Release(css_style); } static void test_style2(IHTMLStyle2 *style2)

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: get_cssText implementation.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 78b8ee543f73934121b3a8e126c1c27336ca8ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78b8ee543f73934121b3a8e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:45:03 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::get_cssText implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 29 ++++++++++------------------- dlls/mshtml/tests/style.c | 9 ++++++++- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2e2777a..d6ea37d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2472,26 +2472,10 @@ static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - nsAString text_str; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - /* FIXME: Gecko style formatting is different than IE (uppercase). */ - nsAString_Init(&text_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *text; - - nsAString_GetData(&text_str, &text); - *p = *text ? SysAllocString(text) : NULL; - }else { - FIXME("GetCssStyle failed: %08x\n", nsres); - *p = NULL; - } - - nsAString_Finish(&text_str); - return S_OK; + return IHTMLCSSStyleDeclaration_get_cssText(&This->IHTMLCSSStyleDeclaration_iface, p); } static HRESULT WINAPI HTMLStyle_put_pixelTop(IHTMLStyle *iface, LONG v) @@ -5802,8 +5786,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssText(IHTMLCSSStyleDeclarati static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssText(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* NOTE: Quicks mode should use different formatting (uppercase, no ';' at the end of rule). */ + nsAString_Init(&text_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str); + return return_nsstr(nsres, &text_str, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cursor(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index b33cd01..cbd3257 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -380,10 +380,17 @@ static void test_set_csstext(IHTMLStyle *style) SysFreeString(str); hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); - ok(hres == S_OK, "get_cssText failed: %08x\n", hres); + ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); ok(!strcmp_wa(str, "left"), "cssFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCSSStyleDeclaration_get_cssText(css_style, &str); + ok(hres == S_OK, "get_cssText failed: %08x\n", hres); + todo_wine_if(compat_mode < COMPAT_IE9) + ok(!strcmp_wa(str, compat_mode >= COMPAT_IE9 ? "float: left;" : "FLOAT: left"), + "cssFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, NULL); ok(hres == S_OK, "put_cssText failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: removeProperty implementation.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 9269cda82bb0105e276441ed20695d8de0b60576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9269cda82bb0105e276441ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:50:56 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::removeProperty implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d6ea37d..8cfc6e1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4766,8 +4766,18 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_getPropertyPriority(IHTMLCSSStyleD static HRESULT WINAPI HTMLCSSStyleDeclaration_removeProperty(IHTMLCSSStyleDeclaration *iface, BSTR bstrPropertyName, BSTR *pbstrPropertyValue) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue); - return E_NOTIMPL; + const style_tbl_entry_t *style_entry; + nsAString name_str, ret_str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue); + + style_entry = lookup_style_tbl(bstrPropertyName); + nsAString_InitDepend(&name_str, style_entry ? style_entry->name : bstrPropertyName); + nsAString_Init(&ret_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + nsAString_Finish(&name_str); + return return_nsstr(nsres, &ret_str, pbstrPropertyValue); } static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclaration *iface, BSTR bstrPropertyName, VARIANT *pvarPropertyValue, VARIANT *pvarPropertyPriority)

1 0