October 2017 - Wine-commits

Stefan Dösinger : msvcp120/tests: Test _Xtime_diff_to_millis2 overflow behavior.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 9787af34b1c23deb67902fc7dbf2c8421b987048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9787af34b1c23deb67902fc7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 17 17:41:56 2017 +0200 msvcp120/tests: Test _Xtime_diff_to_millis2 overflow behavior. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 62165e9..c0d6f18 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -576,6 +576,15 @@ static void test__Xtime_diff_to_millis2(void) {0, 0, 0, 1234000001, 1235}, {0, 0, 0, 1234000009, 1235}, {0, 0, -1, 0, 0}, + {1, 0, 0, 0, 0}, + {0, 1000000000, 0, 0, 0}, + {0x7FFFFFFF / 1000, 0, 0, 0, 0}, + {2147484, 0, 0, 0, 0}, /* ceil(0x80000000 / 1000) */ + {2147485, 0, 0, 0, 0}, /* ceil(0x80000000 / 1000) + 1*/ + {0, 0, 0x7FFFFFFF / 1000, 0, 2147483000}, + {0, 0, 0x7FFFFFFF / 1000, 647000000, 0x7FFFFFFF}, /* max */ + {0, 0, 0x7FFFFFFF / 1000, 647000001, -2147483648}, /* overflow. */ + {0, 0, 2147484, 0, -2147483296}, /* ceil(0x80000000 / 1000), overflow*/ {0, 0, 0, -10000000, 0}, {0, 0, -1, -100000000, 0}, {-1, 0, 0, 0, 1000}, @@ -583,7 +592,18 @@ static void test__Xtime_diff_to_millis2(void) {-1, -100000000, 0, 0, 1100}, {0, 0, -1, 2000000000, 1000}, {0, 0, -2, 2000000000, 0}, - {0, 0, -2, 2100000000, 100} + {0, 0, -2, 2100000000, 100}, + {0, 0, _I64_MAX / 1000, 0, -808}, /* Still fits in a signed 64 bit number */ + {0, 0, _I64_MAX / 1000, 1000000000, 192}, /* Overflows a signed 64 bit number */ + {0, 0, (((ULONGLONG)0x80000000 << 32) | 0x1000) / 1000, 1000000000, 4192}, /* 64 bit overflow */ + {_I64_MAX - 2, 0, _I64_MAX, 0, 2000}, /* Not an overflow */ + {_I64_MAX, 0, _I64_MAX - 2, 0, 0}, /* Not an overflow */ + + /* October 11th 2017, 12:34:59 UTC */ + {1507725144, 983274000, 0, 0, 0}, + {0, 0, 1507725144, 983274000, 191624088}, + {1507725144, 983274000, 1507725145, 983274000, 1000}, + {1507725145, 983274000, 1507725145, 983274000, 0}, }; int i; MSVCRT_long ret;

1 0

Jacek Caban : mshtml: Use window event target instead of body only for selected event properties.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: e38c2ceb51f29d8fcba610ed027a44cb44ac521f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38c2ceb51f29d8fcba610ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 16 22:31:42 2017 +0200 mshtml: Use window event target instead of body only for selected event properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 19 ++++++++++++---- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 9 -------- dlls/mshtml/htmlevent.c | 53 +++++++++++++++---------------------------- dlls/mshtml/htmlevent.h | 13 +++++++---- dlls/mshtml/htmlwindow.c | 7 ------ dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsevents.c | 17 ++------------ dlls/mshtml/tests/events.html | 12 +++++++++- dlls/mshtml/xmlhttprequest.c | 1 - 10 files changed, 55 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e38c2ceb51f29d8fcba61…

1 0

Jacek Caban : mshtml: Fire message event with window as a target.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: d054357cbfdd88f1df94ff672f2e357ae1fefbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d054357cbfdd88f1df94ff672… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 16 22:31:50 2017 +0200 mshtml: Fire message event with window as a target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4084a18..1c27c13 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -153,7 +153,7 @@ static const event_info_t event_info[] = { {loadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_BODY}, {messageW, EVENTT_NONE, DISPID_EVMETH_ONMESSAGE, - EVENT_BUBBLE /* FIXME: remove when we get the target right */ }, + 0}, {mousedownW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {mousemoveW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b366534..13963da 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2155,7 +2155,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR return E_FAIL; } - fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, &This->inner_window->doc->node, NULL, NULL); + fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, NULL, NULL, NULL); return S_OK; }

1 0

