wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : winspool: Stop setting the "Devices" key.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 0ab71192b8c4137b1db55cbb6d9ea74381ac5988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ab71192b8c4137b1db55cbb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:48 2020 -0500 winspool: Stop setting the "Devices" key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d46fefc461..07398966e7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -561,7 +561,6 @@ static void set_default_printer(const char *devname, const char *name) HKEY hkey; sprintf(buf, "%s,WINEPS.DRV,LPR:%s", devname, name); - WriteProfileStringA("windows","device", buf); if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey)) { RegSetValueExA(hkey, "Device", 0, REG_SZ, (BYTE *)buf, strlen(buf) + 1); @@ -3445,7 +3444,6 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) if (GetDefaultPrinterW( def, &size ) && !strcmpW( def, lpNameW )) { - WriteProfileStringW( windowsW, deviceW, NULL ); if (!RegCreateKeyW( HKEY_CURRENT_USER, user_default_reg_key, &hkey )) { RegDeleteValueW( hkey, deviceW ); @@ -6078,20 +6076,12 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) size = ((MAX_PATH * 2) + 2) * sizeof(WCHAR); /* driver,port and a 0 */ lres = RegQueryValueExW(hreg, pszPrinter, NULL, NULL, (LPBYTE) (&buffer[namelen]), &size); if (!lres) { - TRACE("set device to %s\n", debugstr_w(buffer)); + HKEY hdev; - if (!WriteProfileStringW(windowsW, deviceW, buffer)) { - TRACE("failed to set the device entry: %d\n", GetLastError()); - lres = ERROR_INVALID_PRINTER_NAME; - } - - /* remove the next section, when INIFileMapping is implemented */ + if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hdev)) { - HKEY hdev; - if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hdev)) { - RegSetValueExW(hdev, deviceW, 0, REG_SZ, (LPBYTE)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR)); - RegCloseKey(hdev); - } + RegSetValueExW(hdev, deviceW, 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR)); + RegCloseKey(hdev); } } else

1 0

Zebediah Figura : winspool: Remove the "force" parameter to WINSPOOL_SetDefaultPrinter().
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: e8d254116eb52908f6cd99a0394aab12e29462c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d254116eb52908f6cd99a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:47 2020 -0500 winspool: Remove the "force" parameter to WINSPOOL_SetDefaultPrinter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1a8d572f43..d46fefc461 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -555,30 +555,19 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } -static void -WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { - char qbuf[200]; +static void set_default_printer(const char *devname, const char *name) +{ + char *buf = HeapAlloc(GetProcessHeap(), 0, strlen(name)+strlen(devname)+strlen(",WINEPS.DRV,LPR:")+1); + HKEY hkey; - /* If forcing, or no profile string entry for device yet, set the entry - * - * The always change entry if not WINEPS yet is discussable. - */ - if (force || - !GetProfileStringA("windows","device","*",qbuf,sizeof(qbuf)) || - !strcmp(qbuf,"*") || - !strstr(qbuf,"WINEPS.DRV") - ) { - char *buf = HeapAlloc(GetProcessHeap(),0,strlen(name)+strlen(devname)+strlen(",WINEPS.DRV,LPR:")+1); - HKEY hkey; - - sprintf(buf,"%s,WINEPS.DRV,LPR:%s",devname,name); - WriteProfileStringA("windows","device",buf); - if(RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey) == ERROR_SUCCESS) { - RegSetValueExA(hkey, "Device", 0, REG_SZ, (LPBYTE)buf, strlen(buf) + 1); - RegCloseKey(hkey); - } - HeapFree(GetProcessHeap(),0,buf); + sprintf(buf, "%s,WINEPS.DRV,LPR:%s", devname, name); + WriteProfileStringA("windows","device", buf); + if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey)) + { + RegSetValueExA(hkey, "Device", 0, REG_SZ, (BYTE *)buf, strlen(buf) + 1); + RegCloseKey(hkey); } + HeapFree(GetProcessHeap(), 0, buf); } static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) @@ -1273,7 +1262,7 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) } if (isfirst || set_default) - WINSPOOL_SetDefaultPrinter(devname,name,TRUE); + set_default_printer(devname, name); end: if (hkeyPrinters) RegCloseKey( hkeyPrinters );

1 0

