September 2022 - Wine-commits

Jacek Caban : winevulkan: Don't pass params struct to private thunks.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 9972ae6e8c56e844c295094d80c54a2446ac208d URL: https://gitlab.winehq.org/wine/wine/-/commit/9972ae6e8c56e844c295094d80c54a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 23 21:11:32 2022 +0200 winevulkan: Don't pass params struct to private thunks. --- dlls/winevulkan/make_vulkan | 59 +- dlls/winevulkan/vulkan.c | 396 ++++----- dlls/winevulkan/vulkan_thunks.c | 1810 +++++++++++++++++++-------------------- dlls/winevulkan/vulkan_thunks.h | 84 +- 4 files changed, 1091 insertions(+), 1258 deletions(-)

1 0

Jacek Caban : winevulkan: Use generated thunks for basic debug traces.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 79f67c524bd6a73c8a54dda4903c1db2eccbfb80 URL: https://gitlab.winehq.org/wine/wine/-/commit/79f67c524bd6a73c8a54dda4903c1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 25 16:29:08 2022 +0200 winevulkan: Use generated thunks for basic debug traces. --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 66 ----------------- dlls/winevulkan/vulkan_thunks.c | 156 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+), 67 deletions(-)

1 0

Zhiyi Zhang : light.msstyles: Use a darker color for inactive captions.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: cb254cb5f424e55c137fdc12aa67e490bbcaa3d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb254cb5f424e55c137fdc12aa67e4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 26 11:24:55 2022 +0800 light.msstyles: Use a darker color for inactive captions. Fix invisible disabled menu item text in Subtitle Workshop Classic 6.1.4. The application happens to use 0xF0F0F0 as the menu background and the inactive caption color to draw disabled menu item text. In Light theme, the inactive caption color is very close to 0xF0F0F0, thus causing the invisible text. So use a darker color for inactive captions to avoid this issue. The inactive caption text color is also adjusted accordingly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53575 --- dlls/light.msstyles/light.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index eb517ed09db..be8b1dfda57 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -99,7 +99,7 @@ BLUE_INI TEXTFILE "Scrollbar = 255 255 255\r\n" "Background = 37 111 149\r\n" "ActiveCaption = 50 150 250\r\n" -"InactiveCaption = 245 245 245\r\n" +"InactiveCaption = 128 128 128\r\n" "Menu = 255 255 255\r\n" "Window = 255 255 255\r\n" "WindowFrame = 158 158 158\r\n" @@ -115,7 +115,7 @@ BLUE_INI TEXTFILE "BtnShadow = 166 166 166\r\n" "GrayText = 166 166 166\r\n" "BtnText = 0 0 0\r\n" -"InactiveCaptionText = 100 100 100\r\n" +"InactiveCaptionText = 200 200 200\r\n" "BtnHighlight = 255 255 255\r\n" "DkShadow3d = 106 106 106\r\n" "Light3d = 227 227 227\r\n" @@ -124,7 +124,7 @@ BLUE_INI TEXTFILE "ButtonAlternateFace = 255 255 255\r\n" "HotTracking = 224 224 224\r\n" "GradientActiveCaption = 50 150 250\r\n" -"GradientInactiveCaption = 245 245 245\r\n" +"GradientInactiveCaption = 128 128 128\r\n" "MenuHilight = 48 150 250\r\n" "MenuBar = 255 255 255\r\n"

1 0