Martin Storsjo : api-ms-win-core-synch-ansi-l1-1-0: Add dll.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 91ad8f5a2eefc094b04fc6e4277f91f5c2ddbfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ad8f5a2eefc094b04fc6e42… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 16 12:21:22 2017 +0300 api-ms-win-core-synch-ansi-l1-1-0: Add dll. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-synch-ansi-l1-1-0.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index fa9b75e..3d798cb 100755 --- a/configure +++ b/configure @@ -976,6 +976,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_synch_ansi_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_synch_l1_2_1 @@ -18065,6 +18066,7 @@ wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-stringansi-l1-1-0 enable_api_ms_win_core_stringansi_l1_1_0 +wine_fn_config_dll api-ms-win-core-synch-ansi-l1-1-0 enable_api_ms_win_core_synch_ansi_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-1 enable_api_ms_win_core_synch_l1_2_1 diff --git a/configure.ac b/configure.ac index 9d33627..74bea22 100644 --- a/configure.ac +++ b/configure.ac @@ -2828,6 +2828,7 @@ WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-stringansi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-synch-ansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-1) diff --git a/dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..acab15b --- /dev/null +++ b/dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-synch-ansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-synch-ansi-l1-1-0/api-ms-win-core-synch-ansi-l1-1-0.spec b/dlls/api-ms-win-core-synch-ansi-l1-1-0/api-ms-win-core-synch-ansi-l1-1-0.spec new file mode 100644 index 0000000..eb75146 --- /dev/null +++ b/dlls/api-ms-win-core-synch-ansi-l1-1-0/api-ms-win-core-synch-ansi-l1-1-0.spec @@ -0,0 +1,7 @@ +@ stdcall CreateSemaphoreA(ptr long long str) kernel32.CreateSemaphoreA +@ stdcall CreateSemaphoreExA(ptr long long str long long) kernel32.CreateSemaphoreExA +@ stdcall CreateWaitableTimerA(ptr long str) kernel32.CreateWaitableTimerA +@ stdcall CreateWaitableTimerExA(ptr str long long) kernel32.CreateWaitableTimerExA +@ stdcall OpenMutexA(long long str) kernel32.OpenMutexA +@ stdcall OpenSemaphoreA(long long str) kernel32.OpenSemaphoreA +@ stdcall OpenWaitableTimerA(long long str) kernel32.OpenWaitableTimerA diff --git a/tools/make_specfiles b/tools/make_specfiles index e1c7e1f..a9ffa29 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -201,6 +201,7 @@ my @dll_groups = "api-ms-win-core-sysinfo-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", + "api-ms-win-core-synch-ansi-l1-1-0", "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-synch-l1-2-1",

1 0

Martin Storsjo : api-ms-win-core-libraryloader-l1-2-1: Add dll.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: b739ed68299331db383cb25007c1133897814efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b739ed68299331db383cb2500… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 16 12:21:23 2017 +0300 api-ms-win-core-libraryloader-l1-2-1: Add dll. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in | 1 + .../api-ms-win-core-libraryloader-l1-2-1.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 3d798cb..e2c35a9a 100755 --- a/configure +++ b/configure @@ -931,6 +931,7 @@ enable_api_ms_win_core_kernel32_private_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 +enable_api_ms_win_core_libraryloader_l1_2_1 enable_api_ms_win_core_libraryloader_l1_2_2 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 @@ -18021,6 +18022,7 @@ wine_fn_config_dll api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_cor wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 +wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-1 enable_api_ms_win_core_libraryloader_l1_2_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-2 enable_api_ms_win_core_libraryloader_l1_2_2 wine_fn_config_dll api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 diff --git a/configure.ac b/configure.ac index 74bea22..5873716 100644 --- a/configure.ac +++ b/configure.ac @@ -2783,6 +2783,7 @@ WINE_CONFIG_DLL(api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-2) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in b/dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in new file mode 100644 index 0000000..e5c790f --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l1-2-1.dll diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec new file mode 100644 index 0000000..95a765f --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec @@ -0,0 +1,3 @@ +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW +@ stdcall LoadLibraryA(str) kernel32.LoadLibraryA +@ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW diff --git a/tools/make_specfiles b/tools/make_specfiles index a9ffa29..fa1e623 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -226,6 +226,7 @@ my @dll_groups = "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-kernel32-private-l1-1-1", + "api-ms-win-core-libraryloader-l1-2-1", "api-ms-win-core-libraryloader-l1-2-2", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0",

1 0

