August 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/button: Use duplicated image for drawing.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 493852a1f9c276583c6fe8e9f6ebf77366c60120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=493852a1f9c276583c6fe8e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 1 15:17:50 2020 +0300 comctl32/button: Use duplicated image for drawing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47794 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5fcd20396fb29a1f2ce87645cbb0d045ce5cf2d8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/button.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0078bd0fc6..b615df4a16 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -90,11 +90,12 @@ typedef struct _BUTTON_INFO HIMAGELIST glyph; /* this is a font character code when split_style doesn't have BCSS_IMAGE */ SIZE glyph_size; RECT text_margin; + HANDLE image; /* Original handle set with BM_SETIMAGE and returned with BM_GETIMAGE. */ union { HICON icon; HBITMAP bitmap; - HANDLE image; + HANDLE image; /* Duplicated handle used for drawing. */ } u; } BUTTON_INFO; @@ -488,6 +489,10 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_NCDESTROY: SetWindowLongPtrW( hWnd, 0, 0 ); + if (infoPtr->image_type == IMAGE_BITMAP) + DeleteObject(infoPtr->u.bitmap); + else if (infoPtr->image_type == IMAGE_ICON) + DestroyIcon(infoPtr->u.icon); heap_free(infoPtr->note); heap_free(infoPtr); break; @@ -859,13 +864,14 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case BM_SETIMAGE: infoPtr->image_type = (DWORD)wParam; - oldHbitmap = infoPtr->u.image; - infoPtr->u.image = (HANDLE)lParam; - InvalidateRect( hWnd, NULL, FALSE ); - return (LRESULT)oldHbitmap; + oldHbitmap = infoPtr->image; + infoPtr->u.image = CopyImage((HANDLE)lParam, infoPtr->image_type, 0, 0, 0); + infoPtr->image = (HANDLE)lParam; + InvalidateRect( hWnd, NULL, FALSE ); + return (LRESULT)oldHbitmap; case BM_GETIMAGE: - return (LRESULT)infoPtr->u.image; + return (LRESULT)infoPtr->image; case BCM_SETIMAGELIST: {

1 0

Alex Henrie : wine.inf: Add Winlogon keys.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 19f0c18f01731ac887f74e8dcf1e5f6ebcb6a626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f0c18f01731ac887f74e8d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 22 00:44:26 2020 -0600 wine.inf: Add Winlogon keys. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48611 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 27d1ef75c4fd5d47b5566e365caf0d3e5abc70ef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a80889a242..65e69b021b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -524,6 +524,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CurrentVersion] HKCU,%CurrentVersion%\Run,,16 +HKCU,%CurrentVersionNT%\Winlogon,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%" HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" @@ -549,7 +550,6 @@ HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 -HKLM,%CurrentVersion%\Winlogon,,16 HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354 HKLM,%CurrentVersionNT%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" @@ -572,6 +572,7 @@ HKLM,%CurrentVersionNT%\Perflib,,16 HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 +HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe" [CurrentVersionWow64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%"

1 0

Piotr Caban : msvcp90: Add std:_XLgamma implementation.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 702fa0ca4cae79452e77d1a5986143ff12ae03f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=702fa0ca4cae79452e77d1a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 16:33:44 2020 +0100 msvcp90: Add std:_XLgamma implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48806 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 70c3e08d32407c0d8ee751b124c438fc5910fc8d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/math.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- 7 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 4ca8d5b277..897b46fe90 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1260,9 +1260,9 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@UEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock(a)_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub ?_XLgamma(a)tr1@std@@YAMM(a)Z -@ stub ?_XLgamma(a)tr1@std@@YANN(a)Z -@ stub ?_XLgamma(a)tr1@std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)tr1@std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)tr1@std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)tr1@std@@YAOO(a)Z(double) std__XLgamma_double @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub ?_Xfunc(a)tr1@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index eebc430b1e..8d79f8c9a8 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1829,9 +1829,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e131d41ecc..6308c57b29 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index a76149071c..a44c89fdc8 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) msvcp120.?_XLgamma(a)std@@YAMM(a)Z +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp120.?_XLgamma(a)std@@YANN(a)Z +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp120.?_XLgamma(a)std@@YAOO(a)Z @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() msvcp120.?_Xbad_alloc(a)std@@YAXXZ @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) msvcp120.?_Xinvalid_argument(a)std@@YAXPBD(a)Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 70caad8dba..2563c7bfa7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1673,9 +1673,9 @@ @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message @ stub ?_XGetLastError(a)std@@YAXXZ -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9bc7c0867d..4ebf8baaee 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2362,3 +2362,36 @@ short __cdecl _FExp(float *x, float y, short scale) return dclass(*x); } + +/* ?_XLgamma(a)std@@YANN(a)Z */ +double __cdecl std__XLgamma_double(double z) +{ + /* Lanczos coefficients g=5, n=6 */ + static const double lc[] = { + 1.000000000190015, + 76.18009172947146, + -86.50532032941677, + 24.01409824083091, + -1.231739572450155, + 0.1208650973866179e-2, + -0.5395239384953e-5 + }; + static const double log_sqrt_2pi = 0.91893853320467274178; + + double base = z + 4.5, sum = 0; + int i; + + if (z < 0.5) return log(M_PI / sin(M_PI * z)) - std__XLgamma_double(1 - z); + + z--; + for(i = ARRAY_SIZE(lc) - 1; i >= 1; i--) + sum += lc[i] / (z + i); + sum += lc[0]; + return log_sqrt_2pi + log(sum) - base + log(base) * (z + 0.5); +} + +/* ?_XLgamma(a)tr1@std@@YAMM(a)Z */ +float __cdecl std__XLgamma_float(float z) +{ + return std__XLgamma_double(z); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6a5a9a20a4..c38dd041af 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3185,9 +3185,9 @@ @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)G@std@@QEBAPEBDPEBD0PEAG_K(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ thiscall -arch=win32 ?_Widen_s@?$ctype(a)_W@std@@QBEPBDPBD0PA_WI(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)_W@std@@QEBAPEBDPEBD0PEA_W_K(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s -@ stub ?_XLgamma(a)tr1@std@@YAMM(a)Z -@ stub ?_XLgamma(a)tr1@std@@YANN(a)Z -@ stub ?_XLgamma(a)tr1@std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)tr1@std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)tr1@std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)tr1@std@@YAOO(a)Z(double) std__XLgamma_double @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub -arch=win32 ?_Xfsopen(a)std@@YAPAU_iobuf@@PB_W0H(a)Z @ stub -arch=win64 ?_Xfsopen(a)std@@YAPEAU_iobuf@@PEB_W0H(a)Z