Puetz Kevin A : jscript: Fix `this` within IDispatchEx::InvokeEx.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: b60c4c6ef60c768d8eb823eb830c7bd35028ea6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b60c4c6ef60c768d8eb823eb… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Thu Jul 23 22:25:38 2020 +0200 jscript: Fix `this` within IDispatchEx::InvokeEx. Latent bug revealed by 614ea7e6243ead003bcfe4624895154972f3445f; Now that cross-context calls go through disp_call* instead of jsdisp_call*, and thus through InvokeEx, the `this` pointer is lost when calling methods inherited from a prototype. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 +++-- dlls/jscript/tests/run.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2ba706252b..f49d5da971 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -419,8 +419,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t return hres; } case PROP_PROTREF: - return invoke_prop_func(This->prototype, jsthis, This->prototype->props+prop->u.ref, - flags, argc, argv, r, caller); + return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, + This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); case PROP_JSVAL: { if(!is_object_instance(prop->u.val)) { FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); @@ -429,7 +429,9 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); - return disp_call_value(This->ctx, get_object(prop->u.val), jsthis, flags, argc, argv, r); + return disp_call_value(This->ctx, get_object(prop->u.val), + jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, + flags, argc, argv, r); } case PROP_ACCESSOR: FIXME("accessor\n"); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 675bd819ee..7cd0755497 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2784,7 +2784,7 @@ static void test_invokeex(void) DISPPARAMS dp = {NULL}; IActiveScript *script; IDispatchEx *dispex; - VARIANT v; + VARIANT v, arg; BSTR str; HRESULT hres; @@ -2834,6 +2834,93 @@ static void test_invokeex(void) IDispatchEx_Release(dispex); IActiveScript_Release(script); + + /* test InvokeEx following prototype chain of builtin object (PROP_PROTREF) */ + hres = parse_script_expr(L"o = new Array(); o.push(\"foo\"); o", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = SysAllocString(L"push"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + dp.rgvarg = &arg; + dp.cArgs = 1; + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocString(L"bar"); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&arg)); + + str = SysAllocString(L"join"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + V_BSTR(&arg) = SysAllocString(L";"); + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&arg)); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"foo;bar"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + VariantClear(&v); + + dp.rgvarg = NULL; + dp.cArgs = 0; + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); + + /* test InvokeEx following prototype chain of JScript objects (PROP_JSVAL) */ + hres = parse_script_expr(L"function c() { this.func = function() { return this.prop1 * this.prop2 };" + L"this.prop1 = 6; this.prop2 = 9; }; var o = new c(); o.prop2 = 7; o", + &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = SysAllocString(L"prop1"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + str = SysAllocString(L"prop2"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 7, "V_I4(v) = %d\n", V_I4(&v)); + + str = SysAllocString(L"func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %s\n", wine_dbgstr_variant(&v)); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); } static void test_eval(void)

1 0

Puetz Kevin A : jscript: Fix some memory problems in disp_call_value.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 616f5a5d4b05ab7278658549d15f5ff50b2c824f URL: https://source.winehq.org/git/wine.git/?a=commit;h=616f5a5d4b05ab7278658549… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Thu Jul 23 04:58:37 2020 +0000 jscript: Fix some memory problems in disp_call_value. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d9097c47dd..2ba706252b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2095,12 +2095,14 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W dp.rgdispidNamedArgs = NULL; } - if(argc > ARRAY_SIZE(buf) && !(args = heap_alloc(argc * sizeof(VARIANT)))) + if(dp.cArgs > ARRAY_SIZE(buf) && !(args = heap_alloc(dp.cArgs * sizeof(VARIANT)))) return E_OUTOFMEMORY; dp.rgvarg = args; - V_VT(dp.rgvarg) = VT_DISPATCH; - V_DISPATCH(dp.rgvarg) = jsthis; + if(jsthis) { + V_VT(dp.rgvarg) = VT_DISPATCH; + V_DISPATCH(dp.rgvarg) = jsthis; + } for(i=0; SUCCEEDED(hres) && i < argc; i++) hres = jsval_to_variant(argv[i], dp.rgvarg+dp.cArgs-i-1); @@ -2110,7 +2112,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W hres = disp_invoke(ctx, disp, DISPID_VALUE, flags, &dp, r ? &retv : NULL); } - for(i = 0; i < argc&&0; i++) + for(i = 0; i < argc; i++) VariantClear(dp.rgvarg + dp.cArgs - i - 1); if(args != buf) heap_free(args);

1 0

