September 2018 - Wine-Commits

Jason Edmeades : cmd: Expand the storage space for qualifiers.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 09ec4180b5c47f19f2fa5f2ddcaddd3c0841dd5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=09ec4180b5c47f19f2fa5f2d… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:28 2018 +0100 cmd: Expand the storage space for qualifiers. When parsing a command, after the first '/' we store the characters away in quals. The command itself can be MAXSTRING in bytes, but the quals was limited to MAX_PATH. This is incorrect, as you can provide very long qualifiers as well. Expand the space to allow the maximum size possible. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dce5f89e48cc63668b90fbf2a435cbb54bcf4571) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d97a0..8d6eb6b 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -204,7 +204,7 @@ typedef struct _FOR_CONTEXT { * (uppercased and concatenated) and parameters entered, with environment * variables and batch parameters substitution already done. */ -extern WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +extern WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING]; extern DWORD errorlevel; extern BATCH_CONTEXT *context; extern FOR_CONTEXT forloopcontext; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0d02f1f..8fe2d57 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -38,7 +38,7 @@ extern struct env_stack *pushd_directories; BATCH_CONTEXT *context = NULL; DWORD errorlevel; -WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING]; BOOL interactive; FOR_CONTEXT forloopcontext; /* The 'for' loop context */ BOOL delayedsubst = FALSE; /* The current delayed substitution setting */

1 0

Louis Lenders : mscoree: Add stub for CorIsLatestSvc to hint user at broken .NET installation.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 8d73b6ebaf2a4938fbc95dbb82d0bd7056f143e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d73b6ebaf2a4938fbc95dbb… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jul 11 19:58:54 2018 +0200 mscoree: Add stub for CorIsLatestSvc to hint user at broken .NET installation. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 27f2f4199fde170a1ff2b3090506ad3c9e6d1bfa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 11 +++++++++++ dlls/mscoree/tests/mscoree.c | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 3715b7c..ec4668b 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -25,7 +25,7 @@ @ stub CorDllMainWorker @ stdcall CorExitProcess(long) @ stub CorGetSvc -@ stub CorIsLatestSvc +@ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9561405..42f8169 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -49,6 +49,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static HINSTANCE MSCOREE_hInstance; @@ -309,6 +310,16 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) return ret; } +HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) +{ + ERR_(winediag)("If this function is called, it is likely the result of a broken .NET installation\n"); + + if (!unk1 || !unk2) + return E_POINTER; + + return S_OK; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 63517dc..dd4724d 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -35,6 +35,7 @@ static const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pCorIsLatestSvc)(INT*, INT*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); @@ -55,6 +56,7 @@ static BOOL init_functionpointers(void) } pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); + pCorIsLatestSvc = (void *)GetProcAddress(hmscoree, "CorIsLatestSvc"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); @@ -63,7 +65,7 @@ static BOOL init_functionpointers(void) pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim || - !pCreateInterface || !pCLRCreateInstance + !pCreateInterface || !pCLRCreateInstance || !pCorIsLatestSvc ) { win_skip("functions not available\n"); @@ -289,6 +291,9 @@ static void test_versioninfo(void) hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + hr = pCorIsLatestSvc(NULL, NULL); + ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr); } static void test_loadlibraryshim(void)

1 0

