wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Zebediah Figura : user32/tests: Add a register_class() helper.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 77efd7ac5a87ff20719c0d011d5b800111ecea79 URL: https://gitlab.winehq.org/wine/wine/-/commit/77efd7ac5a87ff20719c0d011d5b80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:07:04 2023 -0600 user32/tests: Add a register_class() helper. --- dlls/user32/tests/msg.c | 80 +++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 39 deletions(-)

1 0

Mohamad Al-Jaf : d3d12core: Add stub DLL.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 9acf1bd6a85a02da201a018e1b3e586ac74ec8d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9acf1bd6a85a02da201a018e1b3e58… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jan 26 18:43:05 2023 -0500 d3d12core: Add stub DLL. Forspoken checks for the existence of this DLL. --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/d3d12core/Makefile.in | 1 + dlls/d3d12core/d3d12core.spec | 2 ++ 5 files changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8c30f8c6d1d..50f75e04e6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -72,6 +72,7 @@ P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10core/ F: dlls/d3d11/ F: dlls/d3d12/ +F: dlls/d3d12core/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/ diff --git a/configure b/configure index 25bffe3c8eb..caa0f30a71c 100755 --- a/configure +++ b/configure @@ -1015,6 +1015,7 @@ enable_d3d10_1 enable_d3d10core enable_d3d11 enable_d3d12 +enable_d3d12core enable_d3d8 enable_d3d8thk enable_d3d9 @@ -21062,6 +21063,7 @@ wine_fn_config_makefile dlls/d3d11 enable_d3d11 wine_fn_config_makefile dlls/d3d11/tests enable_tests wine_fn_config_makefile dlls/d3d12 enable_d3d12 wine_fn_config_makefile dlls/d3d12/tests enable_tests +wine_fn_config_makefile dlls/d3d12core enable_d3d12core wine_fn_config_makefile dlls/d3d8 enable_d3d8 wine_fn_config_makefile dlls/d3d8/tests enable_tests wine_fn_config_makefile dlls/d3d8thk enable_d3d8thk diff --git a/configure.ac b/configure.ac index 8a6d21702cc..09cbf7533c3 100644 --- a/configure.ac +++ b/configure.ac @@ -2432,6 +2432,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d11) WINE_CONFIG_MAKEFILE(dlls/d3d11/tests) WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d12core) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8thk) diff --git a/dlls/d3d12core/Makefile.in b/dlls/d3d12core/Makefile.in new file mode 100644 index 00000000000..8778b66138b --- /dev/null +++ b/dlls/d3d12core/Makefile.in @@ -0,0 +1 @@ +MODULE = d3d12core.dll diff --git a/dlls/d3d12core/d3d12core.spec b/dlls/d3d12core/d3d12core.spec new file mode 100644 index 00000000000..c9c73bd4ee4 --- /dev/null +++ b/dlls/d3d12core/d3d12core.spec @@ -0,0 +1,2 @@ +@ stub D3D12GetInterface +@ stub D3D12SDKVersion

1 0

