September 2021 - Wine-Commits

Nikolay Sivov : d3d10/effect: Validate shared object types against the pool.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 3d1e7b0ed8845aa4d349edcdb7aea1a93c0d00cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d1e7b0ed8845aa4d349edcd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:11 2021 +0300 d3d10/effect: Validate shared object types against the pool. 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/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 81 +++++++++++++++++++++++++++++++++++++++++++--- dlls/d3d10/tests/effect.c | 34 ++++++++++++------- 3 files changed, 99 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 21530b3d30c..7f64e811e9f 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -270,7 +270,7 @@ struct d3d10_effect DWORD variable_count; DWORD local_variable_count; DWORD sharedbuffers_count; - DWORD sharedobjects_count; + DWORD shared_object_count; DWORD technique_count; DWORD index_offset; DWORD texture_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71bc8161c76..1913d621ecc 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -50,6 +50,7 @@ static inline struct d3d10_effect *impl_from_ID3D10EffectPool(ID3D10EffectPool * } static const struct ID3D10EffectVtbl d3d10_effect_pool_effect_vtbl; +static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v); static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; @@ -2096,8 +2097,8 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) return S_OK; } -static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, - const char **ptr, struct d3d10_effect_variable *v) +static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, + const char **ptr, BOOL shared_type_desc, struct d3d10_effect_variable *v) { unsigned int i; HRESULT hr; @@ -2119,6 +2120,9 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &v->explicit_bind_point); TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); + /* Shared variable description contains only type information. */ + if (shared_type_desc) return S_OK; + switch (v->type->basetype) { case D3D10_SVT_TEXTURE: @@ -2534,6 +2538,50 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context heap_free(t); } +static BOOL d3d10_effect_types_match(const struct d3d10_effect_type *t1, + const struct d3d10_effect_type *t2) +{ + unsigned int i; + + if (strcmp(t1->name, t2->name)) return FALSE; + if (t1->basetype != t2->basetype) return FALSE; + if (t1->type_class != t2->type_class) return FALSE; + if (t1->element_count != t2->element_count) return FALSE; + if (t1->element_count) return d3d10_effect_types_match(t1->elementtype, t2->elementtype); + if (t1->member_count != t2->member_count) return FALSE; + if (t1->column_count != t2->column_count) return FALSE; + if (t1->row_count != t2->row_count) return FALSE; + + for (i = 0; i < t1->member_count; ++i) + { + if (strcmp(t1->members[i].name, t2->members[i].name)) return FALSE; + if (t1->members[i].buffer_offset != t2->members[i].buffer_offset) return FALSE; + if (!d3d10_effect_types_match(t1->members[i].type, t2->members[i].type)) return FALSE; + } + + return TRUE; +} + +static HRESULT d3d10_effect_validate_shared_variable(const struct d3d10_effect *effect, + const struct d3d10_effect_variable *v) +{ + ID3D10EffectVariable *sv = effect->pool->lpVtbl->GetVariableByName(effect->pool, v->name); + + if (!sv->lpVtbl->IsValid(sv)) + { + WARN("Variable %s wasn't found in the pool.\n", debugstr_a(v->name)); + return E_INVALIDARG; + } + + if (!d3d10_effect_types_match(impl_from_ID3D10EffectVariable(sv)->type, v->type)) + { + WARN("Variable %s type does not match pool type.\n", debugstr_a(v->name)); + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr; @@ -2596,10 +2644,27 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d v->ID3D10EffectVariable_iface.lpVtbl = &d3d10_effect_variable_vtbl; v->buffer = &null_local_buffer; - if (FAILED(hr = parse_fx10_local_variable(data, data_size, &ptr, v))) + if (FAILED(hr = parse_fx10_object_variable(data, data_size, &ptr, FALSE, v))) return hr; } + for (i = 0; i < e->shared_object_count; ++i) + { + struct d3d10_effect_variable o = { 0 }; + + o.effect = e; + + if (FAILED(hr = parse_fx10_object_variable(data, data_size, &ptr, TRUE, &o))) + { + d3d10_effect_variable_destroy(&o); + return hr; + } + + hr = d3d10_effect_validate_shared_variable(e, &o); + d3d10_effect_variable_destroy(&o); + if (FAILED(hr)) return hr; + } + for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; @@ -2644,8 +2709,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &unused); TRACE("Pool variable count: %u\n", unused); - read_dword(&ptr, &e->sharedobjects_count); - TRACE("Pool objects count: %u\n", e->sharedobjects_count); + read_dword(&ptr, &e->shared_object_count); + TRACE("Pool objects count: %u\n", e->shared_object_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -2683,6 +2748,12 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->anonymous_shader_count); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); + if (!e->pool && e->shared_object_count) + { + WARN("Effect requires a pool to load.\n"); + return E_FAIL; + } + return parse_fx10_body(e, ptr, data_size - (ptr - data)); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 9daf3faf8d0..5e54925abb2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6335,11 +6335,15 @@ cbuffer l_cb2 float f3; }; +shared BlendState s_blendstate; +shared Texture s_texture; +shared PixelShader ps; + technique10 tech_child { pass P0 { - SetPixelShader(NULL); + SetPixelShader(ps); SetVertexShader(NULL); SetGeometryShader(NULL); } @@ -6347,19 +6351,25 @@ technique10 tech_child #endif static DWORD fx_test_pool_child[] = { - 0x43425844, 0x5addae59, 0x62b6f327, 0x0ca7b6a5, 0x61338a81, 0x00000001, 0x00000198, 0x00000001, - 0x00000024, 0x30315846, 0x0000016c, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x22800afa, 0xe318151b, 0xcb3e7d52, 0x186ecbe3, 0x00000001, 0x00000249, 0x00000001, + 0x00000024, 0x30315846, 0x0000021d, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x000000f1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x62635f6c, 0x6f6c6600, 0x09007461, 0x01000000, 0x00000000, 0x04000000, 0x10000000, 0x04000000, 0x09000000, - 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x65740033, 0x635f6863, 0x646c6968, - 0x00305000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, - 0x00000002, 0x00000000, 0x00000004, 0x00000010, 0x00000000, 0x00000001, 0xffffffff, 0x00000000, - 0x0000002b, 0x0000000f, 0x0000002e, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000035, - 0x00000010, 0x00000000, 0x00000001, 0xffffffff, 0x00000000, 0x0000003b, 0x0000000f, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003e, 0x00000001, 0x00000000, 0x00000049, - 0x00000003, 0x00000000, 0x00000007, 0x00000000, 0x00000001, 0x0000004c, 0x00000006, 0x00000000, - 0x00000001, 0x00000058, 0x00000008, 0x00000000, 0x00000001, 0x00000064, + 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x6c420033, 0x53646e65, 0x65746174, + 0x00003e00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x625f7300, + 0x646e656c, 0x74617473, 0x65740065, 0x72757478, 0x00720065, 0x00020000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00090000, 0x5f730000, 0x74786574, 0x00657275, 0x65786950, 0x6168536c, + 0x00726564, 0x000000a0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, + 0x74007370, 0x5f686365, 0x6c696863, 0x30500064, 0x00000100, 0x00000200, 0x00000000, 0x00000100, + 0x00000200, 0x00000000, 0x00000400, 0x00001000, 0x00000000, 0x00000100, 0xffffff00, 0x000000ff, + 0x00002b00, 0x00000f00, 0x00002e00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003500, + 0x00001000, 0x00000000, 0x00000100, 0xffffff00, 0x000000ff, 0x00003b00, 0x00000f00, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00006500, 0x00004900, 0x00000000, 0xffffff00, + 0x000096ff, 0x00007a00, 0x00000000, 0xffffff00, 0x0000c8ff, 0x0000ac00, 0x00000000, 0xffffff00, + 0x0000cbff, 0x00000100, 0x00000000, 0x0000d600, 0x00000300, 0x00000000, 0x00000700, 0x00000000, + 0x00000200, 0x0000c800, 0x00000600, 0x00000000, 0x00000100, 0x0000d900, 0x00000800, 0x00000000, + 0x00000100, 0x0000e500, 0x00000000, }; static void test_effect_pool(void)

1 0

Connor McAdams : user32/tests: Add message to fix occasional failure in test_dialog_messages().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: e44e7673b9b5df256cad82c328fce0501fc26b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44e7673b9b5df256cad82c3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:23 2021 -0400 user32/tests: Add message to fix occasional failure in test_dialog_messages(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f81c1bf483c..66e6069da54 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14178,6 +14178,9 @@ static const struct message WmCreateDialogParamSeq_3[] = { { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|parent|optional, 0 }, + { WM_MOVE, sent|parent|optional }, + { WM_SIZE, sent|parent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent }, @@ -14211,6 +14214,7 @@ static const struct message WmCreateDialogParamSeq_4[] = { { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|parent|optional, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent },

1 0

Alexandre Julliard : ntdll: Return a cleaner Unix path for z: drive in wine_nt_to_unix_file_name().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: a851703ed79a4f42838c84a8d15234994999a98c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a851703ed79a4f42838c84a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 16:58:46 2021 +0200 ntdll: Return a cleaner Unix path for z: drive in wine_nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e6f813966a5..43e85b0c955 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3445,9 +3445,24 @@ NTSTATUS WINAPI wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char * if (buffer) { - if (*size > strlen(buffer)) strcpy( nameA, buffer ); + struct stat st1, st2; + char *name = buffer; + + /* remove dosdevices prefix for z: drive if it points to the Unix root */ + if (!strncmp( buffer, config_dir, strlen(config_dir) ) && + !strncmp( buffer + strlen(config_dir), "/dosdevices/z:/", 15 )) + { + char *p = buffer + strlen(config_dir) + 14; + *p = 0; + if (!stat( buffer, &st1 ) && !stat( "/", &st2 ) && + st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) + name = p; + *p = '/'; + } + + if (*size > strlen(name)) strcpy( nameA, name ); else status = STATUS_BUFFER_TOO_SMALL; - *size = strlen(buffer) + 1; + *size = strlen(name) + 1; free( buffer ); } free( redir.Buffer );

1 0

Jacek Caban : gdi32: Directly use ntdll in init_font_options.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cdc74b2d62d1c94005c46f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:08:46 2021 +0200 gdi32: Directly use ntdll in init_font_options. 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/font.c | 61 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f81af591e33..5fefa1ea01e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4137,37 +4137,42 @@ const struct gdi_dc_funcs font_driver = GDI_PRIORITY_FONT_DRV /* priority */ }; -static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) +static BOOL get_key_value( HKEY key, const char *name, DWORD *value ) { - WCHAR buf[12]; - DWORD count = sizeof(buf), type, err; + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[12 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; + DWORD count; - err = RegQueryValueExW( key, name, NULL, &type, (BYTE *)buf, &count ); - if (!err) + count = query_reg_ascii_value( key, name, info, sizeof(value_buffer) ); + if (count) { - if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); - else *value = wcstol( buf, NULL, 10 ); + if (info->Type == REG_DWORD) memcpy( value, info->Data, sizeof(*value) ); + else *value = wcstol( (const WCHAR *)info->Data, NULL, 10 ); } - return err; + return !!count; } -static void init_font_options(void) +static void init_font_options( HKEY hkcu ) { + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[20 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; HKEY key; - DWORD i, type, size, val, gamma = 1400; - WCHAR buffer[20]; + DWORD i, val, gamma = 1400; + + static const WCHAR desktop_keyW[] = + { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p' }; - size = sizeof(buffer); - if (!RegQueryValueExW( wine_fonts_key, L"AntialiasFakeBoldOrItalic", NULL, - &type, (BYTE *)buffer, &size) && type == REG_SZ && size >= 1) + if (query_reg_ascii_value( wine_fonts_key, "AntialiasFakeBoldOrItalic", + info, sizeof(value_buffer) ) && info->Type == REG_SZ) { - antialias_fakes = (wcschr(L"yYtT1", buffer[0]) != NULL); + static const WCHAR valsW[] = {'y','Y','t','T','1',0}; + antialias_fakes = (wcschr( valsW, *(const WCHAR *)info->Data ) != NULL); } - if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) + if ((key = reg_open_key( hkcu, desktop_keyW, sizeof(desktop_keyW) ))) { /* FIXME: handle vertical orientations even though Windows doesn't */ - if (!get_key_value( key, L"FontSmoothingOrientation", &val )) + if (get_key_value( key, "FontSmoothingOrientation", &val )) { switch (val) { @@ -4179,18 +4184,18 @@ static void init_font_options(void) break; } } - if (!get_key_value( key, L"FontSmoothing", &val ) && val /* enabled */) + if (get_key_value( key, "FontSmoothing", &val ) && val /* enabled */) { - if (!get_key_value( key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) + if (get_key_value( key, "FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) font_smoothing = subpixel_orientation; else font_smoothing = GGO_GRAY4_BITMAP; } - if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + if (get_key_value( key, "FontSmoothingGamma", &val ) && val) { gamma = min( max( val, 1000 ), 2200 ); } - RegCloseKey( key ); + NtClose( key ); } /* Calibrating the difference between the registry value and the Wine gamma value. @@ -6091,19 +6096,23 @@ void font_init(void) { OBJECT_ATTRIBUTES attr = { sizeof(attr) }; UNICODE_STRING name; - HANDLE mutex; + HANDLE mutex, hkcu; DWORD disposition; static WCHAR wine_font_mutexW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', '\\','_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_'}; + static const WCHAR wine_fonts_keyW[] = + {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; - if (RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Wine\\Fonts", 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &wine_fonts_key, NULL )) - return; + if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return; - init_font_options(); + wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); + if (wine_fonts_key) init_font_options( hkcu ); + NtClose( hkcu ); + if (!wine_fonts_key) return; update_codepage(); + if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; load_system_bitmap_fonts();

1 0

Nikolay Sivov : d3d10/effect: Implement IsOptimized().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 2cc6b3092de95eb25e856932f6f7d105906101a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc6b3092de95eb25e856932… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:13 2021 +0300 d3d10/effect: Implement IsOptimized(). 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/d3d10_private.h | 6 ++++++ dlls/d3d10/effect.c | 11 +++++++++-- dlls/d3d10/tests/effect.c | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 3c3c6fa7f58..e7ecfb73a64 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -256,6 +256,11 @@ struct d3d10_effect_anonymous_shader struct d3d10_effect_type type; }; +enum d3d10_effect_flags +{ + D3D10_EFFECT_OPTIMIZED = 0x1, +}; + /* ID3D10Effect */ struct d3d10_effect { @@ -282,6 +287,7 @@ struct d3d10_effect DWORD depthstencilview_count; DWORD used_shader_count; DWORD anonymous_shader_count; + DWORD flags; DWORD used_shader_current; DWORD anonymous_shader_current; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8246f288369..8aed914c909 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3531,6 +3531,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) FIXME("iface %p semi-stub!\n", iface); + if (effect->flags & D3D10_EFFECT_OPTIMIZED) + return S_OK; + for (i = 0; i < effect->used_shader_count; ++i) { v = effect->used_shaders[i]; @@ -3561,14 +3564,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) effect->techniques[i].name = NULL; } + effect->flags |= D3D10_EFFECT_OPTIMIZED; + return S_OK; } static BOOL STDMETHODCALLTYPE d3d10_effect_IsOptimized(ID3D10Effect *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); - return FALSE; + TRACE("iface %p.\n", iface); + + return !!(effect->flags & D3D10_EFFECT_OPTIMIZED); } const struct ID3D10EffectVtbl d3d10_effect_vtbl = diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 29773fc4582..9f377e80b17 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6017,6 +6017,7 @@ static void test_effect_optimize(void) ID3D10Device *device; ULONG refcount; HRESULT hr; + BOOL ret; if (!(device = create_device())) { @@ -6051,9 +6052,15 @@ static void test_effect_optimize(void) ok(!!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); ok(!!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); + ret = effect->lpVtbl->IsOptimized(effect); + ok(!ret, "Unexpected return value.\n"); + hr = effect->lpVtbl->Optimize(effect); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ret = effect->lpVtbl->IsOptimized(effect); + ok(ret, "Unexpected return value.\n"); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); @@ -6081,6 +6088,10 @@ static void test_effect_optimize(void) tech = effect->lpVtbl->GetTechniqueByName(effect, "Render"); ok(!tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n"); + /* Already optimized */ + hr = effect->lpVtbl->Optimize(effect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Jacek Caban : gdi32: Directly use ntdll in get_associated_charset_info.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 1262b1aeab42e5a1978bca53031b2aa295f0400d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1262b1aeab42e5a1978bca53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:04:56 2021 +0200 gdi32: Directly use ntdll in get_associated_charset_info. 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/font.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5fefa1ea01e..700a7e1c327 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -103,6 +103,17 @@ static const WCHAR system_link_keyW[] = '\\','S','y','s','t','e','m','L','i','n','k' }; +static const WCHAR associated_charset_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','F','o','n','t','A','s','s','o','c', + '\\','A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t' +}; + static const WCHAR software_config_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -4386,32 +4397,30 @@ static DWORD get_associated_charset_info(void) if (associated_charset == -1) { + char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[32 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; HKEY hkey; - WCHAR dataW[32]; - DWORD type, data_len; + + static const WCHAR yesW[] = {'y','e','s',0}; associated_charset = 0; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Control\\FontAssoc\\Associated Charset", &hkey)) + if (!(hkey = reg_open_key( NULL, associated_charset_keyW, sizeof(associated_charset_keyW) ))) return 0; - data_len = sizeof(dataW); - if (!RegQueryValueExW(hkey, L"ANSI(00)", NULL, &type, (LPBYTE)dataW, &data_len) && - type == REG_SZ && !wcsicmp(dataW, L"yes")) + if (query_reg_ascii_value( hkey, "ANSI(00)", info, sizeof(value_buffer) ) && + info->Type == REG_SZ && !wcsicmp( (const WCHAR *)info->Data, yesW )) associated_charset |= ASSOC_CHARSET_ANSI; - data_len = sizeof(dataW); - if (!RegQueryValueExW(hkey, L"OEM(FF)", NULL, &type, (LPBYTE)dataW, &data_len) && - type == REG_SZ && !wcsicmp(dataW, L"yes")) + if (query_reg_ascii_value( hkey, "OEM(FF)", info, sizeof(value_buffer) ) && + info->Type == REG_SZ && !wcsicmp( (const WCHAR *)info->Data, yesW )) associated_charset |= ASSOC_CHARSET_OEM; - data_len = sizeof(dataW); - if (!RegQueryValueExW(hkey, L"SYMBOL(02)", NULL, &type, (LPBYTE)dataW, &data_len) && - type == REG_SZ && !wcsicmp(dataW, L"yes")) + if (query_reg_ascii_value( hkey, "SYMBOL(02)", info, sizeof(value_buffer) ) && + info->Type == REG_SZ && !wcsicmp( (const WCHAR *)info->Data, yesW )) associated_charset |= ASSOC_CHARSET_SYMBOL; - RegCloseKey(hkey); + NtClose( hkey ); TRACE("associated_charset = %d\n", associated_charset); }