Piotr Caban : include/msvcrt: Add POSIX error codes to errno.h.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 0b176ddb64e1538cdc4c27de9de11c5cb4b02f90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b176ddb64e1538cdc4c27de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 16:32:55 2018 +0200 include/msvcrt: Add POSIX error codes to errno.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e68944583307f8773b9323ba1c0da6f13974792d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/errno.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/msvcrt/errno.h b/include/msvcrt/errno.h index dddc013..ac56c19 100644 --- a/include/msvcrt/errno.h +++ b/include/msvcrt/errno.h @@ -63,6 +63,50 @@ # define STRUNCATE 80 +#ifndef _CRT_NO_POSIX_ERROR_CODES +# define EADDRINUSE 100 +# define EADDRNOTAVAIL 101 +# define EAFNOSUPPORT 102 +# define EALREADY 103 +# define EBADMSG 104 +# define ECANCELED 105 +# define ECONNABORTED 106 +# define ECONNREFUSED 107 +# define ECONNRESET 108 +# define EDESTADDRREQ 109 +# define EHOSTUNREACH 110 +# define EIDRM 111 +# define EINPROGRESS 112 +# define EISCONN 113 +# define ELOOP 114 +# define EMSGSIZE 115 +# define ENETDOWN 116 +# define ENETRESET 117 +# define ENETUNREACH 118 +# define ENOBUFS 119 +# define ENODATA 120 +# define ENOLINK 121 +# define ENOMSG 122 +# define ENOPROTOOPT 123 +# define ENOSR 124 +# define ENOSTR 125 +# define ENOTCONN 126 +# define ENOTRECOVERABLE 127 +# define ENOTSOCK 128 +# define ENOTSUP 129 +# define EOPNOTSUPP 130 +# define EOTHER 131 +# define EOVERFLOW 132 +# define EOWNERDEAD 133 +# define EPROTO 134 +# define EPROTONOSUPPORT 135 +# define EPROTOTYPE 136 +# define ETIME 137 +# define ETIMEDOUT 138 +# define ETXTBSY 139 +# define EWOULDBLOCK 140 +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Johannes Brandstätter : ntdll: Check for NULL context in NtGetContextThread.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: b9e512d2428473bff6bce9a476d76a2b9ddcc3a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9e512d2428473bff6bce9a4… Author: Johannes Brandstätter <jbrandst(a)2ds.eu> Date: Wed Jul 11 17:45:32 2018 +0200 ntdll: Check for NULL context in NtGetContextThread. Crash Bandicoot N. Sane Trilogy calls NtGetContextThread with the context being set to NULL which leads to a crash. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45428 Signed-off-by: Johannes Brandstätter <jbrandst(a)2ds.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ec418e7f55f5e38f8825187ae5dfe33fec31689b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 60da3f3..b7e90c5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2137,9 +2137,13 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { NTSTATUS ret; - DWORD needed_flags = context->ContextFlags; + DWORD needed_flags; BOOL self = (handle == GetCurrentThread()); + if (!context) return STATUS_INVALID_PARAMETER; + + needed_flags = context->ContextFlags; + /* debug registers require a server call */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) self = FALSE;

1 0

Akihiro Sagawa : kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: cbe92403398f8bf759c75453f769a34a1fdefc8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbe92403398f8bf759c75453… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:29 2018 +0900 kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45439 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a5da5252291c8df05d2f144cb3f6b9d008b4be1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 12 ++++-------- dlls/kernel32/tests/locale.c | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8dfbb3d..0f81097 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3626,21 +3626,17 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { /* map full-width character to half-width one, e.g. U+30A2 -> U+FF71, U+30D7 -> U+FF8C U+FF9F. */ - if (map_to_halfwidth(wch, dst_ptr, dstlen) == 2) + if (map_to_halfwidth(wch, dst_ptr, len) == 2) { - dstlen--; + len--; dst_ptr++; - if (!dstlen) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } + if (!len) break; } } else *dst_ptr = wch; } - if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE))) + if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE)) || srclen) goto done; srclen = dst_ptr - dst; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index dea22df..b0231aa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2526,7 +2526,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); SetLastError(0xdeadbeef); @@ -2535,7 +2535,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); - todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret);

1 0

André Hentschel : winedbg: Check for visible window station before displaying crash dialog.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 716dc2fcd057ad805db8fc18715c7fefa4d42c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=716dc2fcd057ad805db8fc18… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 13 19:49:40 2018 +0200 winedbg: Check for visible window station before displaying crash dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35928 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13f9461e99398f4080bf0fdd68a03f57a5427002) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/crashdlg.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 4e02a4b..d7059e6 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -43,6 +43,20 @@ int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UINT uType) return MessageBoxW(hwnd, text, caption, uType); } +static BOOL is_visible(void) +{ + USEROBJECTFLAGS flags; + HWINSTA winstation; + + if (!(winstation = GetProcessWindowStation())) + return FALSE; + + if (!(GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL))) + return FALSE; + + return flags.dwFlags & WSF_VISIBLE; +} + static WCHAR *get_program_name(HANDLE hProcess) { WCHAR image_name[MAX_PATH]; @@ -358,7 +372,7 @@ int display_crash_dialog(void) /* dbg_curr_process->handle is not set */ HANDLE hProcess; - if (!DBG_IVAR(ShowCrashDialog)) + if (!DBG_IVAR(ShowCrashDialog) || !is_visible()) return TRUE; hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dbg_curr_pid);

1 0

