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

Gabriel Ivăncescu : jscript: Use the object containing the prop for builtin getters.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: 954dd16fb146250b08940aaf103864399214fed4 URL: https://gitlab.winehq.org/wine/wine/-/commit/954dd16fb146250b08940aaf103864… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 31 18:50:59 2023 +0300 jscript: Use the object containing the prop for builtin getters. Since they act like values. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 2 +- dlls/mshtml/tests/es5.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0dd575434c1..ef72860f627 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -454,7 +454,7 @@ static HRESULT prop_get(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, switch(prop->type) { case PROP_BUILTIN: - hres = prop->u.p->getter(This->ctx, This, r); + hres = prop->u.p->getter(This->ctx, prop_obj, r); break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index cef3c77c207..38a70740698 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1720,6 +1720,9 @@ sync_test("builtin_context", function() { ok(obj === window, "obj = " + obj); obj = (function() { return this; }).call(42); ok(obj.valueOf() === 42, "obj = " + obj); + + obj = Object.create([100]); + ok(obj.length === 1, "obj.length = " + obj.length); }); sync_test("host this", function() {

1 0

Petrichor Park : wined3d: Implement a zero-safe normalize function for FFP.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: b79c4e7de60d63aec257764d20cfe69f9943c81b URL: https://gitlab.winehq.org/wine/wine/-/commit/b79c4e7de60d63aec257764d20cfe6… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Thu Jul 20 09:49:33 2023 -0500 wined3d: Implement a zero-safe normalize function for FFP. DirectX's FFP normalizes the zero vector to the zero vector, but GLSL normalizes them to all NaN. This patch creates ffp_normalize, which normalizes vectors but has DirectX's behavior on 0 vectors. Further patches in this set switch other calls from GLSL's normalize to the 0-safe version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36564 --- dlls/wined3d/glsl_shader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f7eb611df98..bbfea62f56a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9090,6 +9090,11 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); } + shader_addline(buffer, "\nvec3 ffp_normalize(vec3 n)\n{\n"); + shader_addline(buffer, " float lensq = dot(n, n);\n"); + shader_addline(buffer, " return lensq == 0.0 ? n : (n * inversesqrt(lensq));\n"); + shader_addline(buffer, "}\n"); + shader_addline(buffer, "\nvoid main()\n{\n"); shader_addline(buffer, "float m;\n"); shader_addline(buffer, "vec3 r;\n"); @@ -9151,7 +9156,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr } if (settings->normalize) - shader_addline(buffer, "normal = normalize(normal);\n"); + shader_addline(buffer, "normal = ffp_normalize(normal);\n"); } shader_glsl_ffp_vertex_lighting(buffer, settings, legacy_lighting); @@ -9192,11 +9197,11 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr case WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: shader_addline(buffer, "ffp_varying_texcoord[%u] = ffp_texture_matrix[%u]" - " * vec4(reflect(normalize(ec_pos.xyz), normal), 1.0);\n", i, i); + " * vec4(reflect(ffp_normalize(ec_pos.xyz), normal), 1.0);\n", i, i); break; case WINED3DTSS_TCI_SPHEREMAP: - shader_addline(buffer, "r = reflect(normalize(ec_pos.xyz), normal);\n"); + shader_addline(buffer, "r = reflect(ffp_normalize(ec_pos.xyz), normal);\n"); shader_addline(buffer, "m = 2.0 * length(vec3(r.x, r.y, r.z + 1.0));\n"); shader_addline(buffer, "ffp_varying_texcoord[%u] = ffp_texture_matrix[%u]" " * vec4(r.x / m + 0.5, r.y / m + 0.5, 0.0, 1.0);\n", i, i);

1 0

