- Wine-Devel - list.winehq.org

[PATCH] user32: Call driver's DestroyWindow in destroy_thread_windows().
by Paul Gofman Oct. 13, 2021

Oct. 13, 2021

USER_Driver->pThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when, for instance, the windows is still used for Vulkan rendering (even if only to tear down the device and swapchain). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/user32/user_main.c | 4 +++- dlls/user32/win.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 30e5d154d3d..f4b0f110dc2 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -358,9 +358,11 @@ static void thread_detach(void) exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); - USER_Driver->pThreadDetach(); destroy_thread_windows(); + + USER_Driver->pThreadDetach(); + CloseHandle( thread_info->server_queue ); HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); HeapFree( GetProcessHeap(), 0, thread_info->key_state ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5e89f4c2c97..bafd0a3a7f0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1218,7 +1218,6 @@ void destroy_thread_windows(void) while ((wndPtr = next_thread_window( &hwnd ))) { /* destroy the client-side storage */ - list = WIN_ListChildren( hwnd ); menu = ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) ? (HMENU)wndPtr->wIDmenu : 0; sys_menu = wndPtr->hSysMenu; @@ -1235,6 +1234,8 @@ void destroy_thread_windows(void) window_surface_release( surface ); } + USER_Driver->pDestroyWindow( hwnd ); + /* free child windows */ if (!list) continue; -- 2.31.1

2 2

[PATCH] winex11.drv: Add video adapter description to the registry.
by Dmitry Timoshkov Oct. 13, 2021