Mohamad Al-Jaf : include: Add DirectX 12 Agility SDK definitions.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 83625459c8227b0bd7b86c18946a35d3a806c80d URL: https://gitlab.winehq.org/wine/wine/-/commit/83625459c8227b0bd7b86c18946a35… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Jan 31 02:22:12 2023 -0500 include: Add DirectX 12 Agility SDK definitions. --- include/d3d12.idl | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 082a436c9ec..816ff283ee8 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -66,6 +66,7 @@ const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; +const UINT D3D12_SDK_VERSION = 4; const UINT D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; @@ -2589,3 +2590,55 @@ typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **de [local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, const IID *iids, void *configurations, UINT *configurations_sizes); + +cpp_quote("DEFINE_GUID(CLSID_D3D12Debug, 0xf2352aeb, 0xdd84, 0x49fe, 0xb9, 0x7b, 0xa9, 0xdc, 0xfd, 0xcc, 0x1b, 0x4f);") +cpp_quote("DEFINE_GUID(CLSID_D3D12Tools, 0xe38216b1, 0x3c8c, 0x4833, 0xaa, 0x09, 0x0a, 0x06, 0xb6, 0x5d, 0x96, 0xc8);") +cpp_quote("DEFINE_GUID(CLSID_D3D12DeviceRemovedExtendedData, 0x4a75bbc4, 0x9ff4, 0x4ad8, 0x9f, 0x18, 0xab, 0xae, 0x84, 0xdc, 0x5f, 0xf2);") +cpp_quote("DEFINE_GUID(CLSID_D3D12SDKConfiguration, 0x7cda6aca, 0xa03e, 0x49c8, 0x94, 0x58, 0x03, 0x34, 0xd2, 0x0e, 0x07, 0xce);") + +typedef enum D3D12_DRED_ENABLEMENT +{ + D3D12_DRED_ENABLEMENT_SYSTEM_CONTROLLED = 0, + D3D12_DRED_ENABLEMENT_FORCED_OFF = 1, + D3D12_DRED_ENABLEMENT_FORCED_ON = 2, +} D3D12_DRED_ENABLEMENT; + +typedef HRESULT (__stdcall *PFN_D3D12_GET_INTERFACE)(REFCLSID clsid, REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12GetInterface(REFCLSID clsid, REFIID iid, void **debug); + +[ + uuid(7071e1f0-e84b-4b33-974f-12fa49de65c5), + object, + local, + pointer_default(unique) +] +interface ID3D12Tools : IUnknown +{ + void EnableShaderInstrumentation(BOOL enable); + BOOL ShaderInstrumentationEnabled(); +} + +[ + uuid(82bc481c-6b9b-4030-aedb-7ee3d1df1e63), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceRemovedExtendedDataSettings : IUnknown +{ + void SetAutoBreadcrumbsEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetPageFaultEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetWatsonDumpEnablement(D3D12_DRED_ENABLEMENT enablement); +}; + +[ + uuid(e9eb5314-33aa-42b2-a718-d77f58b1f1c7), + object, + local, + pointer_default(unique) +] +interface ID3D12SDKConfiguration : IUnknown +{ + HRESULT SetSDKVersion(UINT version, const char *path); +}

1 0

Alex Henrie : http: Avoid calling RtlInitUnicodeString on a constant.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 51bc735f7013b50e9b6bb55d9c2e131b657b7e11 URL: https://gitlab.winehq.org/wine/wine/-/commit/51bc735f7013b50e9b6bb55d9c2e13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 8 21:23:01 2023 -0700 http: Avoid calling RtlInitUnicodeString on a constant. --- dlls/http.sys/http.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 680ef30730c..c2234aa14ad 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1199,19 +1199,18 @@ static void WINAPI unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING device_http = RTL_CONSTANT_STRING(L"\\Device\\Http"); + UNICODE_STRING device_http_req_queue = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); WSADATA wsadata; NTSTATUS ret; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlInitUnicodeString(&string, L"\\Device\\Http"); - attr.ObjectName = &string; + attr.ObjectName = &device_http; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); - RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); - if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) + if ((ret = IoCreateDevice(driver, 0, &device_http_req_queue, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj);

1 0

Alexandre Julliard : wow64: Call the thread init entry point in the CPU backend.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 06dc0473460f3667fb24b73cae38b139e46a23f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/06dc0473460f3667fb24b73cae38b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 13:56:43 2023 +0100 wow64: Call the thread init entry point in the CPU backend. --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 7555fdd4ee4..e9b8df76e7c 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -96,6 +96,7 @@ static void * (WINAPI *pBTCpuGetBopCode)(void); static NTSTATUS (WINAPI *pBTCpuGetContext)(HANDLE,HANDLE,void *,void *); static void (WINAPI *pBTCpuProcessInit)(void); static NTSTATUS (WINAPI *pBTCpuSetContext)(HANDLE,HANDLE,void *,void *); +static void (WINAPI *pBTCpuThreadInit)(void); static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); @@ -771,6 +772,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuGetContext ); GET_PTR( BTCpuProcessInit ); + GET_PTR( BTCpuThreadInit ); GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); @@ -802,6 +804,7 @@ static void thread_init(void) void *cpu_area_ctx; RtlWow64GetCurrentCpuArea( NULL, &cpu_area_ctx, NULL ); + if (pBTCpuThreadInit) pBTCpuThreadInit(); /* update initial context to jump to 32-bit LdrInitializeThunk (cf. 32-bit call_init_thunk) */ switch (current_machine)

1 0

