September 2018 - Wine-Devel

[PATCH 3/5] wined3d: Accept "renderer" in addition to "DirectDrawRenderer".

by Henri Verbeet

Even though the "gdi" renderer is mainly used for ddraw, wined3d itself has no knowledge of ddraw. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f8a84a17adb..3537a4884fe 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -307,7 +307,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size) + if ((!get_config_key(hkey, appkey, "renderer", buffer, size) + || !get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size)) && !strcmp(buffer, "gdi")) { TRACE("Disabling 3D support.\n"); -- 2.11.0

Sept. 21, 2018

[PATCH 2/5] d3d9/tests: Properly check whether creating a device succeeded in test_flip().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9c3e83d3005..4f26b0d23f9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20984,9 +20984,8 @@ static void test_flip(void) present_parameters.Windowed = TRUE; present_parameters.BackBufferCount = 3; present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); - if (!device) + if (FAILED(hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D9_Release(d3d); -- 2.11.0

Sept. 21, 2018

[PATCH 1/5] d3d8/tests: Properly check whether creating a device succeeded in test_flip().

by Henri Verbeet

Perhaps CreateDevice() should clear the pointer on failure, but that's not documented behaviour, and Wine currently doesn't. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 24481bd0533..e8e6bf870e2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8154,9 +8154,8 @@ static void test_flip(void) present_parameters.Windowed = TRUE; present_parameters.BackBufferCount = 3; present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; - hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); - if (!device) + if (FAILED(hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d); -- 2.11.0

Sept. 21, 2018

[PATCH] dbghelp/dwarf: Use debugstr_a() to trace external strings.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/dwarf.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 31c008a..26e2f42 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -568,7 +568,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, case DW_FORM_string: attr->u.string = (const char *)data; - TRACE("string<%s>\n", attr->u.string); + TRACE("string<%s>\n", debugstr_a(attr->u.string)); break; case DW_FORM_strp: @@ -576,7 +576,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, unsigned long offset = dwarf2_get_u4(data); attr->u.string = (const char*)ctx->sections[section_string].address + offset; } - TRACE("strp<%s>\n", attr->u.string); + TRACE("strp<%s>\n", debugstr_a(attr->u.string)); break; case DW_FORM_block: @@ -1613,7 +1613,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, struct attribute ext; TRACE("found parameter %s (kind=%d, offset=%ld, reg=%d) at %s\n", - name.u.string, loc.kind, loc.offset, loc.reg, + debugstr_a(name.u.string), loc.kind, loc.offset, loc.reg, dwarf2_debug_ctx(subpgm->ctx)); switch (loc.kind) @@ -1648,8 +1648,8 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, else if (dwarf2_find_attribute(subpgm->ctx, di, DW_AT_const_value, &value)) { VARIANT v; - if (subpgm->func) WARN("Unsupported constant %s in function\n", name.u.string); - if (is_pmt) FIXME("Unsupported constant (parameter) %s in function\n", name.u.string); + if (subpgm->func) WARN("Unsupported constant %s in function\n", debugstr_a(name.u.string)); + if (is_pmt) FIXME("Unsupported constant (parameter) %s in function\n", debugstr_a(name.u.string)); switch (value.form) { case DW_FORM_data1: @@ -1699,7 +1699,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, default: FIXME("Unsupported form for const value %s (%lx)\n", - name.u.string, value.form); + debugstr_a(name.u.string), value.form); v.n1.n2.vt = VT_EMPTY; } di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->ctx->compiland, @@ -1718,7 +1718,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, } else { - WARN("dropping global variable %s which has been optimized away\n", name.u.string); + WARN("dropping global variable %s which has been optimized away\n", debugstr_a(name.u.string)); } } if (is_pmt && subpgm->func && subpgm->func->type) @@ -1933,7 +1933,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, } if (!dwarf2_read_range(ctx, di, &low_pc, &high_pc)) { - WARN("cannot get range for %s\n", name.u.string); + WARN("cannot get range for %s\n", debugstr_a(name.u.string)); return NULL; } /* As functions (defined as inline assembly) get debug info with dwarf @@ -2173,7 +2173,7 @@ static void dwarf2_set_line_number(struct module* module, unsigned long address, if (!file || !(psrc = vector_at(v, file - 1))) return; TRACE("%s %lx %s %u\n", - debugstr_w(module->module.ModuleName), address, source_get(module, *psrc), line); + debugstr_w(module->module.ModuleName), address, debugstr_a(source_get(module, *psrc)), line); if (!(symt = symt_find_nearest(module, address)) || symt->symt.tag != SymTagFunction) return; func = (struct symt_function*)symt; @@ -2234,7 +2234,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { const char* rel = (const char*)traverse.data; unsigned rellen = strlen(rel); - TRACE("Got include %s\n", rel); + TRACE("Got include %s\n", debugstr_a(rel)); traverse.data += rellen + 1; p = vector_add(&dirs, &ctx->pool); @@ -2268,7 +2268,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, mod_time = dwarf2_leb128_as_unsigned(&traverse); length = dwarf2_leb128_as_unsigned(&traverse); dir = *(const char**)vector_at(&dirs, dir_index); - TRACE("Got file %s/%s (%u,%lu)\n", dir, name, mod_time, length); + TRACE("Got file %s/%s (%u,%lu)\n", debugstr_a(dir), debugstr_a(name), mod_time, length); psrc = vector_add(&files, &ctx->pool); *psrc = source_new(ctx->module, dir, name); } @@ -2339,7 +2339,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, address = ctx->load_offset + dwarf2_parse_addr(&traverse); break; case DW_LNE_define_file: - FIXME("not handled define file %s\n", traverse.data); + FIXME("not handled define file %s\n", debugstr_a((char *)traverse.data)); traverse.data += strlen((const char *)traverse.data) + 1; dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse); @@ -2522,7 +2522,7 @@ static enum location_error loc_compute_frame(struct process* pcs, *frame = *pframe; break; case loc_dwarf2_location_list: - WARN("Searching loclist for %s\n", func->hash_elt.name); + WARN("Searching loclist for %s\n", debugstr_a(func->hash_elt.name)); if (!dwarf2_lookup_loclist(modfmt, modfmt->u.dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) @@ -2668,7 +2668,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL; - TRACE("\tparsing augmentation %s\n", augmentation); + TRACE("\tparsing augmentation %s\n", debugstr_a(augmentation)); if (*augmentation) do { switch (*augmentation) @@ -3325,7 +3325,7 @@ static void dwarf2_location_compute(struct process* pcs, if (!func->container || func->container->tag != SymTagCompiland) { - WARN("We'd expect function %s's container to exist and be a compiland\n", func->hash_elt.name); + WARN("We'd expect function %s's container to exist and be a compiland\n", debugstr_a(func->hash_elt.name)); err = loc_err_internal; } else @@ -3400,7 +3400,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, if (sz <= 12 || memcmp(sect, "ZLIB", 4)) { - ERR("invalid compressed section %s\n", zsectname); + ERR("invalid compressed section %s\n", debugstr_a(zsectname)); goto out; } @@ -3425,7 +3425,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, res = inflateInit(&z); if (res != Z_OK) { - FIXME("inflateInit failed with %i / %s\n", res, z.msg); + FIXME("inflateInit failed with %i / %s\n", res, debugstr_a(z.msg)); goto out_free; } @@ -3437,7 +3437,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, if (res != Z_STREAM_END) { - FIXME("Decompression failed with %i / %s\n", res, z.msg); + FIXME("Decompression failed with %i / %s\n", res, debugstr_a(z.msg)); goto out_end; } -- 2.7.4

Sept. 21, 2018

Re: [PATCH 4/4] quartz/filtergraph: Return VFW_E_CANNOT_CONNECT from FilterGraph2_Connect() on failure.

by Alexandre Julliard

Zebediah Figura <z.figura12(a)gmail.com> writes: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/quartz/filtergraph.c | 2 +- > dlls/quartz/tests/filtergraph.c | 3 --- > 2 files changed, 1 insertion(+), 4 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M qcap.dll -p qcap_test.exe.so smartteefilter && touch smartteefilter.ok smartteefilter.c:1570: Test failed: connecting Capture pin without first connecting Input pin returned 0x80040217 smartteefilter.c:1572: Test failed: connecting Preview pin without first connecting Input pin returned 0x80040217 make: *** [Makefile:227: smartteefilter.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

Sept. 21, 2018

Re: [PATCH] msvcp90: Remove unnecessary check for __arm__.

by André Hentschel

Am 21.09.2018 um 15:33 schrieb Huw Davies: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/msvcp90/misc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c > index 0d1a74e250..ef0212958f 100644 > --- a/dlls/msvcp90/misc.c > +++ b/dlls/msvcp90/misc.c > @@ -618,7 +618,7 @@ unsigned int __cdecl _Random_device(void) > #endif > > #if _MSVCP_VER >= 110 > -#if defined(__i386__) && !defined(__arm__) > +#if defined(__i386__) > > extern void *call_thiscall_func; > __ASM_GLOBAL_FUNC(call_thiscall_func, > Signed-off-by: André Hentschel <nerv(a)dawncrow.de>

Sept. 21, 2018

Re: [PATCH] wine.inf: Add a ProfileList\<UserSID> registry subkey.

by Alex Henrie

On Fri, Sep 21, 2018 at 10:47 AM Alexandre Julliard <julliard(a)winehq.org> wrote: > > Alex Henrie <alexhenrie24(a)gmail.com> writes: > > > @@ -527,6 +527,8 @@ HKLM,%CurrentVersionNT%\Perflib,,16 > > HKLM,%CurrentVersionNT%\Ports,,16 > > HKLM,%CurrentVersionNT%\Print,,16 > > HKLM,%CurrentVersionNT%\ProfileList,,16 > > +; Update/Replace if local_user_sid in server/token.c changes > > +HKLM,%CurrentVersionNT%\ProfileList\S-1-5-21-0-0-0-1000,,16 > > It would be better to create this dynamically in some appropriate place > instead of hardcoding the SID in wine.inf. OK. Is wineboot the right place to create this key? -Alex

Sept. 21, 2018

[PATCH] dwmapi: return S_OK in DwmExtendFrameIntoClientArea

by Louis Lenders

Fix for bug 4583 To: wine-devel <wine-devel(a)winehq.org> (Note:also tested Steam that calls this function and didn`t see any negative side-effect of returning S_OK) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 0e6ba3bed1..76e225f791 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -82,7 +82,7 @@ HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) { FIXME("(%p, %p) stub\n", hwnd, margins); - return E_NOTIMPL; + return S_OK; } /********************************************************************** -- 2.17.1

Sept. 21, 2018

Re: [PATCH] wine.inf: Add a ProfileList\<UserSID> registry subkey.

by Alexandre Julliard

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -527,6 +527,8 @@ HKLM,%CurrentVersionNT%\Perflib,,16 > HKLM,%CurrentVersionNT%\Ports,,16 > HKLM,%CurrentVersionNT%\Print,,16 > HKLM,%CurrentVersionNT%\ProfileList,,16 > +; Update/Replace if local_user_sid in server/token.c changes > +HKLM,%CurrentVersionNT%\ProfileList\S-1-5-21-0-0-0-1000,,16 It would be better to create this dynamically in some appropriate place instead of hardcoding the SID in wine.inf. -- Alexandre Julliard julliard(a)winehq.org

Sept. 21, 2018

Re: [PATCH v2 5/8] shell32/autocomplete: Send messages directly to the edit control's procedure

by Gabriel Ivăncescu

On Fri, Sep 21, 2018 at 5:33 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > If it turns out that GetPropW is a bottleneck (very unlikely), it can be > optimized in various ways. Please don't obfuscate the code in an attempt > to make things faster where it doesn't matter. > > -- > Alexandre Julliard > julliard(a)winehq.org Well of course I wouldn't have messed with GetPropW, just replace SendMessage with calling the edit control's procedure directly (because ultimately that's what we ask it, for its data). I personally don't think that's such an obfuscation or actually an obfuscation at all, since it's crystal clear still to what the purpose is (and personally, to me, makes more sense to ask the edit control directly). However, I'll keep it as SendMessage then, unless you change your mind :-) I was just clarifying my reasoning before in respect to where the wineserver call was. A little bonus I guess is that it will also work again with hijacking just like on Windows.

Sept. 21, 2018