Michael Skorokhodov : win32u: Add DriverVersion string for GPUs to registry.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: 973ed2579186385a97fc51520de75d175cc738a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/973ed2579186385a97fc51520de75d… Author: Michael Skorokhodov <mykhailo.skorokhodov(a)globallogic.com> Date: Mon Jun 19 21:26:02 2023 +0300 win32u: Add DriverVersion string for GPUs to registry. Some applications (e.g. UE4) require the DriverVersion string in the registry. Signed-off-by: Mykhailo Skorokhodov <mykhailo.skorokhodov(a)globallogic.com> --- dlls/win32u/sysparams.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 233e5bb934b..fed309ff3d8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1230,6 +1230,8 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; + static const WCHAR driver_versionW[] = + {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; TRACE( "%s %04X %04X %08X %02X\n", debugstr_w(gpu->name), gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id ); @@ -1374,6 +1376,31 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) set_reg_value( hkey, chip_typeW, REG_BINARY, desc, size ); set_reg_value( hkey, dac_typeW, REG_BINARY, ramdacW, sizeof(ramdacW) ); + if (gpu->vendor_id && gpu->device_id) + { + /* The last seven digits are the driver number. */ + switch (gpu->vendor_id) + { + /* Intel */ + case 0x8086: + sprintf( buffer, "31.0.101.4576" ); + break; + /* AMD */ + case 0x1002: + sprintf( buffer, "31.0.14051.5006" ); + break; + /* Nvidia */ + case 0x10de: + sprintf( buffer, "31.0.15.3625" ); + break; + /* Default value for any other vendor. */ + default: + sprintf( buffer, "31.0.10.1000" ); + break; + } + set_reg_value( hkey, driver_versionW, REG_SZ, bufferW, asciiz_to_unicode( bufferW, buffer ) ); + } + NtClose( hkey ); link_device( ctx->gpuid, guid_devinterface_display_adapterW );

1 0

Michael Stefaniuc : vbscript/tests: Remove the need for a2bstr() in createobj.c.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: 2ca50c0817d9fa75dc3b8f7186297acbb38d6e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ca50c0817d9fa75dc3b8f7186297a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 15:59:31 2023 +0200 vbscript/tests: Remove the need for a2bstr() in createobj.c. --- dlls/vbscript/tests/createobj.c | 62 +++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 37 deletions(-)

1 0

Michael Stefaniuc : vbscript/tests: Avoid using a2bstr() for static strings.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: 23e2eb398424b192161e3516ab22e559b30d7121 URL: https://gitlab.winehq.org/wine/wine/-/commit/23e2eb398424b192161e3516ab22e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 15:47:52 2023 +0200 vbscript/tests: Avoid using a2bstr() for static strings. --- dlls/vbscript/tests/run.c | 92 +++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-)

1 0

Michael Stefaniuc : vbscript/tests: Avoid using a2bstr() in the run.c helpers.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: a489b7ef307f724eb59c1a17f9a1ac42ab17724b URL: https://gitlab.winehq.org/wine/wine/-/commit/a489b7ef307f724eb59c1a17f9a1ac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 18:14:29 2023 +0200 vbscript/tests: Avoid using a2bstr() in the run.c helpers. --- dlls/vbscript/tests/run.c | 190 +++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 95 deletions(-)

1 0

Michael Stefaniuc : vbscript/tests: Avoid using a2bstr() in the vbscript.c helpers.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: c8a72b458c5f51300b542b8248b010ed4d3807e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8a72b458c5f51300b542b8248b010… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 19:38:29 2023 +0200 vbscript/tests: Avoid using a2bstr() in the vbscript.c helpers. --- dlls/vbscript/tests/vbscript.c | 86 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 42 deletions(-)

1 0

