wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 9ddccfc6004d97845a0dae1fbef9660c51460a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ddccfc6004d97845a0dae1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 19:57:03 2020 +0100 vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8def4dfa0ee9c2d70fd4c98daa50447b6a15ad3c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 8 +++++--- dlls/vbscript/tests/lang.vbs | 7 ++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 893c129e0ef..2452b6e6351 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2953,7 +2953,7 @@ static const builtin_prop_t global_props[] = { {L"vbFormFeed", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, {L"vbFriday", NULL, BP_GET, VT_I2, 6}, {L"vbGeneralDate", NULL, BP_GET, VT_I2, 0}, - {L"vbGreen", NULL, BP_GET, VT_I4, (INT16)0x00ff00}, + {L"vbGreen", NULL, BP_GET, VT_I4, 0x00ff00}, {L"vbIgnore", NULL, BP_GET, VT_I2, IDIGNORE}, {L"vbInformation", NULL, BP_GET, VT_I2, MB_ICONASTERISK}, {L"vbInteger", NULL, BP_GET, VT_I2, VT_I2}, @@ -3000,7 +3000,7 @@ static const builtin_prop_t global_props[] = { {L"vbVerticalTab", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {L"vbWednesday", NULL, BP_GET, VT_I2, 4}, {L"vbWhite", NULL, BP_GET, VT_I4, 0xffffff}, - {L"vbYellow", NULL, BP_GET, VT_I4, (INT16)0x00ffff}, + {L"vbYellow", NULL, BP_GET, VT_I4, 0x00ffff}, {L"vbYes", NULL, BP_GET, VT_I2, IDYES}, {L"vbYesNo", NULL, BP_GET, VT_I2, MB_YESNO}, {L"vbYesNoCancel", NULL, BP_GET, VT_I2, MB_YESNOCANCEL}, @@ -3105,7 +3105,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA if(SUCCEEDED(hres)) { script_ctx_t *ctx = This->ctx; - error = (code == (INT16)code) ? MAKE_VBSERROR((UINT16)code) : map_hres(code); + error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); if(source) { SysFreeString(ctx->ei.bstrSource); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 1ea5177d015..a03c34ffe26 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -320,10 +320,12 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) return 0; } - if(*ctx->ptr == '&') + if(*ctx->ptr == '&') { ctx->ptr++; - - *ret = l == (UINT16)l ? (INT16)l : l; + *ret = l; + }else { + *ret = l == (UINT16)l ? (INT16)l : l; + } return tInt; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 60c8cc22570..2c5385f3a8f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -57,6 +57,9 @@ Call ok(&hff = 255, "&hff <> 255") Call ok(&Hff = 255, "&Hff <> 255") Call ok(&hffff = -1, "&hffff <> -1") Call ok(&hfffe = -2, "&hfffe <> -2") +Call ok(&hffff& = 65535, "&hffff& <> -1") +Call ok(&hfffe& = 65534, "&hfffe& <> -2") +Call ok(&hffffffff& = -1, "&hffffffff& <> -1") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5) @@ -96,7 +99,9 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") -Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") +Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") +Call ok(getVT(&hffF&) = "VT_I2", "getVT(&hffFF&) is not VT_I2") +Call ok(getVT(&hffFF&) = "VT_I4", "getVT(&hffFF&) is not VT_I4") Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8")

1 0