1 0

Zhipeng Zhao : explorer: Support '/cd,' command line option.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 981bb16f263c925d625e2a0f2a28c6282f48a118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=981bb16f263c925d625e2a0f… Author: Zhipeng Zhao <near2see(a)163.com> Date: Fri Mar 27 15:14:52 2020 +0800 explorer: Support '/cd,' command line option. '/cd,' is an undocumented option that seems to have the same effect as '/root,'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48816. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d79746425ba2e292f85f656227d703672076499) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index dcd09ac969..763fca381b 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -718,6 +718,7 @@ static void copy_path_root(LPWSTR root, LPWSTR path) * Command Line parameters are: * [/n] Opens in single-paned view for each selected items. This is default * [/e,] Uses Windows Explorer View + * [/cd,object] Specifies the root level of the view * [/root,object] Specifies the root level of the view * [/select,object] parent folder is opened and specified object is selected */ @@ -725,6 +726,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) { static const WCHAR arg_n[] = {'/','n'}; static const WCHAR arg_e[] = {'/','e',','}; + static const WCHAR arg_cd[] = {'/','c','d',','}; static const WCHAR arg_root[] = {'/','r','o','o','t',','}; static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; @@ -745,6 +747,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) parameters->explorer_mode = TRUE; p += ARRAY_SIZE( arg_e ); } + else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + { + p += ARRAY_SIZE( arg_cd ); + p = copy_path_string(parameters->root,p); + } else if (wcsncmp(p, arg_root, ARRAY_SIZE( arg_root ))==0) { p += ARRAY_SIZE( arg_root );

1 0

Akihiro Sagawa : ddraw/tests: Add more managed texture tests.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: bd2b989eed0a49abbe1adae2eae45bd04b656bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2b989eed0a49abbe1adae2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 2 00:13:42 2020 +0900 ddraw/tests: Add more managed texture tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bb3ebced4a7bd11ad929eafe7d7ffb3a6e96463) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd2b989eed0a49abbe1a…

1 0