Kevin Puetz : scrrun/tests: Introduce a test_file_contents helper.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 7b44c6895f7a1768a643c9faed814a444ccb2388 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b44c6895f7a1768a643c9faed814a… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 22 21:38:35 2022 -0500 scrrun/tests: Introduce a test_file_contents helper. --- dlls/scrrun/tests/filesystem.c | 97 ++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 56 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index f2e23e4011c..41d7f8b5500 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -62,6 +62,32 @@ static inline void get_temp_path(const WCHAR *prefix, WCHAR *path) DeleteFileW(path); } +#define test_file_contents(a, b, c) _test_file_contents(a, b, c, __LINE__) +static void _test_file_contents(LPCWSTR pathW, DWORD expected_size, const void * expected_contents, int line) +{ + HANDLE file; + BOOL ret; + DWORD actual_size; + + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok_(__FILE__,line) (file != INVALID_HANDLE_VALUE, "got %p\n", file); + + actual_size = GetFileSize(file,NULL); + ok_(__FILE__,line) (actual_size == expected_size, "expected file %s size %ld, got %ld\n", wine_dbgstr_w(pathW), expected_size, actual_size); + + if((expected_contents != NULL) && (actual_size > 0)) + { + DWORD r; + void *actual_contents = malloc(actual_size); + ret = ReadFile(file, actual_contents, actual_size, &r, NULL); + ok_(__FILE__,line) (ret && r == actual_size, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); + ok_(__FILE__,line) (!memcmp(expected_contents, actual_contents, expected_size), "expected file %s contents %s, got %s\n", wine_dbgstr_w(pathW), wine_dbgstr_an(expected_contents,expected_size), wine_dbgstr_an(actual_contents,r)); + free(actual_contents); + } + + CloseHandle(file); +} + static IDrive *get_fixed_drive(void) { IDriveCollection *drives; @@ -1507,13 +1533,12 @@ static void get_temp_filepath(const WCHAR *filename, WCHAR *path, WCHAR *dir) static void test_CreateTextFile(void) { - WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; ITextStream *stream; BSTR nameW, str; HANDLE file; HRESULT hr; BOOL ret; - DWORD r; get_temp_filepath(testfileW, pathW, dirW); @@ -1563,15 +1588,7 @@ static void test_CreateTextFile(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); - /* check contents */ - file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); - r = 0; - ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); - ok(ret && r == 2, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); - - ok( buffW[0] == 0xfeff, "got %04x\n", buffW[0] ); - CloseHandle(file); + test_file_contents(pathW,2,L"\ufeff"); DeleteFileW(nameW); RemoveDirectoryW(dirW); @@ -1580,14 +1597,13 @@ static void test_CreateTextFile(void) static void test_FolderCreateTextFile(void) { - WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10], buff2W[10]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; ITextStream *stream; BSTR nameW, str; HANDLE file; IFolder *folder; HRESULT hr; BOOL ret; - DWORD r; get_temp_filepath(testfileW, pathW, dirW); nameW = SysAllocString(L"foo.txt"); @@ -1640,18 +1656,7 @@ static void test_FolderCreateTextFile(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); - /* check contents */ - file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); - r = 0; - ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); - ok(ret && r == 2, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); - buffW[r/sizeof(WCHAR)] = 0; - - buff2W[0] = 0xfeff; - buff2W[1] = 0; - ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); - CloseHandle(file); + test_file_contents(pathW,2,L"\ufeff"); DeleteFileW(pathW); RemoveDirectoryW(dirW); @@ -1661,11 +1666,10 @@ static void test_FolderCreateTextFile(void) static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; - WCHAR buffW[MAX_PATH], buff2W[MAX_PATH]; - char buffA[MAX_PATH]; + WCHAR ExpectedW[MAX_PATH]; + char ExpectedA[MAX_PATH]; ITextStream *stream; - DWORD r, len; - HANDLE file; + DWORD len; BSTR nameW; HRESULT hr; BOOL ret; @@ -1684,19 +1688,10 @@ static void test_WriteLine(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); - /* check contents */ - file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); - r = 0; - ret = ReadFile(file, buffA, sizeof(buffA), &r, NULL); - ok(ret && r, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); - - len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, ARRAY_SIZE(buffW)); - buffW[len] = 0; - lstrcpyW(buff2W, nameW); - lstrcatW(buff2W, L"\r\n"); - ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); - CloseHandle(file); + len = WideCharToMultiByte(CP_ACP, 0, nameW, -1, ExpectedA, ARRAY_SIZE(ExpectedA)-2, NULL, NULL); + ok(len > 0, "got %ld", len); + lstrcatA(ExpectedA, "\r\n"); + test_file_contents(pathW,lstrlenA(ExpectedA),ExpectedA); DeleteFileW(nameW); /* same for unicode file */ @@ -1707,20 +1702,10 @@ static void test_WriteLine(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITextStream_Release(stream); - /* check contents */ - file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); - r = 0; - ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); - ok(ret && r, "Read %ld, got %d, error %ld.\n", r, ret, GetLastError()); - buffW[r/sizeof(WCHAR)] = 0; - - buff2W[0] = 0xfeff; - buff2W[1] = 0; - lstrcatW(buff2W, nameW); - lstrcatW(buff2W, L"\r\n"); - ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); - CloseHandle(file); + lstrcpyW(ExpectedW, L"\ufeff"); + lstrcatW(ExpectedW, nameW); + lstrcatW(ExpectedW, L"\r\n"); + test_file_contents(pathW,lstrlenW(ExpectedW)*sizeof(WCHAR),ExpectedW); DeleteFileW(nameW); RemoveDirectoryW(dirW);