Jacek Caban : vbscript: Overflow hex literals in 16-bit range.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: a7fc129a1541c056593b3a9d545ff8b20df3b698 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7fc129a1541c056593b3a9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 14:25:32 2020 +0100 vbscript: Overflow hex literals in 16-bit range. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd1918948f28b7fb874790d3f3d223c4e8471b5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 4 ++-- dlls/vbscript/tests/lang.vbs | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2452b6e6351..893c129e0ef 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2953,7 +2953,7 @@ static const builtin_prop_t global_props[] = { {L"vbFormFeed", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, {L"vbFriday", NULL, BP_GET, VT_I2, 6}, {L"vbGeneralDate", NULL, BP_GET, VT_I2, 0}, - {L"vbGreen", NULL, BP_GET, VT_I4, 0x00ff00}, + {L"vbGreen", NULL, BP_GET, VT_I4, (INT16)0x00ff00}, {L"vbIgnore", NULL, BP_GET, VT_I2, IDIGNORE}, {L"vbInformation", NULL, BP_GET, VT_I2, MB_ICONASTERISK}, {L"vbInteger", NULL, BP_GET, VT_I2, VT_I2}, @@ -3000,7 +3000,7 @@ static const builtin_prop_t global_props[] = { {L"vbVerticalTab", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {L"vbWednesday", NULL, BP_GET, VT_I2, 4}, {L"vbWhite", NULL, BP_GET, VT_I4, 0xffffff}, - {L"vbYellow", NULL, BP_GET, VT_I4, 0x00ffff}, + {L"vbYellow", NULL, BP_GET, VT_I4, (INT16)0x00ffff}, {L"vbYes", NULL, BP_GET, VT_I2, IDYES}, {L"vbYesNo", NULL, BP_GET, VT_I2, MB_YESNO}, {L"vbYesNoCancel", NULL, BP_GET, VT_I2, MB_YESNOCANCEL}, @@ -3105,7 +3105,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA if(SUCCEEDED(hres)) { script_ctx_t *ctx = This->ctx; - error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); + error = (code == (INT16)code) ? MAKE_VBSERROR((UINT16)code) : map_hres(code); if(source) { SysFreeString(ctx->ei.bstrSource); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 2fee702ac8f..1ea5177d015 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -310,7 +310,7 @@ static int hex_to_int(WCHAR c) static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) { const WCHAR *begin = ctx->ptr; - LONG l = 0, d; + unsigned l = 0, d; while((d = hex_to_int(*++ctx->ptr)) != -1) l = l*16 + d; @@ -323,7 +323,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) if(*ctx->ptr == '&') ctx->ptr++; - *ret = l; + *ret = l == (UINT16)l ? (INT16)l : l; return tInt; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1ab3b6274e6..60c8cc22570 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -55,6 +55,8 @@ Call ok(true = -1, "! true = -1") Call ok(false = 0, "false <> 0") Call ok(&hff = 255, "&hff <> 255") Call ok(&Hff = 255, "&Hff <> 255") +Call ok(&hffff = -1, "&hffff <> -1") +Call ok(&hfffe = -2, "&hfffe <> -2") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5) @@ -94,6 +96,7 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") +Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8")

1 0

Gijs Vermeulen : avrt: Add AvSetMmMaxThreadCharacteristicsA/W stub.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 64bc69eee3f3e34677e73c7dac6d74afa35ab58a URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bc69eee3f3e34677e73c7d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Nov 22 15:45:14 2020 +0100 avrt: Add AvSetMmMaxThreadCharacteristicsA/W stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50160 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fed67d6edd2e6451a3e773d37a916add310e6ae6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/avrt/avrt.spec | 4 +-- dlls/avrt/main.c | 86 ++++++++++++++++++++++++++++++++++++++++++----------- include/avrt.h | 2 +- 3 files changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec index a7dfc42879c..0a05abcdbca 100644 --- a/dlls/avrt/avrt.spec +++ b/dlls/avrt/avrt.spec @@ -7,8 +7,8 @@ @ stub AvRtJoinThreadOrderingGroup @ stub AvRtLeaveThreadOrderingGroup @ stub AvRtWaitOnThreadOrderingGroup -@ stub AvSetMmMaxThreadCharacteristicsA -@ stub AvSetMmMaxThreadCharacteristicsW +@ stdcall AvSetMmMaxThreadCharacteristicsA(str str ptr) +@ stdcall AvSetMmMaxThreadCharacteristicsW(wstr wstr ptr) @ stdcall AvSetMmThreadCharacteristicsA(str ptr) @ stdcall AvSetMmThreadCharacteristicsW(wstr ptr) @ stdcall AvSetMmThreadPriority(ptr long) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index eb5704cc508..258c525e198 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,10 +23,21 @@ #include "winbase.h" #include "winnls.h" #include "wine/debug.h" +#include "wine/heap.h" #include "avrt.h" WINE_DEFAULT_DEBUG_CHANNEL(avrt); +static inline WCHAR *heap_strdupAW(const char *src) +{ + int len; + WCHAR *dst; + if (!src) return NULL; + len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); + if ((dst = heap_alloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); + return dst; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -43,41 +54,39 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -HANDLE WINAPI AvSetMmThreadCharacteristicsA(LPCSTR TaskName, LPDWORD TaskIndex) +HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) { + WCHAR *nameW = NULL; HANDLE ret; - LPWSTR str = NULL; - if (TaskName) + if (name && !(nameW = heap_strdupAW(name))) { - DWORD len = (lstrlenA(TaskName)+1); - str = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (!str) - { - SetLastError(ERROR_OUTOFMEMORY); - return NULL; - } - MultiByteToWideChar(CP_ACP, 0, TaskName, len, str, len); + SetLastError(ERROR_OUTOFMEMORY); + return NULL; } - ret = AvSetMmThreadCharacteristicsW(str, TaskIndex); - HeapFree(GetProcessHeap(), 0, str); + + ret = AvSetMmThreadCharacteristicsW(nameW, index); + + heap_free(nameW); return ret; } -HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) +HANDLE WINAPI AvSetMmThreadCharacteristicsW(const WCHAR *name, DWORD *index) { - FIXME("(%s,%p): stub\n", debugstr_w(TaskName), TaskIndex); + FIXME("(%s,%p): stub\n", debugstr_w(name), index); - if (!TaskName) + if (!name) { SetLastError(ERROR_INVALID_TASK_NAME); return NULL; } - if (!TaskIndex) + + if (!index) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } + return (HANDLE)0x12345678; } @@ -98,3 +107,46 @@ BOOL WINAPI AvSetMmThreadPriority(HANDLE AvrtHandle, AVRT_PRIORITY prio) FIXME("(%p)->(%u) stub\n", AvrtHandle, prio); return TRUE; } + +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *task2, DWORD *index) +{ + WCHAR *task1W = NULL, *task2W = NULL; + HANDLE ret; + + if (task1 && !(task1W = heap_strdupAW(task1))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + if (task2 && !(task2W = heap_strdupAW(task2))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + ret = AvSetMmMaxThreadCharacteristicsW(task1W, task2W, index); + + heap_free(task2W); + heap_free(task1W); + return ret; +} + +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(const WCHAR *task1, const WCHAR *task2, DWORD *index) +{ + FIXME("(%s,%s,%p): stub\n", debugstr_w(task1), debugstr_w(task2), index); + + if (!task1 || task2) + { + SetLastError(ERROR_INVALID_TASK_NAME); + return NULL; + } + + if (!index) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + return (HANDLE)0x12345678; +} diff --git a/include/avrt.h b/include/avrt.h index 9d12c1b5b1b..88beebb0bf8 100644 --- a/include/avrt.h +++ b/include/avrt.h @@ -43,7 +43,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) #define AvSetMmThreadCharacteristics WINELIB_NAME_AW(AvSetMmThreadCharacteristics) HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); -HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(LPCWSTR FirstTask, LPCWSTR SecondTask, LPDWORD TaskIndex); #define AvSetMmMaxThreadCharacteristics WINELIB_NAME_AW(AvSetMmMaxThreadCharacteristics) BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle);

1 0

Brendan Shanks : wine.inf: Add UrlAssociations for FTP/HTTP/HTTPS.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 6a62c7999a4392f97cb8995e32164e2ed9154df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a62c7999a4392f97cb8995e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 24 15:16:40 2020 -0800 wine.inf: Add UrlAssociations for FTP/HTTP/HTTPS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ba8638e1a4e2a31d0e62762ab29b5a0b3d63856e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/assoc.c | 2 +- loader/wine.inf.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 5e93750229d..65334e4a739 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -288,7 +288,7 @@ static void test_IApplicationAssociationRegistration_QueryCurrentDefault(IApplic ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), "got 0x%x\n", hr); hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, httpW, AT_URLPROTOCOL, AL_EFFECTIVE, &assocprog); - todo_wine ok(hr == S_OK, "got 0x%x\n", hr); + ok(hr == S_OK, "got 0x%x\n", hr); trace("%s\n", wine_dbgstr_w(assocprog)); CoTaskMemFree(assocprog); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index bcccd3a9ca0..1ea0a5fb014 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -764,6 +764,11 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840" +; URL Associations +HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoice,"ProgId",,"ftp" +HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http" +HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https" + [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"c_037.nls" HKLM,System\CurrentControlSet\Control\Nls\Codepage,"424",,"c_424.nls"