Oct. 13, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/display.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c8c216c8302..2da9b09c653 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -463,6 +463,12 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + 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 memory_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -551,6 +557,16 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_SZ, (const BYTE *)ramdacW, (strlenW(ramdacW) + 1) * sizeof(WCHAR))) + size = 0x7fffffff; /* FIXME */ + if (RegSetValueExW(hkey, memory_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; RegCloseKey(hkey); -- 2.31.1

2 4

[v2 PATCH 2/7] d3d10/tests: Add some tests for annotations.
by Matteo Bruni Oct. 13, 2021

Oct. 13, 2021

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Drop a few duplicated tests. dlls/d3d10/tests/effect.c | 219 +++++++++++++++++++++++++++++++++++++- 1 file changed, 218 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 6ad3f7421f4..d4b3ff244d4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6097,18 +6097,149 @@ static void test_effect_resource_variable(void) ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +cbuffer cb <string s = "cb_a"; > +{ + float f1 : COLOR0 <string s = "f1_a"; >; +}; + +BlendState blendstate <string s = "bs_a"; >; +Texture2D tex <string s = "tex_a"; >; +PixelShader ps <string s = "ps_a"; >; +VertexShader vs <string s = "vs_a"; >; +GeometryShader gs <string s = "gs_a"; >; +DepthStencilState ds <string s = "ds_a"; >; +RasterizerState rs <string s = "rs_a"; >; +SamplerState s <string s = "s_a"; >; +RenderTargetView rtv <string s = "rtv_a"; >; +DepthStencilView dsv <string s = "dsv_a"; >; + +technique10 tech <string s = "tech_a"; > +{ + pass P0 <string s = "P0_a"; > + { + } +}; +#endif +static DWORD fx_test_annotations[] = +{ + 0x43425844, 0x2b3e08d4, 0xe3eda7bb, 0x36982de8, 0x0dcab1aa, 0x00000001, 0x000004c6, 0x00000001, + 0x00000024, 0x30315846, 0x0000049a, 0xfeff1001, 0x00000001, 0x00000001, 0x0000000a, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000276, 0x00000000, 0x00000001, 0x00000001, 0x00000001, + 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000003, 0x00000000, 0x00000000, 0x53006263, + 0x6e697274, 0x00070067, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, + 0x00730000, 0x615f6263, 0x6f6c6600, 0x31007461, 0x01000000, 0x00000000, 0x04000000, 0x10000000, + 0x04000000, 0x09000000, 0x66000009, 0x4f430031, 0x30524f4c, 0x5f316600, 0x6c420061, 0x53646e65, + 0x65746174, 0x00006200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000200, + 0x656c6200, 0x7473646e, 0x00657461, 0x615f7362, 0x78655400, 0x65727574, 0x99004432, 0x02000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0c000000, 0x74000000, 0x74007865, 0x615f7865, + 0x78695000, 0x68536c65, 0x72656461, 0x0000c900, 0x00000200, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000500, 0x00737000, 0x615f7370, 0x72655600, 0x53786574, 0x65646168, 0x00f90072, + 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00060000, 0x73760000, 0x5f737600, + 0x65470061, 0x74656d6f, 0x68537972, 0x72656461, 0x00012a00, 0x00000200, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000700, 0x00736700, 0x615f7367, 0x70654400, 0x74536874, 0x69636e65, + 0x6174536c, 0x5d006574, 0x02000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, + 0x64000000, 0x73640073, 0x5200615f, 0x65747361, 0x657a6972, 0x61745372, 0x93006574, 0x02000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x04000000, 0x72000000, 0x73720073, 0x5300615f, + 0x6c706d61, 0x74537265, 0x00657461, 0x000001c7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000015, 0x00615f73, 0x646e6552, 0x61547265, 0x74656772, 0x77656956, 0x0001f400, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001300, 0x76747200, 0x76747200, + 0x4400615f, 0x68747065, 0x6e657453, 0x566c6963, 0x00776569, 0x0000022b, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00767364, 0x5f767364, 0x65740061, 0x74006863, + 0x5f686365, 0x30500061, 0x5f305000, 0x00040061, 0x00100000, 0x00000000, 0x00010000, 0xffff0000, + 0x0001ffff, 0x002a0000, 0x000e0000, 0x002c0000, 0x00530000, 0x00370000, 0x00560000, 0x00000000, + 0x00000000, 0x00000000, 0x00010000, 0x002a0000, 0x000e0000, 0x005d0000, 0x00890000, 0x006d0000, + 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, 0x00940000, 0x00bf0000, + 0x00a30000, 0x00000000, 0xffff0000, 0x0001ffff, 0x002a0000, 0x000e0000, 0x00c30000, 0x00f10000, + 0x00d50000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, 0x00f40000, + 0x01220000, 0x01060000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, + 0x01250000, 0x01550000, 0x01390000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, + 0x000e0000, 0x01580000, 0x018b0000, 0x016f0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, + 0x002a0000, 0x000e0000, 0x018e0000, 0x01bf0000, 0x01a30000, 0x00000000, 0xffff0000, 0x0000ffff, + 0x00010000, 0x002a0000, 0x000e0000, 0x01c20000, 0x002a0000, 0x01d40000, 0x00000000, 0xffff0000, + 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, 0x01f00000, 0x02210000, 0x02050000, 0x00000000, + 0xffff0000, 0x0001ffff, 0x002a0000, 0x000e0000, 0x02250000, 0x02580000, 0x023c0000, 0x00000000, + 0xffff0000, 0x0001ffff, 0x002a0000, 0x000e0000, 0x025c0000, 0x02620000, 0x00010000, 0x00010000, + 0x002a0000, 0x000e0000, 0x02670000, 0x026e0000, 0x00000000, 0x00010000, 0x002a0000, 0x000e0000, + 0x02710000, 0x00000000, +}; + +static void test_effect_annotations(void) +{ + D3D10_EFFECT_VARIABLE_DESC var_desc; + ID3D10EffectConstantBuffer *cb; + D3D10_EFFECT_DESC effect_desc; + ID3D10EffectTechnique *tech; + ID3D10EffectVariable *v, *a; + ID3D10EffectPass *pass; + ID3D10Effect *effect; + ID3D10Device *device; + ULONG i, refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); + a = cb->lpVtbl->GetAnnotationByName(cb, "s"); + ok(a->lpVtbl->IsValid(a), "Expected valid variable.\n"); + a = cb->lpVtbl->GetAnnotationByName(cb, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + + effect->lpVtbl->GetDesc(effect, &effect_desc); + for (i = 0; i < effect_desc.GlobalVariables; ++i) + { + v = effect->lpVtbl->GetVariableByIndex(effect, i); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = v->lpVtbl->GetAnnotationByName(v, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + a = cb->lpVtbl->GetAnnotationByName(cb, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + } + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + ok(tech->lpVtbl->IsValid(tech), "Expected valid technique.\n"); + a = tech->lpVtbl->GetAnnotationByName(tech, "s"); + ok(a->lpVtbl->IsValid(a), "Expected valid variable.\n"); + a = tech->lpVtbl->GetAnnotationByName(tech, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); + a = pass->lpVtbl->GetAnnotationByName(pass, "s"); + ok(a->lpVtbl->IsValid(a), "Expected valid variable.\n"); + a = pass->lpVtbl->GetAnnotationByName(pass, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_effect_optimize(void) { D3D10_EFFECT_SHADER_DESC shaderdesc; + D3D10_EFFECT_VARIABLE_DESC var_desc; + ID3D10EffectConstantBuffer *cb; ID3D10EffectShaderVariable *gs; D3D10_TECHNIQUE_DESC tech_desc; + D3D10_EFFECT_DESC effect_desc; ID3D10EffectTechnique *tech; D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *v; ID3D10EffectPass *pass; ID3D10Effect *effect; ID3D10Device *device; - ULONG refcount; + ULONG i, refcount; HRESULT hr; BOOL ret; @@ -6187,6 +6318,91 @@ static void test_effect_optimize(void) effect->lpVtbl->Release(effect); + /* Annotations are stripped. */ + hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = cb->lpVtbl->GetAnnotationByName(cb, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + + effect->lpVtbl->GetDesc(effect, &effect_desc); + + for (i = 0; i < effect_desc.GlobalVariables; ++i) + { + v = effect->lpVtbl->GetVariableByIndex(effect, i); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = v->lpVtbl->GetAnnotationByName(v, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + } + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(tech_desc.Annotations == 1, "Unexpected annotations count %u.\n", tech_desc.Annotations); + v = tech->lpVtbl->GetAnnotationByName(tech, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(pass_desc.Annotations == 1, "Unexpected annotations count %u.\n", pass_desc.Annotations); + v = pass->lpVtbl->GetAnnotationByName(pass, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + + hr = effect->lpVtbl->Optimize(effect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = cb->lpVtbl->GetAnnotationByName(cb, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); +} + + effect->lpVtbl->GetDesc(effect, &effect_desc); + + for (i = 0; i < effect_desc.GlobalVariables; ++i) + { + v = effect->lpVtbl->GetVariableByIndex(effect, i); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine { + ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = v->lpVtbl->GetAnnotationByName(v, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + } + } + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(!tech_desc.Annotations, "Unexpected annotations count %u.\n", tech_desc.Annotations); + v = tech->lpVtbl->GetAnnotationByName(tech, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); +} + + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(!pass_desc.Annotations, "Unexpected annotations count %u.\n", pass_desc.Annotations); + v = pass->lpVtbl->GetAnnotationByName(pass, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); +} + + effect->lpVtbl->Release(effect); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } @@ -7019,6 +7235,7 @@ START_TEST(effect) test_effect_vector_variable(); test_effect_matrix_variable(); test_effect_resource_variable(); + test_effect_annotations(); test_effect_optimize(); test_effect_shader_description(); test_effect_shader_object(); -- 2.26.3

1 0

[v3 PATCH 1/7] d3d10/effect: Use shader variable directly from pass structure on Apply().
by Matteo Bruni Oct. 13, 2021

Oct. 13, 2021

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v3: Merge per-shader branches in d3d10_effect_pass_Apply(). dlls/d3d10/d3d10_private.h | 15 --- dlls/d3d10/effect.c | 188 +++++++++++++------------------------ dlls/d3d10/tests/effect.c | 22 +++++ 3 files changed, 89 insertions(+), 136 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 6979d2a114e..fbcc36e5e06 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -73,19 +73,6 @@ struct d3d10_matrix float m[4][4]; }; -struct d3d10_effect_object -{ - struct d3d10_effect_pass *pass; - enum d3d10_effect_object_type type; - union - { - ID3D10VertexShader *vs; - ID3D10PixelShader *ps; - ID3D10GeometryShader *gs; - IUnknown *object; - } object; -}; - struct d3d10_effect_shader_resource { D3D10_SHADER_INPUT_TYPE in_type; @@ -236,9 +223,7 @@ struct d3d10_effect_pass struct d3d10_effect_technique *technique; char *name; - DWORD object_count; DWORD annotation_count; - struct d3d10_effect_object *objects; struct d3d10_effect_variable *annotations; struct d3d10_effect_pass_shader_desc vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0ba906375d7..68f91ade50f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1734,17 +1734,17 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size, } static HRESULT parse_fx10_object(const char *data, size_t data_size, - const char **ptr, struct d3d10_effect_object *o) + const char **ptr, struct d3d10_effect_pass *pass) { ID3D10EffectVariable *variable = &null_variable.ID3D10EffectVariable_iface; const char *data_ptr = NULL; DWORD offset, sodecl_offset; enum d3d10_effect_object_operation operation; HRESULT hr; - struct d3d10_effect *effect = o->pass->technique->effect; + struct d3d10_effect *effect = pass->technique->effect; ID3D10Effect *e = &effect->ID3D10Effect_iface; struct d3d10_effect_variable *v; - DWORD tmp, variable_idx = 0; + DWORD tmp, object_type, variable_idx = 0; const char *name; size_t name_len; @@ -1754,8 +1754,8 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, return E_FAIL; } - read_dword(ptr, &o->type); - TRACE("Effect object is of type %#x.\n", o->type); + read_dword(ptr, &object_type); + TRACE("Effect object is of type %#x.\n", object_type); read_dword(ptr, &tmp); TRACE("Effect object index %#x.\n", tmp); @@ -1771,7 +1771,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOO_CONST: TRACE("Copy variable values\n"); - switch (o->type) + switch (object_type) { case D3D10_EOT_VERTEXSHADER: TRACE("Vertex shader\n"); @@ -1789,7 +1789,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_STENCIL_REF: - if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->stencil_ref)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &pass->stencil_ref)) { ERR("Failed to read stencil ref.\n"); return E_FAIL; @@ -1797,7 +1797,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_SAMPLE_MASK: - if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->sample_mask)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &pass->sample_mask)) { FIXME("Failed to read sample mask.\n"); return E_FAIL; @@ -1805,7 +1805,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_BLEND_FACTOR: - if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &o->pass->blend_factor[0])) + if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &pass->blend_factor[0])) { FIXME("Failed to read blend factor.\n"); return E_FAIL; @@ -1813,7 +1813,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x\n", o->type); + FIXME("Unhandled object type %#x\n", object_type); return E_FAIL; } break; @@ -1873,7 +1873,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, read_dword(&data_ptr, &sodecl_offset); if (FAILED(hr = parse_fx10_anonymous_shader(effect, - &effect->anonymous_shaders[effect->anonymous_shader_current], o->type))) + &effect->anonymous_shaders[effect->anonymous_shader_current], object_type))) return hr; v = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; @@ -1893,7 +1893,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, TRACE("Stream output declaration: %s.\n", debugstr_a(v->u.shader.stream_output_declaration)); } - switch (o->type) + switch (object_type) { case D3D10_EOT_VERTEXSHADER: case D3D10_EOT_PIXELSHADER: @@ -1903,7 +1903,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x\n", o->type); + FIXME("Unhandled object type %#x\n", object_type); return E_FAIL; } break; @@ -1913,7 +1913,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, return E_FAIL; } - switch (o->type) + switch (object_type) { case D3D10_EOT_RASTERIZER_STATE: { @@ -1927,10 +1927,10 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->rasterizer = &v->elements[variable_idx]; + pass->rasterizer = &v->elements[variable_idx]; } else - o->pass->rasterizer = v; + pass->rasterizer = v; break; } @@ -1946,10 +1946,10 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->depth_stencil = &v->elements[variable_idx]; + pass->depth_stencil = &v->elements[variable_idx]; } else - o->pass->depth_stencil = v; + pass->depth_stencil = v; break; } @@ -1965,40 +1965,34 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->blend = &v->elements[variable_idx]; + pass->blend = &v->elements[variable_idx]; } else - o->pass->blend = v; + pass->blend = v; break; } case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetVertexShader(sv, variable_idx, &o->object.vs))) - return hr; - o->pass->vs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->vs.index = variable_idx; + pass->vs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->vs.index = variable_idx; break; } case D3D10_EOT_PIXELSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetPixelShader(sv, variable_idx, &o->object.ps))) - return hr; - o->pass->ps.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->ps.index = variable_idx; + pass->ps.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->ps.index = variable_idx; break; } case D3D10_EOT_GEOMETRYSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetGeometryShader(sv, variable_idx, &o->object.gs))) - return hr; - o->pass->gs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->gs.index = variable_idx; + pass->gs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->gs.index = variable_idx; break; } @@ -2008,7 +2002,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x.\n", o->type); + FIXME("Unhandled object type %#x.\n", object_type); return E_FAIL; } @@ -2018,9 +2012,9 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, static HRESULT parse_fx10_pass(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_pass *p) { + DWORD offset, object_count; HRESULT hr = S_OK; unsigned int i; - DWORD offset; read_dword(ptr, &offset); TRACE("Pass name at offset %#x.\n", offset); @@ -2032,8 +2026,8 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, } TRACE("Pass name: %s.\n", debugstr_a(p->name)); - read_dword(ptr, &p->object_count); - TRACE("Pass has %u effect objects.\n", p->object_count); + read_dword(ptr, &object_count); + TRACE("Pass has %u effect objects.\n", object_count); read_dword(ptr, &p->annotation_count); TRACE("Pass has %u annotations.\n", p->annotation_count); @@ -2045,23 +2039,13 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, return hr; } - if (!(p->objects = heap_calloc(p->object_count, sizeof(*p->objects)))) - { - ERR("Failed to allocate effect objects memory.\n"); - return E_OUTOFMEMORY; - } - p->vs.shader = &null_shader_variable; p->ps.shader = &null_shader_variable; p->gs.shader = &null_shader_variable; - for (i = 0; i < p->object_count; ++i) + for (i = 0; i < object_count; ++i) { - struct d3d10_effect_object *o = &p->objects[i]; - - o->pass = p; - - if (FAILED(hr = parse_fx10_object(data, data_size, ptr, o))) + if (FAILED(hr = parse_fx10_object(data, data_size, ptr, p))) return hr; } @@ -2927,42 +2911,6 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d return parse_dxbc(data, data_size, fx10_chunk_handler, This); } -static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) -{ - ID3D10Device *device = o->pass->technique->effect->device; - - TRACE("effect object %p, type %#x.\n", o, o->type); - - switch(o->type) - { - case D3D10_EOT_RASTERIZER_STATE: - case D3D10_EOT_DEPTH_STENCIL_STATE: - case D3D10_EOT_BLEND_STATE: - case D3D10_EOT_STENCIL_REF: - case D3D10_EOT_BLEND_FACTOR: - case D3D10_EOT_SAMPLE_MASK: - break; - - case D3D10_EOT_VERTEXSHADER: - ID3D10Device_VSSetShader(device, o->object.vs); - return S_OK; - - case D3D10_EOT_PIXELSHADER: - ID3D10Device_PSSetShader(device, o->object.ps); - return S_OK; - - case D3D10_EOT_GEOMETRYSHADER: - ID3D10Device_GSSetShader(device, o->object.gs); - return S_OK; - - default: - FIXME("Unhandled effect object type %#x.\n", o->type); - return E_FAIL; - } - - return S_OK; -} - static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, D3D10_SHADER_VARIABLE_TYPE type) { @@ -3087,25 +3035,6 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) } } -static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) -{ - switch (o->type) - { - case D3D10_EOT_RASTERIZER_STATE: - case D3D10_EOT_DEPTH_STENCIL_STATE: - case D3D10_EOT_BLEND_STATE: - case D3D10_EOT_VERTEXSHADER: - case D3D10_EOT_PIXELSHADER: - case D3D10_EOT_GEOMETRYSHADER: - if (o->object.object) - IUnknown_Release(o->object.object); - break; - - default: - break; - } -} - static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { unsigned int i; @@ -3114,15 +3043,6 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) heap_free(p->name); - if (p->objects) - { - for (i = 0; i < p->object_count; ++i) - { - d3d10_effect_object_destroy(&p->objects[i]); - } - heap_free(p->objects); - } - if (p->annotations) { for (i = 0; i < p->annotation_count; ++i) @@ -4109,23 +4029,55 @@ static void apply_shader_resources(ID3D10Device *device, struct d3d10_effect_var } } +static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, + const struct d3d10_effect_pass_shader_desc *shader_desc) +{ + ID3D10Device *device = pass->technique->effect->device; + struct d3d10_effect_variable *v = shader_desc->shader; + + if (v->type->element_count) + v = &v->elements[shader_desc->index]; + + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetShader(device, v->u.shader.shader.vs); + break; + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetShader(device, v->u.shader.shader.ps); + break; + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetShader(device, v->u.shader.shader.gs); + break; + default: + WARN("Unexpected shader type %u.\n", v->type->basetype); + } +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); ID3D10Device *device = pass->technique->effect->device; - HRESULT hr = S_OK; - unsigned int i; TRACE("iface %p, flags %#x\n", iface, flags); if (flags) FIXME("Ignoring flags (%#x)\n", flags); if (pass->vs.shader != &null_shader_variable) + { + d3d10_effect_pass_set_shader(pass, &pass->vs); apply_shader_resources(device, pass->vs.shader); + } if (pass->gs.shader != &null_shader_variable) + { + d3d10_effect_pass_set_shader(pass, &pass->gs); apply_shader_resources(device, pass->gs.shader); + } if (pass->ps.shader != &null_shader_variable) + { + d3d10_effect_pass_set_shader(pass, &pass->ps); apply_shader_resources(device, pass->ps.shader); + } if (pass->rasterizer) ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); if (pass->depth_stencil) @@ -4135,13 +4087,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface ID3D10Device_OMSetBlendState(device, pass->blend->u.state.object.blend, pass->blend_factor, pass->sample_mask); - for (i = 0; i < pass->object_count; ++i) - { - hr = d3d10_effect_object_apply(&pass->objects[i]); - if (FAILED(hr)) break; - } - - return hr; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 781abb46745..6ad3f7421f4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2909,6 +2909,7 @@ static void test_effect_local_shader(void) D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs, *ps, *vs; + ID3D10PixelShader *ps_d3d, *ps_d3d_2; D3D10_EFFECT_SHADER_DESC shaderdesc; D3D10_SIGNATURE_PARAMETER_DESC sign; D3D10_STATE_BLOCK_MASK mask; @@ -3005,6 +3006,12 @@ if (0) hr = p->lpVtbl->GetGeometryShaderDesc(p, NULL); ok(hr == E_INVALIDARG, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + v = effect->lpVtbl->GetVariableByName(effect, "p"); + ps = v->lpVtbl->AsShader(v); + + hr = ps->lpVtbl->GetPixelShader(ps, 0, &ps_d3d); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* get the null_shader_variable */ v = effect->lpVtbl->GetVariableByIndex(effect, 10000); null_shader = v->lpVtbl->AsShader(v); @@ -3024,6 +3031,13 @@ if (0) ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); ok(!ret, "Unexpected mask.\n"); + ID3D10Device_PSSetShader(device, ps_d3d); + hr = p->lpVtbl->Apply(p, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_PSGetShader(device, &ps_d3d_2); + ok(ps_d3d_2 == ps_d3d, "Unexpected shader object.\n"); + ID3D10PixelShader_Release(ps_d3d_2); + hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); @@ -3051,6 +3065,12 @@ if (0) /* pass 1 */ p = t->lpVtbl->GetPassByIndex(t, 1); + ID3D10Device_PSSetShader(device, ps_d3d); + hr = p->lpVtbl->Apply(p, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_PSGetShader(device, &ps_d3d_2); + ok(!ps_d3d_2, "Unexpected shader object.\n"); + /* pass 1 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); @@ -3881,6 +3901,8 @@ todo_wine effect->lpVtbl->Release(effect); + ID3D10PixelShader_Release(ps_d3d); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } -- 2.26.3

1 0

[PATCH 2/2] wbemprox: Add __DERIVATION to the list of system properties.
by Hans Leidekker Oct. 13, 2021

Oct. 13, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 28028474d59..63007565766 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1395,7 +1395,8 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { static const WCHAR * const system_props[] = - { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__DERIVATION", L"__SERVER", L"__NAMESPACE", + L"__PATH" }; SAFEARRAY *sa; BSTR str; UINT i, table_index, result_index, count = 0; -- 2.30.2

1 0

[PATCH 1/2] wbemprox: Return an empty array for __DERIVATION.
by Hans Leidekker Oct. 13, 2021

Oct. 13, 2021

Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51871 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 77ed27e105d..28028474d59 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1006,6 +1006,19 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } + if (!wcsicmp( name, L"__DERIVATION" )) + { + if (ret) + { + SAFEARRAY *sa; + FIXME( "returning empty array for __DERIVATION\n" ); + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, 0 ))) return E_OUTOFMEMORY; + V_VT( ret ) = VT_BSTR | VT_ARRAY; + V_ARRAY( ret ) = sa; + } + if (type) *type = CIM_STRING | CIM_FLAG_ARRAY; + return S_OK; + } FIXME("system property %s not implemented\n", debugstr_w(name)); return WBEM_E_NOT_FOUND; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 69bb8e7977e..5ca61cff825 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1642,6 +1642,7 @@ static void test_Win32_VideoController( IWbemServices *services ) if (hr != S_OK) break; check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__DERIVATION", VT_BSTR | VT_ARRAY, CIM_STRING | CIM_FLAG_ARRAY ); check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); check_property( obj, L"__PATH", VT_BSTR, CIM_STRING ); -- 2.30.2

