September 2021 - Wine-Commits

Nikolay Sivov : sechost: Fix argument pointers array allocation size (Coverity).
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 1d46e601ff2e63a863fb4bc08d7aa64203c3c16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d46e601ff2e63a863fb4bc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 15 14:15:49 2021 +0300 sechost: Fix argument pointers array allocation size (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index e4e152b0824..c447263bd0f 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1020,7 +1020,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH StartServiceA( SC_HANDLE service, DWORD argc, cons BOOL r; if (argc) - argvW = heap_alloc( argc * sizeof(WCHAR) ); + argvW = heap_alloc( argc * sizeof(*argvW) ); for (i = 0; i < argc; i++) argvW[i] = heap_strdupAtoW( argv[i] );

1 0

Jacek Caban : win32u: Use NtGdiSetBrushOrg in NtGdiMaskBlt.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: ad4f9396e00f473f695e237ded01f461268d201f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad4f9396e00f473f695e237d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 14 21:52:23 2021 +0200 win32u: Use NtGdiSetBrushOrg in NtGdiMaskBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dc.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0de7932aa95..83ef949ec3f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -810,7 +810,7 @@ BOOL WINAPI NtGdiMaskBlt( HDC hdcDest, INT nXDest, INT nYDest, INT nWidth, INT n /* combine both using the mask as a pattern brush */ NtGdiSelectBrush(hDC2, hbrMask); - SetBrushOrgEx(hDC2, -xMask, -yMask, NULL); + NtGdiSetBrushOrg( hDC2, -xMask, -yMask, NULL ); /* (D & P) | (S & ~P) */ NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hDC1, 0, 0, 0xac0744, 0, 0 ); NtGdiSelectBrush(hDC2, hbrTmp); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3c84d2024fe..21ca88bab30 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -884,6 +884,22 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre } +/*********************************************************************** + * NtGdiSetBrushOrg (win32u.@) + */ +BOOL WINAPI NtGdiSetBrushOrg( HDC hdc, INT x, INT y, POINT *oldorg ) +{ + DC *dc; + + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + if (oldorg) *oldorg = dc->attr->brush_org; + dc->attr->brush_org.x = x; + dc->attr->brush_org.y = y; + release_dc_ptr( dc ); + return TRUE; +} + + /*********************************************************************** * NtGdiGetTransform (win32u.@) *

1 0

Nikolay Sivov : d3d10/effect: Remove no longer used fourcc symbols.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: edf965389b8e2672c48a8f2b96f05d4950bff622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf965389b8e2672c48a8f2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:04 2021 +0300 d3d10/effect: Remove no longer used fourcc symbols. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a9e97725659..e77d0691fcf 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -29,9 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') -#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') -#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') -#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define D3D10_FX10_TYPE_COLUMN_SHIFT 11 #define D3D10_FX10_TYPE_COLUMN_MASK (0x7 << D3D10_FX10_TYPE_COLUMN_SHIFT)

1 0

Nikolay Sivov : d3d10/tests: Add a test for default numeric variable values.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 4a3e038022d73b5d7ca3f6b4d0881f2f3497c39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a3e038022d73b5d7ca3f6b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:03 2021 +0300 d3d10/tests: Add a test for default numeric variable values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 88b6b2e170d..9223fdf51ef 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6638,6 +6638,117 @@ todo_wine ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +float4 f4 = {1,2,3,4}; +float2 f2 = {1,2}; +float1 f1 = {1}; +int i = 10; +int i2[2] = {9,12}; +float f = 0.2f; +#endif +static DWORD fx_test_default_variable_value[] = +{ + 0x43425844, 0xe57b41f2, 0x98392802, 0xed3d94b4, 0xc4074c4f, 0x00000001, 0x00000248, 0x00000001, + 0x00000024, 0x30315846, 0x0000021c, 0xfeff1001, 0x00000001, 0x00000006, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000110, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, + 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, + 0x00000010, 0x0000210a, 0x00003466, 0x003f8000, 0x00400000, 0x00404000, 0x66408000, 0x74616f6c, + 0x00430032, 0x00010000, 0x00000000, 0x00080000, 0x00100000, 0x00080000, 0x110a0000, 0x32660000, + 0x80000000, 0x0000003f, 0x6f6c6640, 0x00317461, 0x00000071, 0x00000001, 0x00000000, 0x00000004, + 0x00000010, 0x00000004, 0x0000090a, 0x00003166, 0x693f8000, 0x9b00746e, 0x01000000, 0x00000000, + 0x04000000, 0x10000000, 0x04000000, 0x11000000, 0x69000009, 0x00000a00, 0x00009b00, 0x00000100, + 0x00000200, 0x00001400, 0x00001000, 0x00000800, 0x00091100, 0x00326900, 0x00000009, 0x0000000c, + 0x616f6c66, 0x00e80074, 0x00010000, 0x00000000, 0x00040000, 0x00100000, 0x00040000, 0x09090000, + 0x00660000, 0x3e4ccccd, 0x00000004, 0x00000040, 0x00000000, 0x00000006, 0xffffffff, 0x00000000, + 0x00000030, 0x00000014, 0x00000000, 0x00000000, 0x00000033, 0x00000000, 0x00000000, 0x00000066, + 0x0000004a, 0x00000000, 0x00000010, 0x00000069, 0x00000000, 0x00000000, 0x00000094, 0x00000078, + 0x00000000, 0x00000018, 0x00000097, 0x00000000, 0x00000000, 0x000000bb, 0x0000009f, 0x00000000, + 0x0000001c, 0x000000bd, 0x00000000, 0x00000000, 0x000000dd, 0x000000c1, 0x00000000, 0x00000020, + 0x000000e0, 0x00000000, 0x00000000, 0x0000010a, 0x000000ee, 0x00000000, 0x00000034, 0x0000010c, + 0x00000000, 0x00000000, +}; + +static void test_effect_default_variable_value(void) +{ + ID3D10EffectVectorVariable *vector; + ID3D10EffectScalarVariable *scalar; + float float_v[4], float_s; + ID3D10EffectVariable *v; + ID3D10Effect *effect; + ID3D10Device *device; + int int_v[2], int_s; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + + memset(float_v, 0, sizeof(float_v)); + v = effect->lpVtbl->GetVariableByName(effect, "f4"); + vector = v->lpVtbl->AsVector(v); + hr = vector->lpVtbl->GetFloatVector(vector, float_v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 3.0f && float_v[3] == 4.0f, + "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); + + memset(float_v, 0, sizeof(float_v)); + float_v[2] = float_v[3] = 5.0f; + v = effect->lpVtbl->GetVariableByName(effect, "f2"); + vector = v->lpVtbl->AsVector(v); + hr = vector->lpVtbl->GetFloatVector(vector, float_v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, + "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); + + memset(float_v, 0, sizeof(float_v)); + float_v[1] = float_v[2] = float_v[3] = 5.0f; + v = effect->lpVtbl->GetVariableByName(effect, "f1"); + vector = v->lpVtbl->AsVector(v); + hr = vector->lpVtbl->GetFloatVector(vector, float_v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_v[0] == 1.0f && float_v[1] == 5.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, + "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); + + int_s = 0; + v = effect->lpVtbl->GetVariableByName(effect, "i"); + scalar = v->lpVtbl->AsScalar(v); + hr = scalar->lpVtbl->GetInt(scalar, &int_s); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(int_s == 10, "Unexpected value %d.\n", int_s); + + memset(int_v, 0, sizeof(int_v)); + v = effect->lpVtbl->GetVariableByName(effect, "i2"); + scalar = v->lpVtbl->AsScalar(v); + hr = scalar->lpVtbl->GetIntArray(scalar, int_v, 0, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(int_v[0] == 9 && int_v[1] == 12, "Unexpected vector {%d,%d}\n", int_v[0], int_v[1]); + + float_s = 0.0f; + v = effect->lpVtbl->GetVariableByName(effect, "f"); + scalar = v->lpVtbl->AsScalar(v); + hr = scalar->lpVtbl->GetFloat(scalar, &float_s); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_s == 0.2f, "Unexpected value %.8e.\n", float_s); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -6658,4 +6769,5 @@ START_TEST(effect) test_effect_shader_description(); test_effect_shader_object(); test_effect_pool(); + test_effect_default_variable_value(); }

1 0

Nikolay Sivov : msvcrt: Use free() on msvcrt_wstrdupa() results (Coverity).
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 0eaa43f6afa4e4c407b6c036c153e01719bc018b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eaa43f6afa4e4c407b6c036… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 23:11:48 2021 +0300 msvcrt: Use free() on msvcrt_wstrdupa() results (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index cf1dcd3d279..a5f8f0bca3d 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1165,14 +1165,14 @@ FILE* CDECL _popen(const char* command, const char* mode) if (!(cmdW = msvcrt_wstrdupa(command))) return NULL; if (!(modeW = msvcrt_wstrdupa(mode))) { - HeapFree(GetProcessHeap(), 0, cmdW); + free(cmdW); return NULL; } ret = _wpopen(cmdW, modeW); - HeapFree(GetProcessHeap(), 0, cmdW); - HeapFree(GetProcessHeap(), 0, modeW); + free(cmdW); + free(modeW); return ret; } @@ -1274,7 +1274,7 @@ int CDECL system(const char* cmd) if ((cmdW = msvcrt_wstrdupa(cmd))) { res = _wsystem(cmdW); - HeapFree(GetProcessHeap(), 0, cmdW); + free(cmdW); } return res; }

1 0

Nikolay Sivov : d3d10/effect: Release technique names on Optimize().
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: eb1f76caa615a1feeee4c4f7c127eced6665992a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1f76caa615a1feeee4c4f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:00 2021 +0300 d3d10/effect: Release technique names on Optimize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 6 ++++++ dlls/d3d10/tests/effect.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6d2f862f252..d850928248a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3435,6 +3435,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) v->u.shader.stream_output_declaration = NULL; } + for (i = 0; i < effect->technique_count; ++i) + { + heap_free(effect->techniques[i].name); + effect->techniques[i].name = NULL; + } + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5e548a96172..ca96e6c20a2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5996,6 +5996,8 @@ static void test_effect_optimize(void) { D3D10_EFFECT_SHADER_DESC shaderdesc; ID3D10EffectShaderVariable *gs; + D3D10_TECHNIQUE_DESC tech_desc; + ID3D10EffectTechnique *tech; ID3D10EffectVariable *v; ID3D10Effect *effect; ID3D10Device *device; @@ -6011,6 +6013,11 @@ static void test_effect_optimize(void) hr = create_effect(fx_local_shader, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); @@ -6038,6 +6045,16 @@ static void test_effect_optimize(void) ok(!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + ok(tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n"); + + tech = effect->lpVtbl->GetTechniqueByName(effect, "Render"); + ok(!tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n"); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Release passes names on Optimize().
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: c00d42f4ba0ad6a2719ac76f2a5ad250c59a4cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00d42f4ba0ad6a2719ac76f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:01 2021 +0300 d3d10/effect: Release passes names on Optimize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 8 +++++++- dlls/d3d10/tests/effect.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d850928248a..a9e97725659 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3413,7 +3413,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) { struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); struct d3d10_effect_variable *v; - unsigned int i; + unsigned int i, j; FIXME("iface %p semi-stub!\n", iface); @@ -3437,6 +3437,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) for (i = 0; i < effect->technique_count; ++i) { + for (j = 0; j < effect->techniques[i].pass_count; ++j) + { + heap_free(effect->techniques[i].passes[j].name); + effect->techniques[i].passes[j].name = NULL; + } + heap_free(effect->techniques[i].name); effect->techniques[i].name = NULL; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ca96e6c20a2..db4299c8a4c 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5998,7 +5998,9 @@ static void test_effect_optimize(void) ID3D10EffectShaderVariable *gs; D3D10_TECHNIQUE_DESC tech_desc; ID3D10EffectTechnique *tech; + D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *v; + ID3D10EffectPass *pass; ID3D10Effect *effect; ID3D10Device *device; ULONG refcount; @@ -6018,6 +6020,11 @@ static void test_effect_optimize(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(pass_desc.Name, "P0"), "Unexpected pass name %s.\n", pass_desc.Name); + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); @@ -6049,6 +6056,13 @@ static void test_effect_optimize(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!pass_desc.Name, "Unexpected pass name %p.\n", pass_desc.Name); + + pass = tech->lpVtbl->GetPassByName(tech, "P0"); + ok(!pass->lpVtbl->IsValid(pass), "Unexpected valid pass.\n"); + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); ok(tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n");

1 0

Nikolay Sivov : msi: Fixup Installer\\Patches\\<...> key path (Coverity).
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 856e8ea298eebf0eaedd5f352476e6e986b1bd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=856e8ea298eebf0eaedd5f35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 22:44:50 2021 +0300 msi: Fixup Installer\\Patches\\<...> key path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 623bc1866d3..5dc3c0a81c3 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -773,8 +773,8 @@ UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY *key, BOOL create) if (!squash_guid( szPatch, squashed_pc )) return ERROR_FUNCTION_FAILED; TRACE("%s squashed %s\n", debugstr_w(szPatch), debugstr_w(squashed_pc)); - swprintf( keypath, ARRAY_SIZE(keypath), L"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Patches", - squashed_pc ); + lstrcpyW( keypath, L"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Patches\\" ); + lstrcatW( keypath, squashed_pc ); if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key);

1 0

Jacek Caban : gdi32: Introduce get_gdi_object_type.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: a222f974c3144d98d690c1235d5a53c3c39d7334 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a222f974c3144d98d690c123… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 14 21:51:51 2021 +0200 gdi32: Introduce get_gdi_object_type. And use it instead of GetObjectType in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 4 ++-- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/gdiobj.c | 5 +++++ dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/palette.c | 2 +- dlls/gdi32/path.c | 14 ++++++++------ 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index cff84bc1dce..0de7932aa95 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -866,7 +866,7 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDes if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = NtGdiCreateCompatibleDC( hdcDest ); - if ((GetObjectType( hdcDest ) != OBJ_MEMDC || + if ((get_gdi_object_type( hdcDest ) != NTGDI_OBJ_MEMDC || NtGdiExtGetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), sizeof(dib), &dib ) == sizeof(BITMAP)) && NtGdiGetDeviceCaps( hdcDest, BITSPIXEL ) == 32) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index ad04603bf69..4a8b899dd52 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -58,7 +58,7 @@ HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ) if (!width || !height) return 0; - if (GetObjectType( hdc ) != OBJ_MEMDC) + if (get_gdi_object_type( hdc ) != NTGDI_OBJ_MEMDC) return NtGdiCreateBitmap( width, height, NtGdiGetDeviceCaps( hdc, PLANES ), NtGdiGetDeviceCaps( hdc, BITSPIXEL ), NULL ); @@ -373,7 +373,7 @@ HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) if (!(dc = get_dc_ptr( hdc ))) return 0; - if (GetObjectType( hdc ) != OBJ_MEMDC) + if (get_gdi_object_type( hdc ) != NTGDI_OBJ_MEMDC) { ret = 0; goto done; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f7b56b06f6f..3c84d2024fe 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -375,7 +375,7 @@ void DC_UpdateXforms( DC *dc ) /* Reselect the font and pen back into the dc so that the size gets updated. */ if (linear_xform_cmp( &oldworld2vport, &dc->xformWorld2Vport ) && - GetObjectType( dc->hSelf ) != OBJ_METADC) + get_gdi_object_type( dc->hSelf ) != NTGDI_OBJ_METADC) { NtGdiSelectFont(dc->hSelf, dc->hFont); NtGdiSelectPen(dc->hSelf, dc->hPen); @@ -1012,7 +1012,7 @@ BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ) TRACE("%p, %p\n", hdc, ptr); if( dc ) { - if (GetObjectType( hdc ) != OBJ_MEMDC) + if (get_gdi_object_type( hdc ) != NTGDI_OBJ_MEMDC) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); @@ -1112,7 +1112,7 @@ BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr ) TRACE( "%p, %p\n", hdc, ptr ); if( dc ) { - if (GetObjectType( hdc ) != OBJ_MEMDC) + if (get_gdi_object_type( hdc ) != NTGDI_OBJ_MEMDC) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index f539df6d41e..9f10f479c2f 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1689,8 +1689,8 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY TRACE("dc %p, bitmap %p.\n", desc->hDc, desc->hBitmap); - if (GetObjectType( desc->hDc ) != OBJ_MEMDC || - GetObjectType( desc->hBitmap ) != OBJ_BITMAP) return STATUS_INVALID_PARAMETER; + if (get_gdi_object_type( desc->hDc ) != NTGDI_OBJ_MEMDC || + get_gdi_object_type( desc->hBitmap ) != NTGDI_OBJ_BITMAP) return STATUS_INVALID_PARAMETER; NtGdiDeleteObjectApp( desc->hBitmap ); NtGdiDeleteObjectApp( desc->hDc ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 5787231d087..917d1c91f01 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -816,6 +816,11 @@ void *free_gdi_handle( HGDIOBJ handle ) return object; } +DWORD get_gdi_object_type( HGDIOBJ obj ) +{ + GDI_HANDLE_ENTRY *entry = handle_entry( obj ); + return entry ? entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT : 0; +} /*********************************************************************** * get_any_obj_ptr diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 7f21608b244..8e122dec6a0 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -383,6 +383,7 @@ extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern DWORD get_dpi(void) DECLSPEC_HIDDEN; extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; extern HGDIOBJ get_stock_object( INT obj ) DECLSPEC_HIDDEN; +extern DWORD get_gdi_object_type( HGDIOBJ obj ) DECLSPEC_HIDDEN; /* mapping.c */ extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index e48d4501c6d..c8cd98f6778 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -518,7 +518,7 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) TRACE("%p %p\n", hdc, hpal ); - if (GetObjectType(hpal) != OBJ_PAL) + if (get_gdi_object_type(hpal) != NTGDI_OBJ_PAL) { WARN("invalid selected palette %p\n",hpal); return 0; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 94c69302d06..cc6c6c714c2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1627,14 +1627,16 @@ static struct gdi_path *PATH_WidenPath(DC *dc) elp = HeapAlloc( GetProcessHeap(), 0, size ); GetObjectW( dc->hPen, size, elp ); - obj_type = GetObjectType(dc->hPen); - if(obj_type == OBJ_PEN) { + obj_type = get_gdi_object_type(dc->hPen); + switch (obj_type) + { + case NTGDI_OBJ_PEN: penStyle = ((LOGPEN*)elp)->lopnStyle; - } - else if(obj_type == OBJ_EXTPEN) { + break; + case NTGDI_OBJ_EXTPEN: penStyle = elp->elpPenStyle; - } - else { + break; + default: SetLastError(ERROR_CAN_NOT_COMPLETE); HeapFree( GetProcessHeap(), 0, elp ); return NULL;

1 0

Jacek Caban : win32u: Directly use NtGdiGetDeviceCaps in ntgdi functions.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: d3d6b832a3ac1347aa444b87547b81b041631fbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3d6b832a3ac1347aa444b87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 14 21:52:46 2021 +0200 win32u: Directly use NtGdiGetDeviceCaps in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/dc.c | 8 ++++---- dlls/gdi32/driver.c | 30 +++++++++++++++--------------- dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/palette.c | 7 +++---- 6 files changed, 31 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3d6b832a3ac1347aa44…

1 0