Alex Henrie : comctl32/tests: Fix treeview test failures on French Windows XP.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 33e275a1d02a397228e856f2222d3b2f4067e424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e275a1d02a397228e856f22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 15 23:00:05 2017 -0600 comctl32/tests: Fix treeview test failures on French Windows XP. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index e7ce92c..a014625 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -220,6 +220,9 @@ static const struct message test_right_click_seq[] = { { WM_RBUTTONDOWN, sent|wparam, MK_RBUTTON }, { WM_CAPTURECHANGED, sent|defwinproc }, { TVM_GETNEXTITEM, sent|wparam|lparam|defwinproc, TVGN_CARET, 0 }, + { WM_NCHITTEST, sent|optional }, + { WM_SETCURSOR, sent|optional }, + { WM_MOUSEMOVE, sent|optional }, { 0 } }; @@ -367,6 +370,8 @@ static const struct message parent_vk_return_seq[] = { static const struct message parent_right_click_seq[] = { { WM_NOTIFY, sent|id, 0, 0, NM_RCLICK }, { WM_CONTEXTMENU, sent }, + { WM_NOTIFY, sent|optional }, + { WM_SETCURSOR, sent|optional }, { 0 } };

1 0

Hans Leidekker : secur32: Don' t allocate a context handle in AcceptSecurityContext if new and passed in context are the same.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 4467fd6d232cd715cd63b1ebf74c6013e19563b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4467fd6d232cd715cd63b1ebf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 16 10:08:49 2017 +0200 secur32: Don't allocate a context handle in AcceptSecurityContext if new and passed in context are the same. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/wrapper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 06a3674..dba6754 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -399,7 +399,8 @@ SECURITY_STATUS WINAPI AcceptSecurityContext( ret = package->provider->fnTableW.AcceptSecurityContext( cred, phContext ? &myCtxt : NULL, pInput, fContextReq, TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); - if (ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) { SECURITY_STATUS ret2; ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt);

1 0

Nikolay Sivov : dwrite/tests: Fix object instance leak (Valgrind).
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: e3a29a6c1d3f4655ccee888588f7449487f1778d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a29a6c1d3f4655ccee88858… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 11:55:39 2017 +0300 dwrite/tests: Fix object instance leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4adb022..c28f27a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7924,6 +7924,9 @@ static void test_inmemory_file_loader(void) IDWriteFontFileStream_Release(stream); IDWriteFontFace_Release(fontface); + ref = IDWriteInMemoryFontFileLoader_Release(inmemory); + ok(ref == 0, "loader not released, %u.\n", ref); + ref = IDWriteFactory5_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); }

1 0

Gijs Vermeulen : msvcrt: Add vf[w]printf_p & vf[w]printf_p_l.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 7f9c2dabc3e9920c46019948b77f45bd717693d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9c2dabc3e9920c46019948b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Oct 13 20:23:29 2017 +0200 msvcrt: Add vf[w]printf_p & vf[w]printf_p_l. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 8 ++--- dlls/msvcr110/msvcr110.spec | 8 ++--- dlls/msvcr120/msvcr120.spec | 8 ++--- dlls/msvcr120_app/msvcr120_app.spec | 8 ++--- dlls/msvcr80/msvcr80.spec | 8 ++--- dlls/msvcr90/msvcr90.spec | 8 ++--- dlls/msvcrt/file.c | 68 +++++++++++++++++++++++++++++++++++-- dlls/msvcrt/msvcrt.h | 3 ++ dlls/msvcrt/msvcrt.spec | 8 ++--- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/wcs.c | 2 +- 11 files changed, 99 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f9c2dabc3e9920c46019…

1 0

Józef Kucia : wined3d: Use correct data type for immediate constants.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 033df637578ba76201a7ab6d4de1f506108f27b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033df637578ba76201a7ab6d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Oct 14 17:36:26 2017 +0200 wined3d: Use correct data type for immediate constants. In order to generate correct GLSL for image stores. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 39d2276..6a4d32a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2723,7 +2723,8 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - char *register_name, BOOL *is_color, const struct wined3d_shader_instruction *ins) + enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + const struct wined3d_shader_instruction *ins) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; @@ -2948,7 +2949,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -2965,13 +2966,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "%#xu", reg->u.immconst_data[0]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; case WINED3D_IMMCONST_VEC4: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -3003,7 +3004,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * reg->u.immconst_data[2], reg->u.immconst_data[3]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; @@ -3247,7 +3248,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3294,7 +3295,8 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(&wined3d_dst->reg, glsl_dst->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, + glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3586,7 +3588,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction char reg_name[256]; BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, reg_name, &is_color, ins); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); }

1 0