Damjan Jovanovic : shell32/tests: Test shlexec argv[0], and same-named executables in a different directory.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: ac77184f8702fc640e7bff4c6b37834a7b1dbc10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac77184f8702fc640e7bff4c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:15 2020 +0200 shell32/tests: Test shlexec argv[0], and same-named executables in a different directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe83877cb320c688130c9599838485f40580adf9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 12ef18c1d8..f881e96b6e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2828,6 +2828,7 @@ static void test_directory(void) NULL, "test2.exe", params, NULL, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); SetCurrentDirectoryA(curdir); @@ -2841,6 +2842,7 @@ static void test_directory(void) NULL, "test2.exe", params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2853,6 +2855,7 @@ static void test_directory(void) NULL, "test2.exe", params, "%TMPDIR%", NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2861,6 +2864,18 @@ static void test_directory(void) rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, NULL, "test2.exe", params, dirpath, NULL); okShell(rc == SE_ERR_FNF, "returned %lu\n", rc); + + /* Same-named executable in different directory */ + snprintf(path, ARRAY_SIZE(path), "%s%s", tmpdir, strrchr(argv0, '\\')); + CopyFileA(argv0, path, FALSE); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, strrchr(argv0, '\\') + 1, params, tmpdir, NULL); + okShell(rc > 32, "returned %lu\n", rc); + okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + DeleteFileA(path); } START_TEST(shlexec)

1 0