Michael Stefaniuc : vbscript/tests: Remove the last usage of a2bstr() in vbscript.c.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: a16cf63858480afa3844ecb7777b54d79bdf45da URL: https://gitlab.winehq.org/wine/wine/-/commit/a16cf63858480afa3844ecb7777b54… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 19:44:35 2023 +0200 vbscript/tests: Remove the last usage of a2bstr() in vbscript.c. --- dlls/vbscript/tests/vbscript.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 8281548c5b6..68157c9695b 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -109,18 +109,6 @@ DEFINE_EXPECT(testCall); DEFINE_GUID(CLSID_VBScript, 0xb54f3741, 0x5b07, 0x11cf, 0xa4,0xb0, 0x00,0xaa,0x00,0x4a,0x55,0xe8); DEFINE_GUID(CLSID_VBScriptRegExp, 0x3f4daca4, 0x160d, 0x11d2, 0xa8,0xe9, 0x00,0x10,0x4b,0x36,0x5c,0x9f); -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - #define test_state(s,ss) _test_state(__LINE__,s,ss) static void _test_state(unsigned line, IActiveScript *script, SCRIPTSTATE exstate) { @@ -2634,22 +2622,22 @@ static void test_RegExp_Replace(void) { static const struct { - const char *pattern; - const char *replace; - const char *source; - const char *result; + const WCHAR *pattern; + const WCHAR *replace; + const WCHAR *source; + const WCHAR *result; BOOL global; } test[] = { - { "abc", "", "123abc456", "123456", FALSE }, - { "abc", "dcba", "123abc456", "123dcba456", FALSE }, - { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello\rNew\fWorld\t!", FALSE }, - { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello New World !", TRUE }, + { L"abc", L"", L"123abc456", L"123456", FALSE }, + { L"abc", L"dcba", L"123abc456", L"123dcba456", FALSE }, + { L"[\r\n\t\f]+", L" ", L"\nHello\rNew\fWorld\t!", L" Hello\rNew\fWorld\t!", FALSE }, + { L"[\r\n\t\f]+", L" ", L"\nHello\rNew\fWorld\t!", L" Hello New World !", TRUE }, }; HRESULT hr; IRegExp2 *regexp; VARIANT var; - BSTR str, ret, result; + BSTR str, ret; int i; hr = CoCreateInstance(&CLSID_VBScriptRegExp, NULL, @@ -2667,19 +2655,18 @@ static void test_RegExp_Replace(void) hr = IRegExp2_put_Global(regexp, test[i].global ? VARIANT_TRUE : VARIANT_FALSE); ok(hr == S_OK, "got %#lx\n", hr); - str = a2bstr(test[i].pattern); + str = SysAllocString(test[i].pattern); hr = IRegExp2_put_Pattern(regexp, str); ok(hr == S_OK, "got %#lx\n", hr); SysFreeString(str); - str = a2bstr(test[i].source); + str = SysAllocString(test[i].source); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = a2bstr(test[i].replace); + V_BSTR(&var) = SysAllocString(test[i].replace); hr = IRegExp2_Replace(regexp, str, var, &ret); ok(hr == S_OK, "got %#lx\n", hr); - result = a2bstr(test[i].result); - ok(!wcscmp(ret, result), "got %s, expected %s\n", wine_dbgstr_w(ret), wine_dbgstr_w(result)); - SysFreeString(result); + ok(!wcscmp(ret, test[i].result), "got %s, expected %s\n", wine_dbgstr_w(ret), + wine_dbgstr_w(test[i].result)); SysFreeString(ret); SysFreeString(V_BSTR(&var)); SysFreeString(str);

1 0