Akihiro Sagawa : kernel32/tests: Add more LCMapString tests.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: f33783ce5f20c4ae8c3cb579367e6fe81e6d92b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f33783ce5f20c4ae8c3cb579… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:28 2018 +0900 kernel32/tests: Add more LCMapString tests. Especially combined with LCMAP_HALFWIDTH and LCMAP_UPPERCASE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef2df8ed3681a55a66382164227f8a5a1ae4bf51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/locale.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d686e12..dea22df 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2519,6 +2519,27 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + buf[0] = 'a'; + buf[1] = 0x30ac; + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 0); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 2); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); + todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + /* LCMAP_UPPERCASE or LCMAP_LOWERCASE should accept src == dst */ lstrcpyW(buf, lower_case); ret = func_ptr(LCMAP_UPPERCASE,

1 0

Michael Müller : msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 89ec909ca12191e90394463b540faeab43966a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ec909ca12191e90394463b… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 9 13:41:45 2018 +0200 msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0dde2b8a2f15251cf1cd9738c6e30fbbc30369fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 0edd871..7041795 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -10,7 +10,7 @@ @ stub _NLG_Return2 @ stub _SetImageBase @ stub _SetThrowImageBase -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) ucrtbase._SetWinRTOutOfMemoryExceptionCallback @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 529103f..109666e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -844,7 +844,7 @@ @ stub -arch=i386 _NLG_Return @ stub -arch=i386 _NLG_Return2 @ stub -arch=arm,win64 __NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(ptr long str ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2dc8a07..064aa77 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -838,7 +838,7 @@ @ stub -arch=i386 _NLG_Return @ stub -arch=i386 _NLG_Return2 @ stub -arch=arm,win64 __NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) msvcr120._SetWinRTOutOfMemoryExceptionCallback @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(ptr long str ptr ptr) msvcr120._Strftime diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c197d69..c5f8f42 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -578,4 +578,12 @@ void CDECL MSVCRT__crtSleep(DWORD timeout) TRACE("(%u)\n", timeout); Sleep(timeout); } + +/********************************************************************* + * _SetWinRTOutOfMemoryExceptionCallback (MSVCR120.@) + */ +void CDECL MSVCR120__SetWinRTOutOfMemoryExceptionCallback(void *callback) +{ + FIXME("(%p): stub\n", callback); +} #endif diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d1498d1..504b27d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -39,7 +39,7 @@ @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback @ cdecl _Strftime(ptr long str ptr ptr) @ cdecl _W_Getdays() @ cdecl _W_Getmonths() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 331a087..8048dc5 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -6,7 +6,7 @@ @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) ucrtbase._SetWinRTOutOfMemoryExceptionCallback @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper

1 0

Michael Müller : gdi32: Treat lpResults as optional in GetCharacterPlacement.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 8be91ed5710faf4b6bb2612d82b1e058d7cd60d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be91ed5710faf4b6bb2612d… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 16 08:30:57 2018 +0100 gdi32: Treat lpResults as optional in GetCharacterPlacement. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 96721e4291378f0c2dfe6948df95691752250b95) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 13 ++++++++++++- dlls/gdi32/tests/font.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d059f97..1a72026 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3201,10 +3201,18 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, TRACE("%s, %d, %d, 0x%08x\n", debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); + lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); + + if (!lpResults) + { + ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, NULL, dwFlags); + HeapFree(GetProcessHeap(), 0, lpStringW); + return ret; + } + /* both structs are equal in size */ memcpy(&resultsW, lpResults, sizeof(resultsW)); - lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); if(lpResults->lpOutString) resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); @@ -3259,6 +3267,9 @@ GetCharacterPlacementW( TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); + if (!lpResults) + return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0; + TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n", lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ec4b29e..45686f3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4904,6 +4904,39 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } +static void test_GetCharacterPlacement(void) +{ + GCP_RESULTSA result; + DWORD size, size2; + WCHAR glyphs[20]; + HDC hdc; + + hdc = CreateCompatibleDC(0); + ok(!!hdc, "CreateCompatibleDC failed\n"); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpGlyphs = glyphs; + result.nGlyphs = 20; + + size = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, &result, 0); + ok(size, "GetCharacterPlacementA failed!\n"); + + size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0); + ok(size2, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, NULL, GCP_REORDER); + ok(size2, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + size = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, &result, GCP_REORDER); + ok(size, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + DeleteDC(hdc); +} + static void test_CreateFontIndirect(void) { LOGFONTA lf, getobj_lf; @@ -6831,6 +6864,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -11); test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); + test_GetCharacterPlacement(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); test_oemcharset();

1 0

Józef Kucia : wined3d: Fix snorm/ unorm immediate values for UAV writes.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: b684dbdcf90559413ae0dc30818dad2e9ec6d6c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b684dbdcf90559413ae0dc30… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 9 15:25:55 2018 +0200 wined3d: Fix snorm/unorm immediate values for UAV writes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45067 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> (cherry picked from commit 7f1fe9385b7df27f28a252039f2340b2b755e650) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e18a99f..afc4af8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3057,6 +3057,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_SCALAR: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); @@ -3080,6 +3082,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_VEC4: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) {

1 0