1 0

Connor McAdams : user32/tests: Fix existing winevents in test_defwinproc() message sequences.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 86198569f6b5c9f3a4d4a75488ea179abc4f6011 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86198569f6b5c9f3a4d4a754… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:21 2021 -0400 user32/tests: Fix existing winevents in test_defwinproc() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0f683e333a8..f968ea4c2b7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15973,8 +15973,8 @@ static void test_paintingloop(void) static const struct message NCRBUTTONDOWNSeq[] = { - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent }, { WM_CONTEXTMENU, sent, /*hwnd*/0, -1 }, { 0 }

1 0

Alexandre Julliard : ntdll: Add a __wine_unix_spawnvp syscall.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: c1b3d6eb108a85e4bc8262b86de5dff9600eeca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b3d6eb108a85e4bc8262b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 12:30:25 2021 +0200 ntdll: Add a __wine_unix_spawnvp syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 2 +- dlls/wow64/syscall.c | 19 +++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 7 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9837b09fd51..c822db14572 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1622,6 +1622,7 @@ # Unix interface @ stdcall -syscall __wine_unix_call(int64 long ptr) +@ stdcall -syscall __wine_unix_spawnvp(long ptr) @ cdecl __wine_set_unix_funcs(long ptr) @ cdecl __wine_init_unix_lib(long long ptr ptr) @ stdcall __wine_ctrl_routine(ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5e39209eddc..dfc0d4c9a09 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -344,6 +344,7 @@ static void * const syscalls[] = NtYieldExecution, __wine_dbg_write, __wine_unix_call, + __wine_unix_spawnvp, wine_nt_to_unix_file_name, wine_server_call, wine_server_fd_to_handle, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index f5b8b5315cd..1a53741de57 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -481,6 +481,59 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so } +/*********************************************************************** + * __wine_unix_spawnvp + */ +NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ) +{ + pid_t pid, wret; + int fd[2], status, err; + +#ifdef HAVE_PIPE2 + if (pipe2( fd, O_CLOEXEC ) == -1) +#endif + { + if (pipe(fd) == -1) return STATUS_TOO_MANY_OPENED_FILES; + fcntl( fd[0], F_SETFD, FD_CLOEXEC ); + fcntl( fd[1], F_SETFD, FD_CLOEXEC ); + } + + if (!(pid = fork())) + { + /* in child */ + close( fd[0] ); + signal( SIGPIPE, SIG_DFL ); + if (!wait) + { + if (!(pid = fork())) execvp( argv[0], argv ); /* in grandchild */ + if (pid > 0) _exit(0); /* exit child if fork succeeded */ + } + else execvp( argv[0], argv ); + + err = errno_to_status( errno ); + write( fd[1], &err, sizeof(err) ); + _exit(1); + } + close( fd[1] ); + + if (pid != -1) + { + while (pid != (wret = waitpid( pid, &status, 0 ))) + if (wret == -1 && errno != EINTR) break; + + if (read( fd[0], &err, sizeof(err) ) <= 0) /* if we read something, exec or second fork failed */ + { + if (pid == wret && WIFEXITED(status)) err = WEXITSTATUS(status); + else err = 255; /* abnormal exit with an abort or an interrupt */ + } + } + else err = errno_to_status( errno ); + + close( fd[0] ); + return err; +} + + /*********************************************************************** * fork_and_exec * diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e856a41865..0057a341525 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2854,7 +2854,7 @@ static LRESULT start_screensaver(void) if (!is_virtual_desktop()) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = _spawnvp( _P_DETACH, argv[0], argv ); + int pid = __wine_unix_spawnvp( (char **)argv, FALSE ); if (pid > 0) { TRACE( "started process %d\n", pid ); diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index cc2ab1c48b3..952b862a37d 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -284,6 +284,25 @@ NTSTATUS WINAPI wow64___wine_unix_call( UINT *args ) } +/********************************************************************** + * wow64___wine_unix_spawnvp + */ +NTSTATUS WINAPI wow64___wine_unix_spawnvp( UINT *args ) +{ + ULONG *argv32 = get_ptr( &args ); + int wait = get_ulong( &args ); + + unsigned int i, count = 0; + char **argv; + + while (argv32[count]) count++; + argv = Wow64AllocateTemp( (count + 1) * sizeof(*argv) ); + for (i = 0; i < count; i++) argv[i] = ULongToPtr( argv32[i] ); + argv[count] = NULL; + return __wine_unix_spawnvp( argv, wait ); +} + + /********************************************************************** * wow64_wine_server_call */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index be0ca780b9b..bc403dd6d31 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -245,6 +245,7 @@ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( __wine_dbg_write ) \ SYSCALL_ENTRY( __wine_unix_call ) \ + SYSCALL_ENTRY( __wine_unix_spawnvp ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_server_fd_to_handle ) \ diff --git a/include/winternl.h b/include/winternl.h index 9e96591ad8e..f119ce6f4f6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4603,6 +4603,7 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); +extern NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

Alexandre Julliard : winebrowser: Build with msvcrt.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 72449b76e8e40f1690762545fd2c0021647da140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72449b76e8e40f1690762545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 12:33:09 2021 +0200 winebrowser: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/Makefile.in | 2 +- programs/winebrowser/main.c | 227 +++++++++++++++------------------------ 2 files changed, 87 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72449b76e8e40f169076…

1 0

Jacek Caban : gdi32: Directly use ntdll in update_codepage.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 4dbc6a746814dbd5b84835540f8924170597efbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dbc6a746814dbd5b8483554… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:04:39 2021 +0200 gdi32: Directly use ntdll in update_codepage. 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/font.c | 128 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4dbc6a746814dbd5b848…

1 0