Alexandre Julliard : wow64: Call the CPU backend to get/set the current thread context.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: f555ee3b0380acbf5a098ef224e54e7e1d664e7b URL: https://gitlab.winehq.org/wine/wine/-/commit/f555ee3b0380acbf5a098ef224e54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 12:55:36 2023 +0100 wow64: Call the CPU backend to get/set the current thread context. --- dlls/wow64/syscall.c | 100 +++++++++++++++++++++++---------------------------- dlls/wow64cpu/cpu.c | 4 +-- 2 files changed, 47 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : wow64: Preserve the CPURESERVED flags across user callbacks.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 51c3cfddfe03fa35ab21aeac6230c28d877b20f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/51c3cfddfe03fa35ab21aeac6230c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 13:55:54 2023 +0100 wow64: Preserve the CPURESERVED flags across user callbacks. --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 41860aeb281..d2242134819 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -1044,9 +1044,11 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { + WOW64_CPURESERVED *cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); ULONG teb_frame = teb32->Tib.ExceptionList; struct user_callback_frame frame; + USHORT flags = cpu->Flags; frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; frame.temp_list = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; @@ -1115,6 +1117,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, teb32->Tib.ExceptionList = teb_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; + cpu->Flags = flags; return frame.status; }

1 0

Alexandre Julliard : wow64: Move some exception and context functions to syscall.c.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 58ced9adff675ead7ba290388c30dca5ec60f64e URL: https://gitlab.winehq.org/wine/wine/-/commit/58ced9adff675ead7ba290388c30dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 12:54:03 2023 +0100 wow64: Move some exception and context functions to syscall.c. --- dlls/wow64/process.c | 263 -------------------------------------------------- dlls/wow64/syscall.c | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 267 insertions(+), 263 deletions(-)

1 0

Jason Millard : vbscript: Fix memory leak in owned safearray iterator.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: a8c319cad691a53cfd333ab72dbbeac4558f7c75 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8c319cad691a53cfd333ab72dbbea… Author: Jason Millard <jsm174(a)gmail.com> Date: Thu Feb 9 13:11:56 2023 -0500 vbscript: Fix memory leak in owned safearray iterator. --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/utils.c | 9 +++++++-- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4881efa9454..eb1dcab5f01 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1487,7 +1487,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) case VT_VARIANT|VT_ARRAY|VT_BYREF: { IEnumVARIANT *iter; - hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), &iter); + hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), v.owned && !V_ISBYREF(v.v), &iter); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c index 03b1abde481..4bfc2c65a0a 100644 --- a/dlls/vbscript/utils.c +++ b/dlls/vbscript/utils.c @@ -28,6 +28,7 @@ typedef struct { LONG ref; SAFEARRAY *sa; + BOOL owned; ULONG i, size; } safearray_iter; @@ -75,8 +76,11 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_Release(IEnumVARIANT *iface) TRACE("(%p) ref=%ld\n", iface, ref); if(!ref) { - if(This->sa) + if(This->sa) { SafeArrayUnlock(This->sa); + if(This->owned) + SafeArrayDestroy(This->sa); + } free(This); } @@ -160,7 +164,7 @@ static ULONG get_safearray_size(SAFEARRAY *sa) return ret; } -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) { safearray_iter *iter; HRESULT hres; @@ -185,6 +189,7 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) iter->IEnumVARIANT_iface.lpVtbl = &safearray_iter_EnumVARIANTVtbl; iter->ref = 1; iter->sa = sa; + iter->owned = owned; iter->i = 0; iter->size = get_safearray_size(sa); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5b0a2222767..13bcf704bf0 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -415,7 +415,7 @@ BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; void map_vbs_exception(EXCEPINFO *) DECLSPEC_HIDDEN; -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) DECLSPEC_HIDDEN; #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code)

1 0

Jason Millard : vbscript: Fix compile when colon follows Else on new line.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: afb2125cdf281e0f200d2c11b372f8f71fddff65 URL: https://gitlab.winehq.org/wine/wine/-/commit/afb2125cdf281e0f200d2c11b372f8… Author: Jason Millard <jsm174(a)gmail.com> Date: Thu Feb 9 12:14:37 2023 -0500 vbscript: Fix compile when colon follows Else on new line. --- dlls/vbscript/parser.y | 3 +-- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 382504a3d5a..03415dc2b1c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -319,8 +319,7 @@ ElseIf Else_opt : /* empty */ { $$ = NULL; } - | tELSE tNL StatementsNl_opt { $$ = $3; } - | tELSE StatementsNl_opt { $$ = $2; } + | tELSE StSep_opt StatementsNl_opt { $$ = $3; } CaseClausules : /* empty */ { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3a67cd09dff..1707cc9a92b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -298,6 +298,15 @@ Else x = true End If Call ok(x, "else not called?") +' Else with colon before statement following newline +x = false +If false Then + Call ok(false, "inside if false") +Else +: x = true +End If +Call ok(x, "else not called?") + x = false If false Then Call ok(false, "inside if false")

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
60
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 February 2023