1 0

Brendan Shanks : winebrowser: Prefix an invalid URL with 'http://' before opening with a browser.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: d86e328001975a47a78c9ef638aa601660f9ca3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86e328001975a47a78c9ef6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 24 15:16:39 2020 -0800 winebrowser: Prefix an invalid URL with 'http://' before opening with a browser. Fixes usage like 'winebrowser winehq.org' when xdg-open or macOS 'open' is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a688cb6971525e49ffd029161b9007cd748ad42f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winebrowser/main.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..c70457e50b3 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -184,6 +184,29 @@ static int open_mailto_url( const WCHAR *url ) return launch_app( mailers, url ); } +static int open_invalid_url( const WCHAR *url ) +{ + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; + + WCHAR *url_prefixed; + int ret; + + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = open_http_url( url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + return ret; +} + /***************************************************************************** * DDE helper functions. */ @@ -448,8 +471,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); if(FAILED(hres)) { - WINE_ERR("Failed to parse URL\n"); - ret = open_http_url(url); + WINE_ERR("Failed to parse URL %s, treating as HTTP\n", wine_dbgstr_w(url)); + ret = open_invalid_url(url); HeapFree(GetProcessHeap(), 0, ddeString); return ret; }

1 0

Piotr Caban : msvcrt: Implement opening Unicode files with no BOM in _wsopen_dispatch.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: e26155371b257d35c5795ee80ee1e3991470a559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e26155371b257d35c5795ee8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 15:26:35 2020 +0100 msvcrt: Implement opening Unicode files with no BOM in _wsopen_dispatch. Spotted by Alistair Leslie-Hughes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0ab1b76029eaface724a28483fe8b0ea36029dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 8 ++------ dlls/msvcrt/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d5aff642904..71c8ab2e788 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2178,17 +2178,15 @@ static int check_bom(HANDLE h, int oflags, BOOL seek) char bom[sizeof(utf8_bom)]; DWORD r; - oflags &= ~(MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT); - if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) return oflags; if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { - oflags |= MSVCRT__O_U8TEXT; + oflags = (oflags & ~(MSVCRT__O_WTEXT | MSVCRT__O_U16TEXT)) | MSVCRT__O_U8TEXT; }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { if (seek && r>2) SetFilePointer(h, 2, NULL, FILE_BEGIN); - oflags |= MSVCRT__O_U16TEXT; + oflags = (oflags & ~(MSVCRT__O_WTEXT | MSVCRT__O_U8TEXT)) | MSVCRT__O_U16TEXT; }else if (seek) { SetFilePointer(h, 0, NULL, FILE_BEGIN); } @@ -2288,8 +2286,6 @@ int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int s oflags = check_bom(hand, oflags, FALSE); CloseHandle(hand); } - else - oflags &= ~(MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT); } hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 63d5100de28..767be3a8be5 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -955,6 +955,38 @@ static void test_fgetwc_unicode(void) ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + tempfh = fopen(tempfile, "r,ccs=utf-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "a,ccs=utf-16le"); + ok(tempfh != NULL, "can't open tempfile\n"); + ch = fputwc('a', tempfh); + ok(ch == 'a', "fputwc returned %x\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "a+,ccs=utf-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == 'a', "got %04x, expected 'a'\n", ch); + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + tempfh = fopen(tempfile, "wb"); ok(tempfh != NULL, "can't open tempfile\n"); ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text, ARRAY_SIZE(wchar_text), @@ -974,6 +1006,23 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text+1, 1, sizeof(wchar_text)-1, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt,ccs=utf-16le"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); unlink(temppath); }