Henri Verbeet : vkd3d-shader: Add compiler messages for invalid DXBC chunk offsets and sizes.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: vkd3d Branch: master Commit: 29287d3368f70b57d05c4ae2e2c937ebbb539236 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=29287d3368f70b57d05c4ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 13:59:29 2020 +0430 vkd3d-shader: Add compiler messages for invalid DXBC chunk offsets and sizes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 5 +++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 8e5c49c..f738abe 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2015,6 +2015,8 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { WARN("Invalid chunk offset %#x (data size %zu).\n", chunk_offset, data_size); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET, + "DXBC chunk %u has invalid offset %#x (data size %#zx).", i, chunk_offset, data_size); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -2027,6 +2029,9 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me { WARN("Invalid chunk size %#x (data size %zu, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE, + "DXBC chunk %u has invalid size %#x (data size %#zx, chunk offset %#x).", + i, chunk_offset, data_size, chunk_offset); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f9bd6ab..c6796bb 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -65,6 +65,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3, VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION = 4, + VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET = 5, + VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE = 6, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Henri Verbeet : vkd3d-shader: Add a compiler message for unsupported DXBC versions.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: vkd3d Branch: master Commit: 29e9cf032c698fe5e2d2bc7de19b61115d68887e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=29e9cf032c698fe5e2d2bc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 13:59:28 2020 +0430 vkd3d-shader: Add a compiler message for unsupported DXBC versions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5a070ad..8e5c49c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1992,6 +1992,8 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (version != 0x00000001) { WARN("Got unexpected DXBC version %#x.\n", version); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION, + "DXBC version %#x is not supported.", version); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 40f986b..f9bd6ab 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -64,6 +64,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3, + VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION = 4, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Henri Verbeet : vkd3d-shader: Validate DXBC checksums.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: vkd3d Branch: master Commit: 9fcf00e2bfd2a71dd7fe43164ec8d48df3b8801e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9fcf00e2bfd2a71dd7fe431… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 13:59:27 2020 +0430 vkd3d-shader: Validate DXBC checksums. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 18 ++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b5c5c77..5a070ad 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1944,6 +1944,7 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_message_context *message_context, int (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) { + uint32_t checksum[4], calculated_checksum[4]; const char *ptr = data; int ret = VKD3D_OK; DWORD chunk_count; @@ -1970,8 +1971,21 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me return VKD3D_ERROR_INVALID_ARGUMENT; } - WARN("Ignoring DXBC checksum.\n"); - skip_dword_unknown(&ptr, 4); + read_dword(&ptr, &checksum[0]); + read_dword(&ptr, &checksum[1]); + read_dword(&ptr, &checksum[2]); + read_dword(&ptr, &checksum[3]); + vkd3d_compute_dxbc_checksum(data, data_size, calculated_checksum); + if (memcmp(checksum, calculated_checksum, sizeof(checksum))) + { + WARN("Checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x} does not match " + "calculated checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + checksum[0], checksum[1], checksum[2], checksum[3], + calculated_checksum[0], calculated_checksum[1], + calculated_checksum[2], calculated_checksum[3]); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, "Invalid DXBC checksum."); + return VKD3D_ERROR_INVALID_ARGUMENT; + } read_dword(&ptr, &version); TRACE("version: %#x.\n", version); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5cf8e8e..40f986b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -63,6 +63,7 @@ enum vkd3d_shader_error { VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, + VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Henri Verbeet : vkd3d-shader: Add a compiler message for invalid DXBC magic.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: vkd3d Branch: master Commit: 1f6ce3ceba5b5cf5129e9829564050008c15e5d8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f6ce3ceba5b5cf5129e982… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 13:59:26 2020 +0430 vkd3d-shader: Add a compiler message for invalid DXBC magic. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2901998..b5c5c77 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1966,6 +1966,7 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me if (tag != TAG_DXBC) { WARN("Wrong tag.\n"); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC, "Invalid DXBC magic."); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b820012..5cf8e8e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -62,6 +62,7 @@ enum vkd3d_shader_error { VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, + VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Henri Verbeet : vkd3d-shader: Output a compiler error message if the DXBC size is invalid.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: vkd3d Branch: master Commit: 3b2fb3aba159bc4a20ecfbdfd3c4e70b02009549 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b2fb3aba159bc4a20ecfbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 13:59:25 2020 +0430 vkd3d-shader: Output a compiler error message if the DXBC size is invalid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 24 ++++- libs/vkd3d-shader/dxbc.c | 29 ++++-- libs/vkd3d-shader/trace.c | 85 ++------------- libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 171 +++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 32 +++++- libs/vkd3d/state.c | 8 +- programs/vkd3d-compiler/main.c | 8 +- tests/vkd3d_shader_api.c | 10 +- 9 files changed, 260 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3b2fb3aba159bc4a20e…

1 0

Ziqing Hui : windowscodecs/tests: Rename test_dds_bgr565 to test_dds_rgb565.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 07030059486e0121051b452c94d37f12931cabf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07030059486e0121051b452c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 21 13:49:53 2020 +0800 windowscodecs/tests: Rename test_dds_bgr565 to test_dds_rgb565. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index aebe31c1d5..31b65f73ca 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -24,8 +24,8 @@ #include "wincodec.h" #include "wine/test.h" -/* 4x4 uncompressed(16bpp BGR565) DDS image */ -static BYTE test_dds_bgr565[] = { +/* 4x4 uncompressed(16bpp RGB565) DDS image */ +static BYTE test_dds_rgb565[] = { 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -284,7 +284,7 @@ static struct test_data { WICDdsParameters expected_parameters; BOOL wine_init; } test_data[] = { - { test_dds_bgr565, sizeof(test_dds_bgr565), WINCODEC_ERR_BADHEADER, 1, 2, &GUID_WICPixelFormat32bppBGRA, + { test_dds_rgb565, sizeof(test_dds_rgb565), WINCODEC_ERR_BADHEADER, 1, 2, &GUID_WICPixelFormat32bppBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_B5G6R5_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_24bpp, sizeof(test_dds_24bpp), WINCODEC_ERR_BADHEADER, 1, 3, &GUID_WICPixelFormat32bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_UNKNOWN, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE },

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
83
Older →

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 July 2020