1 0

[PATCH] wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class.
by Eduard Permyakov Oct. 13, 2021

Oct. 13, 2021

Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 442a9015951..d76602f4930 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -286,7 +286,9 @@ static const struct column col_physicalmemory[] = }; static const struct column col_pnpentity[] = { - { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING }, }; static const struct column col_printer[] = { @@ -701,6 +703,8 @@ struct record_physicalmemory struct record_pnpentity { const WCHAR *device_id; + const WCHAR *manufacturer; + const WCHAR *name; }; struct record_printer { @@ -3063,6 +3067,8 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * ARRAY_SIZE(device_id), NULL )) { rec->device_id = heap_strdupW( device_id ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine PnP Device"; table->num_rows++; if (!match_row( table, table->num_rows - 1, cond, &status )) -- 2.25.1

2 1

[PATCH] user32: Don't check active window state when handling SC_MINIMIZE/SC_MAXIMIZE/SC_RESTORE.
by Dmitry Timoshkov Oct. 13, 2021

Oct. 13, 2021

An application I'm working on routes messages to a worker thread, and checking for an active window while processing WM_SYSCOMMAND in that thread breaks things. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/nonclient.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 02e6ad92320..b47616bb639 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1560,19 +1560,18 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) break; case SC_MINIMIZE: - if (hwnd == GetActiveWindow()) - ShowOwnedPopups(hwnd,FALSE); + ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetActiveWindow()) + if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetActiveWindow()) + if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break; -- 2.31.1

1 0

[PATCH 1/9] dinput: Factor all GetDeviceInfo implementations together.
by Rémi Bernon Oct. 13, 2021

Oct. 13, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 20 ++++++++++++++++++ dlls/dinput/device_private.h | 3 +++ dlls/dinput/joystick_hid.c | 27 +++++-------------------- dlls/dinput/keyboard.c | 39 +++++++++++------------------------- dlls/dinput/mouse.c | 21 ++----------------- 5 files changed, 42 insertions(+), 68 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d8bb5e84417..93236cf6bd0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1176,6 +1176,25 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 return hr; } +HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DWORD size; + + TRACE( "iface %p, instance %p.\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memcpy( instance, &impl->instance, size ); + instance->dwSize = size; + + return S_OK; +} + /****************************************************************************** * SetEventNotification : specifies event to be sent on state change */ @@ -1740,6 +1759,7 @@ HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl * This->IDirectInputDevice8W_iface.lpVtbl = vtbl; This->ref = 1; This->guid = *guid; + This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->data_format.wine_df = format; InitializeCriticalSection( &This->crit ); This->dinput = dinput; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 321a9702642..683db8d35ab 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -67,6 +67,7 @@ struct IDirectInputDeviceImpl IDirectInputImpl *dinput; struct list entry; /* entry into acquired device list */ HANDLE hEvent; + DIDEVICEINSTANCEW instance; DWORD dwCoopLevel; HWND win; int acquired; @@ -120,6 +121,8 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W ifa extern HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W iface, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8W iface, HWND hwnd, DWORD dwflags) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo( IDirectInputDevice8W *iface, + DIDEVICEINSTANCEW *instance ); extern HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification(LPDIRECTINPUTDEVICE8W iface, HANDLE hnd) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 203a5d7788d..4b0a4861fb7 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -161,7 +161,6 @@ struct hid_joystick OVERLAPPED read_ovl; PHIDP_PREPARSED_DATA preparsed; - DIDEVICEINSTANCEW instance; WCHAR device_path[MAX_PATH]; HIDD_ATTRIBUTES attrs; DIDEVCAPS dev_caps; @@ -775,14 +774,14 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con { DIPROPSTRING *value = (DIPROPSTRING *)header; if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW( value->wsz, impl->instance.tszProductName, MAX_PATH ); + lstrcpynW( value->wsz, impl->base.instance.tszProductName, MAX_PATH ); return DI_OK; } case (DWORD_PTR)DIPROP_INSTANCENAME: { DIPROPSTRING *value = (DIPROPSTRING *)header; if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW( value->wsz, impl->instance.tszInstanceName, MAX_PATH ); + lstrcpynW( value->wsz, impl->base.instance.tszInstanceName, MAX_PATH ); return DI_OK; } case (DWORD_PTR)DIPROP_VIDPID: @@ -797,7 +796,7 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con { DIPROPDWORD *value = (DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - value->dwData = impl->instance.guidInstance.Data3; + value->dwData = impl->base.instance.guidInstance.Data3; return DI_OK; } case (DWORD_PTR)DIPROP_GUIDANDPATH: @@ -1060,22 +1059,6 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D return DIERR_NOTFOUND; } -static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - - TRACE( "iface %p, instance %p.\n", iface, instance ); - - if (!instance) return E_POINTER; - if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && - instance->dwSize != sizeof(DIDEVICEINSTANCEW)) - return DIERR_INVALIDPARAM; - - memcpy( instance, &impl->instance, instance->dwSize ); - - return S_OK; -} - static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirectInputEffect **out ); static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, @@ -1457,7 +1440,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, hid_joystick_GetObjectInfo, - hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ @@ -2277,7 +2260,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID if (hr != DI_OK) goto failed; impl->ref = 1; - impl->instance = instance; + impl->base.instance = instance; impl->attrs = attrs; impl->dev_caps.dwSize = sizeof(impl->dev_caps); impl->dev_caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f687eec5259..3d78fd4de54 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -43,7 +43,6 @@ struct SysKeyboardImpl { struct IDirectInputDeviceImpl base; BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; - DWORD subtype; }; static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) @@ -89,9 +88,9 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); + BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; - BYTE new_diks; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) @@ -108,7 +107,8 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode, This->subtype, This->base.dinput->dwVersion); + dik_code = map_dik_code( hook->scanCode & 0xff, hook->vkCode, subtype, + This->base.dinput->dwVersion ); if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; @@ -193,6 +193,7 @@ static HRESULT keyboarddev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVIC static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboardImpl **out ) { + BYTE subtype = get_keyboard_subtype(); SysKeyboardImpl* newDevice; LPDIDATAFORMAT df = NULL; int i, idx = 0; @@ -203,7 +204,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); - newDevice->subtype = get_keyboard_subtype(); + fill_keyboard_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion, subtype ); /* Create copy of default data format */ memcpy(df, &c_dfDIKeyboard, c_dfDIKeyboard.dwSize); @@ -217,7 +218,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), buf, sizeof(buf))) continue; - dik_code = map_dik_code(i, 0, newDevice->subtype, dinput->dwVersion); + dik_code = map_dik_code( i, 0, subtype, dinput->dwVersion ); memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[dik_code], df->dwObjSize); df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON; } @@ -294,6 +295,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + BYTE subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -306,9 +308,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) - devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (This->subtype << 8); + devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (This->subtype << 8); + devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); devcaps.dwAxes = 0; devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; @@ -367,13 +369,14 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface DWORD dwHow) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + BYTE subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); HRESULT res; LONG scan; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); + scan = map_dik_to_scan( DIDFT_GETINSTANCE( pdidoi->dwType ), subtype ); if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, ARRAY_SIZE(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; @@ -382,24 +385,6 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface return res; } -/****************************************************************************** - * GetDeviceInfo : get information about a device's identity - */ -static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%p)\n", This, pdidi); - - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - - fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion, This->subtype); - - return DI_OK; -} - /****************************************************************************** * GetProperty : Retrieves information about the input device. */ @@ -496,7 +481,7 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt = IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, SysKeyboardWImpl_GetObjectInfo, - SysKeyboardWImpl_GetDeviceInfo, + IDirectInputDevice2WImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, IDirectInputDevice2WImpl_CreateEffect, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 97e2b58c6cd..e11a9260fb2 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -148,6 +148,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); + fill_mouse_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion ); newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); @@ -705,24 +706,6 @@ static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, return res; } -/****************************************************************************** - * GetDeviceInfo : get information about a device's identity - */ -static HRESULT WINAPI SysMouseWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%p)\n", This, pdidi); - - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - - fill_mouse_dideviceinstanceW(pdidi, This->base.dinput->dwVersion); - - return DI_OK; -} - static HRESULT WINAPI SysMouseWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, @@ -761,7 +744,7 @@ static const IDirectInputDevice8WVtbl SysMouseWvt = IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, SysMouseWImpl_GetObjectInfo, - SysMouseWImpl_GetDeviceInfo, + IDirectInputDevice2WImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, IDirectInputDevice2WImpl_CreateEffect, -- 2.33.0