1 0

Piotr Caban : msvcrt: Don't write Unicode BOM if file is not empty in _wsopen_dispatch.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: ecf072aaa7ad998626fdb68608da78593dd6da96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf072aaa7ad998626fdb686… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 15:26:27 2020 +0100 msvcrt: Don't write Unicode BOM if file is not empty in _wsopen_dispatch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00a024725e86f3dd3f8bb52849fd2597bbf58d40) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 825d442bfa8..d5aff642904 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2301,9 +2301,14 @@ int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int s if (oflags & (MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT)) { + LARGE_INTEGER size = {{0}}; + + if ((access & GENERIC_WRITE) && (creation==OPEN_EXISTING || creation==OPEN_ALWAYS)) + GetFileSizeEx(hand, &size); + if ((access & GENERIC_WRITE) && (creation==CREATE_NEW || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING - || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) + || ((creation==OPEN_EXISTING || creation==OPEN_ALWAYS) && !size.QuadPart))) { if (oflags & MSVCRT__O_U8TEXT) {

1 0

Hans Leidekker : winebus.sys: Fix registry access rights for SDL controller mapping.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 7cda423669f45f4f990248c8fe80843f9c470282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cda423669f45f4f990248c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 24 12:22:00 2020 +0100 winebus.sys: Fix registry access rights for SDL controller mapping. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48545 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ce03d93135247fce4e9b2319319c8e989fd3767) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 7a2069fafe9..8000381f36f 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1036,7 +1036,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) HKEY key; static const WCHAR szPath[] = {'m','a','p',0}; - if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_ENUMERATE_SUB_KEYS, &key)) + if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) { DWORD index = 0; CHAR *buffer = NULL;

1 0

Alistair Leslie-Hughes : msctf: Accept ITfActiveLanguageProfileNotifySink in ThreadMgr AdviseSink.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 53b86468dca1816352e1fccbbb97700b1a664530 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b86468dca1816352e1fccb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 22 17:13:31 2020 +0100 msctf: Accept ITfActiveLanguageProfileNotifySink in ThreadMgr AdviseSink. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44502 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5d70611f305b52d75af7fca6c0614dcc25af7ebe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 584bb1044ed..9d60e18e6f3 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -34,6 +34,7 @@ #define COOKIE_MAGIC_KEYTRACESINK 0x0090 #define COOKIE_MAGIC_UIELEMENTSINK 0x00a0 #define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0 +#define COOKIE_MAGIC_ACTIVELANGSINK 0x00c0 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 77cf47ca4f6..0e054d4e654 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -621,6 +621,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } + if (IsEqualIID(riid, &IID_ITfActiveLanguageProfileNotifySink)) + { + WARN("semi-stub for ITfActiveLanguageProfileNotifySink: sink won't be used.\n"); + return advise_sink(&This->ActiveLanguageProfileNotifySink, &IID_ITfActiveLanguageProfileNotifySink, + COOKIE_MAGIC_ACTIVELANGSINK, punk, pdwCookie); + } + if (IsEqualIID(riid, &IID_ITfKeyTraceEventSink)) { WARN("semi-stub for ITfKeyTraceEventSink: sink won't be used.\n"); @@ -656,7 +663,8 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo magic = get_Cookie_magic(pdwCookie); if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK - && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK) + && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK + && magic != COOKIE_MAGIC_ACTIVELANGSINK) return E_INVALIDARG; return unadvise_sink(pdwCookie);

1 0

Alexandre Julliard : winebuild: Set PE timestamps to a hash of the file name.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 74475ea34114c053c52e1b8c4e1a367d5e0d229f URL: https://source.winehq.org/git/wine.git/?a=commit;h=74475ea34114c053c52e1b8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 16:49:29 2020 +0100 winebuild: Set PE timestamps to a hash of the file name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d5c089f5fa71e2ae568b2f1bcb9158223c552040) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winebuild/spec32.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7abeb08140a..8e5217cc717 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -51,6 +51,14 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static unsigned int hash_filename( const char *name ) +{ + /* FNV-1 hash */ + unsigned int ret = 2166136261u; + while (*name) ret = (ret * 16777619) ^ *name++; + return ret; +} + /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) { @@ -398,7 +406,7 @@ void output_exports( DLLSPEC *spec ) /* export directory header */ output( "\t.long 0\n" ); /* Characteristics */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* MajorVersion/MinorVersion */ output_rva( ".L__wine_spec_exp_names" ); /* Name */ output( "\t.long %u\n", spec->base ); /* Base */ @@ -695,7 +703,7 @@ void output_module( DLLSPEC *spec ) output( "\t.short 0x%04x\n", /* Machine */ machine ); output( "\t.short 0\n" ); /* NumberOfSections */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* PointerToSymbolTable */ output( "\t.long 0\n" ); /* NumberOfSymbols */ output( "\t.short %d\n", /* SizeOfOptionalHeader */ @@ -850,7 +858,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } put_word( nb_sections ); /* NumberOfSections */ - put_dword( 0 ); /* TimeDateStamp */ + put_dword( hash_filename(spec->file_name) ); /* TimeDateStamp */ put_dword( 0 ); /* PointerToSymbolTable */ put_dword( 0 ); /* NumberOfSymbols */ put_word( get_ptr_size() == 8 ?

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021