Michael Stefaniuc : shell32/tests: Get rid of the a2bstr() helper.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: dbe9f348d48a6ffbb3448931887925d347b6b3a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbe9f348d48a6ffbb3448931887925… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 30 23:27:06 2023 +0200 shell32/tests: Get rid of the a2bstr() helper. --- dlls/shell32/tests/shelldispatch.c | 48 ++++++++++++++------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 7dfbd476372..1038603551e 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -47,22 +47,10 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); /* Updated Windows 7 has a new IShellDispatch6 in its typelib */ DEFINE_GUID(IID_IWin7ShellDispatch6, 0x34936ba1, 0x67ad, 0x4c41, 0x99,0xb8, 0x8c,0x12,0xdf,0xf1,0xe9,0x74); -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - -static void variant_set_string(VARIANT *v, const char *s) +static void variant_set_string(VARIANT *v, const WCHAR *s) { V_VT(v) = VT_BSTR; - V_BSTR(v) = a2bstr(s); + V_BSTR(v) = SysAllocString(s); } static void init_function_pointers(void) @@ -356,7 +344,7 @@ static void test_items(void) { static const struct { - char name[32]; + WCHAR name[32]; enum { DIRECTORY, @@ -366,8 +354,8 @@ static void test_items(void) } file_defs[] = { - { "00-Myfolder", DIRECTORY }, - { "01-empty.bin", EMPTY_FILE }, + { L"00-Myfolder", DIRECTORY }, + { L"01-empty.bin", EMPTY_FILE }, }; WCHAR path[MAX_PATH], cur_dir[MAX_PATH], orig_dir[MAX_PATH]; HRESULT r; @@ -384,7 +372,7 @@ static void test_items(void) IUnknown *unk; HANDLE file; BSTR bstr; - char cstr[64]; + WCHAR cstr[64]; BOOL ret; int i; @@ -475,16 +463,16 @@ static void test_items(void) switch (file_defs[i].type) { case DIRECTORY: - r = CreateDirectoryA(file_defs[i].name, NULL); + r = CreateDirectoryW(file_defs[i].name, NULL); ok(r, "CreateDirectory failed: %08lx\n", GetLastError()); - PathCombineA(cstr, file_defs[i].name, "foo.txt"); - file = CreateFileA(cstr, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + PathCombineW(cstr, file_defs[i].name, L"foo.txt"); + file = CreateFileW(cstr, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08lx\n", GetLastError()); CloseHandle(file); break; case EMPTY_FILE: - file = CreateFileA(file_defs[i].name, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + file = CreateFileW(file_defs[i].name, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08lx\n", GetLastError()); CloseHandle(file); break; @@ -644,7 +632,7 @@ static void test_items(void) "file_defs[%d]: expected %s, got %s\n", i, wine_dbgstr_w(path), wine_dbgstr_w(bstr)); SysFreeString(bstr); - bstr = a2bstr(file_defs[i].name); + bstr = SysAllocString(file_defs[i].name); r = FolderItem_get_Name(item, &name); ok(r == S_OK, "Failed to get item name, hr %#lx.\n", r); /* Returned display name does not have to strictly match file name, e.g. extension could be omitted. */ @@ -678,7 +666,7 @@ static void test_items(void) if (file_defs[i].type == DIRECTORY) { /* test that getting an item object for a file in a subdirectory succeeds */ - PathCombineA(cstr, file_defs[i].name, "foo.txt"); + PathCombineW(cstr, file_defs[i].name, L"foo.txt"); variant_set_string(&str_index2, cstr); item2 = NULL; r = FolderItems_Item(items, str_index2, &item2); @@ -688,13 +676,13 @@ static void test_items(void) VariantClear(&str_index2); /* delete the file in the subdirectory */ - ret = DeleteFileA(cstr); + ret = DeleteFileW(cstr); ok(ret, "file_defs[%d]: DeleteFile failed: %08lx\n", i, GetLastError()); /* test that getting an item object via a relative path fails */ - strcpy(cstr, file_defs[i].name); - strcat(cstr, "\\..\\"); - strcat(cstr, file_defs[i].name); + wcscpy(cstr, file_defs[i].name); + wcscat(cstr, L"\\..\\"); + wcscat(cstr, file_defs[i].name); variant_set_string(&str_index2, cstr); item2 = (FolderItem*)0xdeadbeef; r = FolderItems_Item(items, str_index2, &item2); @@ -703,12 +691,12 @@ static void test_items(void) VariantClear(&str_index2); /* remove the directory */ - ret = RemoveDirectoryA(file_defs[i].name); + ret = RemoveDirectoryW(file_defs[i].name); ok(ret, "file_defs[%d]: RemoveDirectory failed: %08lx\n", i, GetLastError()); } else { - ret = DeleteFileA(file_defs[i].name); + ret = DeleteFileW(file_defs[i].name); ok(ret, "file_defs[%d]: DeleteFile failed: %08lx\n", i, GetLastError()); }

1 0

Zhao Yi : comctl32/listview: Reset bNoItemMetrics to make sure that listview items can be arranged correctly.
by Alexandre Julliard 01 Aug '23

01 Aug '23

Module: wine Branch: master Commit: 314c94e100907815c6932cfbedcddf231932630c URL: https://gitlab.winehq.org/wine/wine/-/commit/314c94e100907815c6932cfbedcddf… Author: Zhao Yi <zhaoyi(a)uniontech.com> Date: Wed Jul 26 21:00:29 2023 +0800 comctl32/listview: Reset bNoItemMetrics to make sure that listview items can be arranged correctly. Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 750e447dbef..7972be9669d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5590,6 +5590,7 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) LISTVIEW_UpdateScroll(infoPtr); } LISTVIEW_InvalidateList(infoPtr); + infoPtr->bNoItemMetrics = TRUE; return TRUE; }

1 0