1 0

Kevin Puetz : scrrun: Fix FileSystemObject.OpenTextFile when writing to existing files.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 3265d7b542c0045ce1a31abc71a5bd97a9c23e5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3265d7b542c0045ce1a31abc71a5bd… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Sep 20 16:53:08 2022 -0500 scrrun: Fix FileSystemObject.OpenTextFile when writing to existing files. OpenTextFile(...,ForWriting,True) should either create a new file, or open and truncate an existing one OpenTextFile(...,ForAppending,?,True) should write a BOM if appending to an existing-but-empty file --- dlls/scrrun/filesystem.c | 23 ++++++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index cfeb5bb1532..e53355267db 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -897,7 +897,7 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod { stream->unicode = format == TristateTrue; /* Write Unicode BOM */ - if (stream->unicode && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW)) { + if (stream->unicode && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW || disposition == TRUNCATE_EXISTING)) { DWORD written = 0; BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); if (!ret || written != sizeof(utf16bom)) { @@ -939,7 +939,20 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod stream->eof = read != sizeof(buf); } - else SetFilePointer(stream->file, 0, 0, FILE_END); + else + { + LONG filePosHigh = 0; + DWORD filePosLow = SetFilePointer(stream->file, 0, &filePosHigh, FILE_END); + if(stream->unicode && filePosHigh == 0 && filePosLow == 0) { + /* unicode ForAppending to an empty file, write BOM */ + DWORD written = 0; + BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); + if (!ret || written != sizeof(utf16bom)) { + ITextStream_Release(&stream->ITextStream_iface); + return create_error(GetLastError()); + } + } + } } init_classinfo(&CLSID_TextStream, (IUnknown *)&stream->ITextStream_iface, &stream->classinfo); @@ -4049,7 +4062,11 @@ static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, TRACE("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); - disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; + if(mode == ForWriting) { + disposition = create == VARIANT_TRUE ? CREATE_ALWAYS : TRUNCATE_EXISTING; + } else { + disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; + } return create_textstream(filename, disposition, mode, format, stream); } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 41d7f8b5500..e53bd092ce9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -263,6 +263,7 @@ static void test_createfolder(void) static void test_textstream(void) { + WCHAR ExpectedW[10]; ITextStream *stream; VARIANT_BOOL b; DWORD written; @@ -378,6 +379,31 @@ todo_wine { ok(ret && written == sizeof(testfileW), "got %d\n", ret); CloseHandle(file); + /* opening a non-empty file (from above) for writing should truncate it */ + hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ITextStream_Release(stream); + + test_file_contents(testfileW,0,""); + + /* appending to an empty file file and specifying unicode should immediately write a BOM */ + hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateTrue, &stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ITextStream_Release(stream); + + test_file_contents(testfileW,2,L"\ufeff"); + + /* appending to a file that contains a BOM should detect unicode mode, but not write a second BOM */ + hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = ITextStream_Write(stream, name); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ITextStream_Release(stream); + + lstrcpyW(ExpectedW, L"\ufeff"); + lstrcatW(ExpectedW, name); + test_file_contents(testfileW,lstrlenW(ExpectedW)*sizeof(WCHAR),ExpectedW); + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); b = 10;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: b3ec117b1d115d3d9958bd93665d2ad11bcc9c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3ec117b1d115d3d9958bd93665d2a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Sep 23 23:24:54 2022 +0300 po: Update Lithuanian translation. --- po/lt.po | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index cb1401bb7cd..e8892f88cde 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-09-17 12:50+0300\n" +"PO-Revision-Date: 2022-09-23 23:24+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15075,10 +15075,8 @@ msgid "&Replace...\tCtrl+H" msgstr "Pa&keisti...\tVald+H" #: programs/notepad/notepad.rc:59 -#, fuzzy -#| msgid "&New...\tCtrl+N" msgid "&Go To...\tCtrl+G" -msgstr "&Naujas...\tVald+N" +msgstr "&Eiti į...\tVald+G" #: programs/notepad/notepad.rc:63 programs/oleview/oleview.rc:68 #: programs/oleview/oleview.rc:90 programs/winefile/winefile.rc:67 @@ -15121,17 +15119,15 @@ msgstr "&Viršutinė:" #: programs/notepad/notepad.rc:132 msgid "Go To Line" -msgstr "" +msgstr "Eiti į eilutę" #: programs/notepad/notepad.rc:134 -#, fuzzy -#| msgid "CRL Number" msgid "&Line Number:" -msgstr "ALS numeris" +msgstr "&Eilutės numeris:" #: programs/notepad/notepad.rc:137 msgid "Go To" -msgstr "" +msgstr "Eiti į" #: programs/notepad/notepad.rc:145 msgid "Encoding:" @@ -15197,7 +15193,7 @@ msgstr "Z" #: programs/notepad/notepad.rc:162 msgctxt "accelerator GoTo" msgid "G" -msgstr "" +msgstr "G" #: programs/notepad/notepad.rc:74 msgid "Page &p"

1 0

Jacek Caban : vbscript: Fix handling missing description in EXCEPINFO.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: d8a03ae6308e1dacaa382a0bb6404c980ed565d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8a03ae6308e1dacaa382a0bb6404c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 21 23:17:02 2022 +0200 vbscript: Fix handling missing description in EXCEPINFO. Based on patch by Kevin Puetz. --- dlls/vbscript/interp.c | 13 +++-- dlls/vbscript/tests/run.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c43b5383dee..1d7482b5013 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2490,14 +2490,19 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd if(FAILED(hres)) { if(hres != SCRIPT_E_RECORDED) { clear_ei(&ctx->ei); - - ctx->ei.scode = hres = map_hres(hres); - ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); - ctx->ei.bstrDescription = get_vbscript_error_string(hres); + hres = map_hres(hres); + }else if(!ctx->ei.bstrDescription) { + hres = map_hres(ctx->ei.scode); }else { hres = ctx->ei.scode; } + ctx->ei.scode = hres; + if(!ctx->ei.bstrSource) + ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); + if(!ctx->ei.bstrDescription) + ctx->ei.bstrDescription = get_vbscript_error_string(hres); + if(exec.resume_next) { unsigned stack_off; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 556772e1f37..8d7c15ba70b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -145,6 +145,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_THROWWITHDESC 1024 #define DISPID_GLOBAL_PROPARGSET 1025 #define DISPID_GLOBAL_UNKOBJ 1026 +#define DISPID_GLOBAL_THROWEXCEPTION 1027 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1157,6 +1158,7 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"counter", DISPID_GLOBAL_COUNTER }, { L"doubleAsString", DISPID_GLOBAL_DOUBLEASSTRING }, { L"testArray", DISPID_GLOBAL_TESTARRAY }, + { L"throwException", DISPID_GLOBAL_THROWEXCEPTION }, { L"throwInt", DISPID_GLOBAL_THROWINT }, { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, @@ -1540,6 +1542,54 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return hres; + case DISPID_GLOBAL_THROWEXCEPTION: { + VARIANT *v = pdp->rgvarg + pdp->cArgs - 1; + + ok((wFlags & ~INVOKE_PROPERTYGET) == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs >= 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pei != NULL, "pei == NULL\n"); + + if(pvarRes) { + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = VARIANT_FALSE; + } + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + v = V_VARIANTREF(v); + + memset(pei, 0, sizeof(*pei)); + switch(V_VT(v)) { + case VT_I2: + pei->scode = V_I2(v); + break; + case VT_I4: + pei->scode = V_I4(v); + break; + default: + ok(0, "unexpected vt %d\n", V_VT(v)); + return E_INVALIDARG; + } + + if(pdp->cArgs >= 2) { + v = pdp->rgvarg + pdp->cArgs - 2; + ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); + pei->bstrSource = SysAllocString(V_BSTR(v)); + } + + if(pdp->cArgs >= 3) { + v = pdp->rgvarg + pdp->cArgs - 3; + ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); + pei->bstrDescription = SysAllocString(V_BSTR(v)); + } + + return DISP_E_EXCEPTION; + } + case DISPID_GLOBAL_THROWWITHDESC: pei->scode = 0xdeadbeef; pei->bstrDescription = SysAllocString(L"test"); @@ -2351,6 +2401,82 @@ static void test_callbacks(void) IActiveScriptParse_Release(parser); close_script(script); strict_enter_script = FALSE; + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&"); + ok(hres == MAKE_VBSERROR(430), "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!wcscmp(ei.bstrSource, L"Microsoft VBScript runtime error"), + "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"Class doesn't support Automation"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == MAKE_VBSERROR(430), "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&, \"test src\""); + ok(hres == MAKE_VBSERROR(430), "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!wcscmp(ei.bstrSource, L"test src"), "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"Class doesn't support Automation"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == MAKE_VBSERROR(430), "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&, \"test src\", \"test desc\""); + ok(hres == E_NOINTERFACE, "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!wcscmp(ei.bstrSource, L"test src"), "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"test desc"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == E_NOINTERFACE, "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); } static void test_gc(void)

1 0

Paul Gofman : ntdll: Fix processor package mask in SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX structure.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: fd3574a162a5d2d9c07924b274a992844666d76e URL: https://gitlab.winehq.org/wine/wine/-/commit/fd3574a162a5d2d9c07924b274a992… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 23 14:09:33 2022 -0500 ntdll: Fix processor package mask in SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX structure. Fixes a regression introduced by commit 6aa437de6aa3549abd885c387ea79d18eb0eba56. --- dlls/ntdll/unix/system.c | 70 ++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 136fc80adf1..4ca07c2e34c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -591,39 +591,10 @@ static DWORD count_bits( ULONG_PTR mask ) return count; } -/* Store package and core information for a logical processor. Parsing of processor - * data may happen in multiple passes; the 'id' parameter is then used to locate - * previously stored data. The type of data stored in 'id' depends on 'rel': - * - RelationProcessorPackage: package id ('CPU socket'). - * - RelationProcessorCore: physical core number. - */ -static BOOL logical_proc_info_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, ULONG_PTR mask ) +static BOOL logical_proc_info_ex_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, ULONG_PTR mask ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex; - unsigned int ofs = 0, i; - - for (i = 0; i < logical_proc_info_len; i++) - { - if (rel == RelationProcessorPackage && logical_proc_info[i].Relationship == rel - && logical_proc_info[i].u.Reserved[1] == id) - { - logical_proc_info[i].ProcessorMask |= mask; - return TRUE; - } - else if (rel == RelationProcessorCore && logical_proc_info[i].Relationship == rel - && logical_proc_info[i].u.Reserved[1] == id) - return TRUE; - } - - if (!grow_logical_proc_buf()) return FALSE; - - logical_proc_info[i].Relationship = rel; - logical_proc_info[i].ProcessorMask = mask; - if (rel == RelationProcessorCore) - logical_proc_info[i].u.ProcessorCore.Flags = count_bits( mask ) > 1 ? LTP_PC_SMT : 0; - logical_proc_info[i].u.Reserved[0] = 0; - logical_proc_info[i].u.Reserved[1] = id; - logical_proc_info_len = i + 1; + unsigned int ofs = 0; while (ofs < logical_proc_info_ex_size) { @@ -661,10 +632,45 @@ static BOOL logical_proc_info_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWO dataex->u.Processor.Reserved[1] = id; logical_proc_info_ex_size += dataex->Size; - return TRUE; } +/* Store package and core information for a logical processor. Parsing of processor + * data may happen in multiple passes; the 'id' parameter is then used to locate + * previously stored data. The type of data stored in 'id' depends on 'rel': + * - RelationProcessorPackage: package id ('CPU socket'). + * - RelationProcessorCore: physical core number. + */ +static BOOL logical_proc_info_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, ULONG_PTR mask ) +{ + unsigned int i; + + for (i = 0; i < logical_proc_info_len; i++) + { + if (rel == RelationProcessorPackage && logical_proc_info[i].Relationship == rel + && logical_proc_info[i].u.Reserved[1] == id) + { + logical_proc_info[i].ProcessorMask |= mask; + return logical_proc_info_ex_add_by_id( rel, id, mask ); + } + else if (rel == RelationProcessorCore && logical_proc_info[i].Relationship == rel + && logical_proc_info[i].u.Reserved[1] == id) + return logical_proc_info_ex_add_by_id( rel, id, mask ); + } + + if (!grow_logical_proc_buf()) return FALSE; + + logical_proc_info[i].Relationship = rel; + logical_proc_info[i].ProcessorMask = mask; + if (rel == RelationProcessorCore) + logical_proc_info[i].u.ProcessorCore.Flags = count_bits( mask ) > 1 ? LTP_PC_SMT : 0; + logical_proc_info[i].u.Reserved[0] = 0; + logical_proc_info[i].u.Reserved[1] = id; + logical_proc_info_len = i + 1; + + return logical_proc_info_ex_add_by_id( rel, id, mask ); +} + static BOOL logical_proc_info_add_cache( ULONG_PTR mask, CACHE_DESCRIPTOR *cache ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;

1 0

Alexandre Julliard : Wine release 7.18
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: website Branch: master Commit: 6ad88e74fefcdc5ed1214d8aa45af4bf3471b842 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/6ad88e74fefcdc5ed1214d8aa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 22:02:34 2022 +0200 Wine release 7.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022092301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022092301.xml b/news/en/2022092301.xml new file mode 100644 index 00000000..2bf928a4 --- /dev/null +++ b/news/en/2022092301.xml @@ -0,0 +1,16 @@ +<news> +<date>September 23, 2022</date> +<title>Wine 7.18 Released</title> +<body> + The Wine development release 7.18 is now available. + <a href="{$root}/announce/7.18">What's new</a> in this release: +<ul> + <li>Character tables updated to Unicode 15.0.0.</li> + <li>Wow64 support in the macOS driver.</li> + <li>Async reader fixes in GStreamer support.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 7.18.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: ad26f04f69a03c6299cd2d0f14fb03b2df2c1495 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad26f04f69a03c6299cd2d0f14fb03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 21:59:24 2022 +0200 Release 7.18. --- ANNOUNCE | 653 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 356 insertions(+), 319 deletions(-)

1 0