2 9

[PATCH] winemenubuilder: Introduce a reg_enum_keyW helper function
by Alex Henrie Oct. 13, 2021

Oct. 13, 2021

The helper function reduces code duplication and makes the 'done' variable in the cleanup_associations function unnecessary. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/winemenubuilder/winemenubuilder.c | 91 +++++++++++----------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5b6fe071916..32d3945ad19 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1753,6 +1753,32 @@ static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types return match ? xwcsdup(match) : NULL; } +static WCHAR *reg_enum_keyW(HKEY key, DWORD index) +{ + WCHAR *subkey; + DWORD size = 1024 * sizeof(WCHAR); + LSTATUS ret; + + for (;;) + { + subkey = xmalloc(size); + ret = RegEnumKeyExW(key, index, subkey, &size, NULL, NULL, NULL, NULL); + if (ret == ERROR_SUCCESS) + { + return subkey; + } + if (ret != ERROR_MORE_DATA) + { + if (ret != ERROR_NO_MORE_ITEMS) + WINE_ERR("error %d while reading registry\n", ret); + heap_free(subkey); + return NULL; + } + size *= 2; + heap_free(subkey); + } +} + static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size; @@ -1857,47 +1883,31 @@ static BOOL cleanup_associations(void) BOOL hasChanged = FALSE; if ((assocKey = open_associations_reg_key())) { - int i; - BOOL done = FALSE; - for (i = 0; !done;) + int i = 0; + for (;;) { - WCHAR *extensionW = NULL; - DWORD size = 1024; - LSTATUS ret; + WCHAR *extensionW; + WCHAR *command; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(assocKey, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(assocKey, i))) + break; - if (ret == ERROR_SUCCESS) + if (!(command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"))) { - WCHAR *command; - command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (command == NULL) + WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); + if (desktopFile) { - WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); - if (desktopFile) - { - WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); - DeleteFileW(desktopFile); - } - RegDeleteKeyW(assocKey, extensionW); - hasChanged = TRUE; - heap_free(desktopFile); + WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); + DeleteFileW(desktopFile); } - else - i++; - heap_free(command); + RegDeleteKeyW(assocKey, extensionW); + hasChanged = TRUE; + heap_free(desktopFile); } else { - if (ret != ERROR_NO_MORE_ITEMS) - WINE_ERR("error %d while reading registry\n", ret); - done = TRUE; + i++; + heap_free(command); } heap_free(extensionW); } @@ -1998,7 +2008,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic { struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare }; struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes); - LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; @@ -2010,18 +2019,12 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic for (i = 0; ; i++) { - WCHAR *extensionW = NULL; - DWORD size = 1024; + WCHAR *extensionW; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(HKEY_CLASSES_ROOT, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(HKEY_CLASSES_ROOT, i))) + break; - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_banned(extensionW)) + if (extensionW[0] == '.' && !is_extension_banned(extensionW)) { WCHAR *commandW = NULL; WCHAR *executableW = NULL; @@ -2129,8 +2132,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic heap_free(progIdW); } heap_free(extensionW); - if (ret != ERROR_SUCCESS) - break; } wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL); -- 2.33.0

1 0