Damjan Jovanovic : shell32: Simplify SHELL_execute().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: bc88fe8f0f3eed9df32bf1f7a9f4eed2ac6c8428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc88fe8f0f3eed9df32bf1f7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:18 2020 +0200 shell32: Simplify SHELL_execute(). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 06f1f53c4c11c972561de91e76cd5ea6dc5c2ced) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlexec.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 28f2e36f9a..d3ff821135 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1806,26 +1806,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; - len = lstrlenW(wszApplicationName) + 3; - if (sei_tmp.lpParameters[0]) - len += 1 + lstrlenW(wszParameters); - if (len > wcmdLen) - { - wcmd = heap_alloc(len * sizeof(WCHAR)); - wcmdLen = len; - } - wcmd[0] = '\"'; - len = lstrlenW(wszApplicationName); - memcpy(wcmd+1, wszApplicationName, len * sizeof(WCHAR)); - len++; - wcmd[len++] = '\"'; - wcmd[len] = 0; - if (sei_tmp.lpParameters[0]) { - wcmd[len++] = ' '; - strcpyW(wcmd+len, wszParameters); - } - - retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei); + strcpyW(wcmd, wszApplicationName); + retval = SHELL_quote_and_execute( wcmd, wszParameters, wszEmpty, + wszApplicationName, NULL, &sei_tmp, + sei, execfunc ); if (retval > 32) { heap_free(wszApplicationName); if (wszParameters != parametersBuffer)

1 0

Piotr Caban : ucrtbase: Fix away from 0 rounding in %a format.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 04de6fe37e92b4bb4910a469e820ad8608ac79cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=04de6fe37e92b4bb4910a469… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 13:18:07 2020 +0200 ucrtbase: Fix away from 0 rounding in %a format. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ++-- dlls/ucrtbase/tests/printf.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index b9b379f91e..4b47d65803 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -446,10 +446,10 @@ static inline int FUNC_NAME(pf_output_hex_fp)(FUNC_NAME(puts_clbk) pf_puts, void mant >>= 4; } if(!flags->Precision) { - if(p[0] > '8') p[-2]++; + if(p[0] >= '8') p[-2]++; if(!flags->Alternate) p--; }else if(flags->Precision>0 && flags->Precision<MANT_BITS/4) { - BOOL round_up = (p[flags->Precision] > '8'); + BOOL round_up = (p[flags->Precision] >= '8'); for(r=flags->Precision-1; r>=0 && round_up; r--) { round_up = FALSE; if(p[r]=='f' || p[r]=='F') { diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index f8446b8ac9..a26bd230e5 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -747,18 +747,21 @@ static void test_printf_fp(void) { "%.a", 0.1e-20, { "0x1p-70" }}, { "%a", 0.1e-20, { "0x1.2e3b40a0e9b4fp-70" }}, { "%a", 4.9406564584124654e-324, { "0x0.0000000000001p-1022" }}, - { "%.0a", -1.5, { "-0x1p+0" }}, + { "%.0a", -1.5, { "-0x2p+0" }, { "-0x1p+0" }}, { "%.0a", -0.5, { "-0x1p-1" }}, { "%.0a", 0.5, { "0x1p-1" }}, - { "%.0a", 1.5, { "0x1p+0" }}, + { "%.0a", 1.5, { "0x2p+0" }, { "0x1p+0" }}, { "%.0a", 1.99, { "0x2p+0" }}, { "%.0a", 2, { "0x1p+1" }}, { "%.0a", 9.5, { "0x1p+3" }}, { "%.0a", 10.5, { "0x1p+3" }}, - { "%#.0a", -1.5, { "-0x1.p+0" }}, + { "%#.0a", -1.5, { "-0x2.p+0" }, { "-0x1.p+0" }}, { "%#.0a", -0.5, { "-0x1.p-1" }}, { "%#.0a", 0.5, { "0x1.p-1" }}, - { "%#.0a", 1.5, { "0x1.p+0" }}, + { "%#.0a", 1.5, { "0x2.p+0" }, { "0x1.p+0" }}, + { "%#.1a", 1.03125, { "0x1.1p+0" }, { "0x1.0p+0" }}, + { "%#.1a", 1.09375, { "0x1.2p+0" }, { "0x1.1p+0" }}, + { "%#.1a", 1.15625, { "0x1.3p+0" }, { "0x1.2p+0" }}, { "%f", 0, { "0.000000" }}, { "%e", 0, { "0.000000e+00", NULL, "0.000000e+000" }},

1 0

Piotr Caban : ucrtbase: Support _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING flag in printf.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 25cc6ff62d22220f6da742fa47a7f5fe80ed0c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25cc6ff62d22220f6da742fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 13:18:14 2020 +0200 ucrtbase: Support _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING flag in printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/printf.h | 78 ++++++++++++++++++++++++++++++----- dlls/ucrtbase/tests/printf.c | 10 ++++- include/msvcrt/corecrt_stdio_config.h | 1 + 4 files changed, 78 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25cc6ff62d22220f6da7…

1 0

Piotr Caban : msvcrt: Import asinf from musl.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: d37e76a9a7ddb75ef91ab0177e22fd646cc27a16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37e76a9a7ddb75ef91ab017… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 16:59:14 2020 +0200 msvcrt: Import asinf from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 06480911af..daa94c6f7c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -280,13 +280,52 @@ float CDECL MSVCRT_acosf( float x ) /********************************************************************* * MSVCRT_asinf (MSVCRT.@) + * + * Copied from musl: src/math/asinf.c */ +static float asinf_R(float z) +{ + /* coefficients for R(x^2) */ + static const float pS0 = 1.6666586697e-01, + pS1 = -4.2743422091e-02, + pS2 = -8.6563630030e-03, + qS1 = -7.0662963390e-01; + + float_t p, q; + p = z * (pS0 + z * (pS1 + z * pS2)); + q = 1.0f + z * qS1; + return p / q; +} + float CDECL MSVCRT_asinf( float x ) { - float ret = atan2f(x, sqrtf((1 - x) * (1 + x))); - if (x < -1.0 || x > 1.0 || !finitef(x)) - return math_error(_DOMAIN, "asinf", x, 0, ret); - return ret; + static const double pio2 = 1.570796326794896558e+00; + + double s; + float z; + unsigned int hx, ix; + + hx = *(unsigned int*)&x; + ix = hx & 0x7fffffff; + if (ix >= 0x3f800000) { /* |x| >= 1 */ + if (ix == 0x3f800000) /* |x| == 1 */ + return x * pio2 + 7.5231638453e-37; /* asin(+-1) = +-pi/2 with inexact */ + if (MSVCRT__isnanf(x)) return x; + return math_error(_DOMAIN, "asinf", x, 0, 0 / (x - x)); + } + if (ix < 0x3f000000) { /* |x| < 0.5 */ + /* if 0x1p-126 <= |x| < 0x1p-12, avoid raising underflow */ + if (ix < 0x39800000 && ix >= 0x00800000) + return x; + return x + x * asinf_R(x * x); + } + /* 1 > |x| >= 0.5 */ + z = (1 - fabsf(x)) * 0.5f; + s = sqrt(z); + x = pio2 - 2 * (s + s * asinf_R(z)); + if (hx >> 31) + return -x; + return x; } /*********************************************************************

1 0