September 2021 - Wine-Commits

Eric Pouech : include/cvconst.h: Add enumeration for newest SymTag values.
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: dec1e46d0195530e888775544f2d717fa4bc625e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec1e46d0195530e88877554… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 28 17:21:49 2021 +0200 include/cvconst.h: Add enumeration for newest SymTag values. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 15 +++++++++++++-- include/cvconst.h | 14 +++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 29d8a5350a5..70719cf6b7c 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -62,9 +62,9 @@ static const char* symt_get_tag_str(DWORD tag) case SymTagBaseClass: return "SymTagBaseClass"; case SymTagFriend: return "SymTagFriend"; case SymTagFunctionArgType: return "SymTagFunctionArgType,"; - case SymTagFuncDebugStart: return "SymTagFuncDebugStart,"; + case SymTagFuncDebugStart: return "SymTagFuncDebugStart"; case SymTagFuncDebugEnd: return "SymTagFuncDebugEnd"; - case SymTagUsingNamespace: return "SymTagUsingNamespace,"; + case SymTagUsingNamespace: return "SymTagUsingNamespace"; case SymTagVTableShape: return "SymTagVTableShape"; case SymTagVTable: return "SymTagVTable"; case SymTagCustom: return "SymTagCustom"; @@ -72,6 +72,17 @@ static const char* symt_get_tag_str(DWORD tag) case SymTagCustomType: return "SymTagCustomType"; case SymTagManagedType: return "SymTagManagedType"; case SymTagDimension: return "SymTagDimension"; + case SymTagCallSite: return "SymTagCallSite"; + case SymTagInlineSite: return "SymTagInlineSite"; + case SymTagBaseInterface: return "SymTagBaseInterface"; + case SymTagVectorType: return "SymTagVectorType"; + case SymTagMatrixType: return "SymTagMatrixType"; + case SymTagHLSLType: return "SymTagHLSLType"; + case SymTagCaller: return "SymTagCaller"; + case SymTagCallee: return "SymTagCallee"; + case SymTagExport: return "SymTagExport"; + case SymTagHeapAllocationSite: return "SymTagHeapAllocationSite"; + case SymTagCoffGroup: return "SymTagCoffGroup"; default: return "---"; } } diff --git a/include/cvconst.h b/include/cvconst.h index 95fdc9c73e5..f90c61a57fa 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -55,6 +55,17 @@ enum SymTagEnum SymTagCustomType, SymTagManagedType, SymTagDimension, + SymTagCallSite, + SymTagInlineSite, + SymTagBaseInterface, + SymTagVectorType, + SymTagMatrixType, + SymTagHLSLType, + SymTagCaller, + SymTagCallee, + SymTagExport, + SymTagHeapAllocationSite, + SymTagCoffGroup, SymTagMax }; @@ -103,7 +114,8 @@ enum LocationType LocIsSlot, LocIsIlRel, LocInMetaData, - LocIsConstant + LocIsConstant, + LocTypeMax }; /* kind of SymTagData */

1 0

Nikolay Sivov : ole32/antimoniker: Fix argument handling in RelativePathTo().
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: 63769f7e33732e2b859211b64011efcad1fb8e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63769f7e33732e2b859211b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 28 15:56:28 2021 +0300 ole32/antimoniker: Fix argument handling in RelativePathTo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 17 ++++++----------- dlls/ole32/tests/moniker.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index c0937a8d903..28c4dd91ac5 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -438,20 +438,15 @@ static HRESULT WINAPI AntiMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker return MonikerCommonPrefixWith(iface, other, prefix); } -/****************************************************************************** - * AntiMoniker_RelativePathTo - ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) +static HRESULT WINAPI AntiMonikerImpl_RelativePathTo(IMoniker *iface, IMoniker *other, IMoniker **result) { - TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); + TRACE("%p, %p, %p.\n", iface, other, result); - if (ppmkRelPath==NULL) - return E_POINTER; - - IMoniker_AddRef(pmOther); + if (!other || !result) + return E_INVALIDARG; - *ppmkRelPath=pmOther; + IMoniker_AddRef(other); + *result = other; return MK_S_HIM; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7f0b9ec5841..95e4b865467 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3026,6 +3026,35 @@ todo_wine IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); + + /* RelativePathTo() */ + moniker = create_antimoniker(1); + hr = create_moniker_from_desc("I1", &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_RelativePathTo(moniker, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_RelativePathTo(moniker, NULL, &moniker3); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_RelativePathTo(moniker, moniker2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_RelativePathTo(moniker, moniker2, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected object.\n"); + IMoniker_Release(moniker3); + IMoniker_Release(moniker2); + + moniker2 = create_antimoniker(2); + hr = IMoniker_RelativePathTo(moniker, moniker2, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected object.\n"); + IMoniker_Release(moniker3); + hr = IMoniker_RelativePathTo(moniker2, moniker, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected object.\n"); + IMoniker_Release(moniker3); + + IMoniker_Release(moniker2); + IMoniker_Release(moniker); } static void test_generic_composite_moniker(void)

1 0

Zebediah Figura : d3d8/tests: Add a stress test for dynamic buffer maps.
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: 53d3d0b25ff9af22fbaa89ed0fa2d2a559fca93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=53d3d0b25ff9af22fbaa89ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 17:04:51 2021 -0500 d3d8/tests: Add a stress test for dynamic buffer maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f25549388d0..df4dd0029a6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -263,6 +263,34 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) } } +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) +static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color) +{ + D3DCOLOR color = 0xdeadbeef; + struct surface_readback rb; + D3DSURFACE_DESC desc; + unsigned int x, y; + HRESULT hr; + + hr = IDirect3DSurface8_GetDesc(rt, &desc); + ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + for (y = 0; y < desc.Height; ++y) + { + for (x = 0; x < desc.Width; ++x) + { + color = get_readback_color(&rb, x, y) & 0x00ffffff; + if (color != expected_color) + break; + } + if (color != expected_color) + break; + } + release_surface_readback(&rb); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -11157,6 +11185,113 @@ static void test_sample_mask(void) DestroyWindow(window); } +struct dynamic_vb_vertex +{ + struct vec3 position; + DWORD diffuse; +}; + +static void fill_dynamic_vb_quad(struct dynamic_vb_vertex *quad, unsigned int x, unsigned int y) +{ + unsigned int i; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].position.x = quad[1].position.x = -1.0f + 0.01f * x; + quad[2].position.x = quad[3].position.x = -1.0f + 0.01f * (x + 1); + + quad[0].position.y = quad[2].position.y = -1.0f + 0.01f * y; + quad[1].position.y = quad[3].position.y = -1.0f + 0.01f * (y + 1); + + for (i = 0; i < 4; ++i) + quad[i].diffuse = 0xff00ff00; +} + +static void test_dynamic_map_synchronization(void) +{ + IDirect3DVertexBuffer8 *buffer; + IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; + unsigned int x, y; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *data; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), + D3DUSAGE_DYNAMIC, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(struct dynamic_vb_vertex)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (y = 0; y < 200; ++y) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data, 0, y); + + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (x = 1; x < 200; ++x) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 4 * sizeof(struct dynamic_vb_vertex) * x, + 4 * sizeof(struct dynamic_vb_vertex), &data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data, x, y); + + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 4 * x, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + } + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#x.\n", hr); + check_rt_color(rt, 0x0000ff00); + IDirect3DSurface8_Release(rt); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -11235,4 +11370,5 @@ START_TEST(visual) test_alphatest(); test_desktop_window(); test_sample_mask(); + test_dynamic_map_synchronization(); }

1 0

Alexandre Julliard : tools: Add helper functions to spawn a command from an strarray.
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: 2a08d6ce8086baf62f687fa664cc3995ba8cb11b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a08d6ce8086baf62f687fa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 28 18:18:49 2021 +0200 tools: Add helper functions to spawn a command from an strarray. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/tools.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/utils.c | 8 ++------ tools/winegcc/utils.c | 21 ++++----------------- 3 files changed, 54 insertions(+), 23 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index bfbbb60b9e8..7c0f4c20a42 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -25,6 +25,18 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#include <errno.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#if defined(_WIN32) && !defined(__CYGWIN__) +# include <process.h> +#else +# include <sys/wait.h> +# include <unistd.h> +#endif #if !defined(__GNUC__) && !defined(__attribute__) #define __attribute__(x) @@ -200,5 +212,41 @@ static inline const char *strarray_bsearch( const struct strarray *array, const return res ? *res : NULL; } +static inline void strarray_trace( struct strarray args ) +{ + unsigned int i; + + for (i = 0; i < args.count; i++) + { + if (strpbrk( args.str[i], " \t\n\r")) printf( "\"%s\"", args.str[i] ); + else printf( "%s", args.str[i] ); + putchar( i < args.count - 1 ? ' ' : '\n' ); + } +} + +static inline int strarray_spawn( struct strarray args ) +{ +#if defined(_WIN32) && !defined(__CYGWIN__) + strarray_add( &args, NULL ); + return _spawnvp( _P_WAIT, args.str[0], args.str ); +#else + pid_t pid, wret; + int status; + + if (!(pid = fork())) + { + strarray_add( &args, NULL ); + execvp( args.str[0], (char **)args.str ); + _exit(1); + } + if (pid == -1) return -1; + + while (pid != (wret = waitpid( pid, &status, 0 ))) + if (wret == -1 && errno != EINTR) break; + + if (pid == wret && WIFEXITED(status)) return WEXITSTATUS(status); + return 255; /* abnormal exit with an abort or an interrupt */ +#endif +} #endif /* __WINE_TOOLS_H */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index f6468312902..de0d26ddba6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -206,17 +206,13 @@ static const char *find_binary( const char *prefix, const char *name ) void spawn( struct strarray args ) { - unsigned int i; int status; const char *argv0 = find_binary( NULL, args.str[0] ); if (argv0) args.str[0] = argv0; - strarray_add( &args, NULL ); - if (verbose) - for (i = 0; args.str[i]; i++) - fprintf( stderr, "%s%c", args.str[i], args.str[i+1] ? ' ' : '\n' ); + if (verbose) strarray_trace( args ); - if ((status = _spawnvp( _P_WAIT, args.str[0], args.str ))) + if ((status = strarray_spawn( args ))) { if (status > 0) fatal_error( "%s failed with status %u\n", args.str[0], status ); else fatal_perror( "winebuild" ); diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 95764289391..4fc315db69e 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -197,27 +197,14 @@ const char *find_binary( struct strarray prefix, const char *name ) int spawn(struct strarray prefix, struct strarray args, int ignore_errors) { - unsigned int i; int status; - const char** argv; - - strarray_add( &args, NULL); - argv = args.str; - argv[0] = find_binary( prefix, argv[0] ); - if (verbose) - { - for(i = 0; argv[i]; i++) - { - if (strpbrk(argv[i], " \t\n\r")) printf("\"%s\" ", argv[i]); - else printf("%s ", argv[i]); - } - printf("\n"); - } + args.str[0] = find_binary( prefix, args.str[0] ); + if (verbose) strarray_trace( args ); - if ((status = _spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) + if ((status = strarray_spawn( args )) && !ignore_errors) { - if (status > 0) error("%s failed\n", argv[0]); + if (status > 0) error("%s failed\n", args.str[0]); else perror("winegcc"); exit(3); }

1 0

Rémi Bernon : dinput: Remove unusual HID joystick button count FIXMEs.
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: e4766cad6d25451ecc4b1248933329204ad80098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4766cad6d25451ecc4b1248… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 28 09:30:15 2021 +0200 dinput: Remove unusual HID joystick button count FIXMEs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a8f8077863b..29cb8990689 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -359,9 +359,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, TRACE( "Ignoring input button %s, usage page not implemented.\n", debugstr_hid_caps( &caps ) ); else if (caps.button->IsRange) { - if (caps.button->NotRange.Usage >= 128) - FIXME( "Ignoring input button %s, too many buttons.\n", debugstr_hid_caps( &caps ) ); - else for (j = caps.button->Range.UsageMin; j <= caps.button->Range.UsageMax; ++j) + for (j = caps.button->Range.UsageMin; j <= caps.button->Range.UsageMax; ++j) { instance.dwOfs = button_ofs + (j - caps.button->Range.UsageMin); instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); @@ -375,8 +373,6 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, if (ret != DIENUM_CONTINUE) return ret; } } - else if (caps.button->NotRange.Usage >= 128) - FIXME( "Ignoring input button %s, too many buttons.\n", debugstr_hid_caps( &caps ) ); else { instance.dwOfs = button_ofs;

1 0

Nikolay Sivov : ole32/itemmoniker: Fix argument handling in RelativePathTo().
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: 19df4c56c4ef597f6cd94a95b11ea4c86b5f0926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19df4c56c4ef597f6cd94a95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 28 15:56:29 2021 +0300 ole32/itemmoniker: Fix argument handling in RelativePathTo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 13 +++++-------- dlls/ole32/tests/moniker.c | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 770b042aac7..1ab9c52dbfb 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -714,17 +714,14 @@ static HRESULT WINAPI ItemMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker return MonikerCommonPrefixWith(iface, other, prefix); } -/****************************************************************************** - * ItemMoniker_RelativePathTo - ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) +static HRESULT WINAPI ItemMonikerImpl_RelativePathTo(IMoniker *iface, IMoniker *other, IMoniker **result) { - TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); + TRACE("%p, %p, %p.\n", iface, other, result); - if (ppmkRelPath==NULL) - return E_POINTER; + if (!other || !result) + return E_INVALIDARG; - *ppmkRelPath=0; + *result = NULL; return MK_E_NOTBINDABLE; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 95e4b865467..a9660354b01 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2376,7 +2376,7 @@ static void test_item_moniker(void) "Moniker_IsRunning", NULL }; - IMoniker *moniker, *moniker2, *moniker3, *reduced, *anti, *inverse, *c; + IMoniker *moniker, *moniker1, *moniker2, *moniker3, *reduced, *anti, *inverse, *c; DWORD i, hash, eaten, cookie; HRESULT hr; IBindCtx *bindctx; @@ -2757,6 +2757,26 @@ todo_wine IMoniker_Release(moniker2); IMoniker_Release(moniker); + + /* RelativePathTo() */ + hr = create_moniker_from_desc("I1", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = create_moniker_from_desc("I2", &moniker1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_RelativePathTo(moniker, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_RelativePathTo(moniker, NULL, &moniker2); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_RelativePathTo(moniker, moniker1, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + moniker2 = (void *)0xdeadbeef; + hr = IMoniker_RelativePathTo(moniker, moniker1, &moniker2); + ok(hr == MK_E_NOTBINDABLE, "Unexpected hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + + IMoniker_Release(moniker1); + IMoniker_Release(moniker); } static void stream_write_dword(IStream *stream, DWORD value)

1 0

Eric Pouech : dbghelp/dwarf: Downgrade FIXME into WARN for empty range.
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: 0de0a80940ac02dbe8838fb9658eaf361ca86315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de0a80940ac02dbe8838fb9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 28 17:21:18 2021 +0200 dbghelp/dwarf: Downgrade FIXME into WARN for empty range. It happens to be generated for some inline functions, that we badly support yet. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0397ffe90b2..f05186eb9c0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1236,7 +1236,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (high > *phigh) *phigh = high; } if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} - if (*plow == *phigh) {FIXME("entry found, but low=high\n"); return FALSE;} + if (*plow == *phigh) {WARN("entry found, but low=high %lx %lx\n", low, high); return FALSE;} return TRUE; } @@ -2002,7 +2002,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) { - FIXME("cannot read range\n"); + WARN("cannot read range\n"); return; }

1 0

Jan Sikorski : wined3d: Record a state reset on the first command list.
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: 8a7e6cf1665a656b422590ce1d07bcd37b93bb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a7e6cf1665a656b422590ce… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Sep 28 12:54:53 2021 +0200 wined3d: Record a state reset on the first command list. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 23 +++++++++++++++++++++++ dlls/wined3d/cs.c | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0f8e59573ed..d8c10ab054c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32888,6 +32888,29 @@ static void test_deferred_context_rendering(void) ID3D11CommandList_Release(list1); ID3D11DeviceContext_Release(deferred); + /* Command lists do not inherit state from the immediate context. */ + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetBlendState(immediate, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + /* The clearing of state done by FinishCommandList is captured by a * subsequent call to FinishCommandList... */ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1f03833e0ed..2d295d4660e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3637,6 +3637,10 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str object->c.ops = &wined3d_deferred_context_ops; object->c.device = device; + /* Make sure the first command list gets the state reset when executed. + * Resets for subsequent command lists are encoded in wined3d_deferred_context_record_command_list(). */ + wined3d_device_context_emit_reset_state(&object->c, true); + TRACE("Created deferred context %p.\n", object); *context = &object->c;

1 0

Zebediah Figura : krnl386: Print %bp, %ss, and %sp for register functions in relay_call_from_16().
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: f0328650cd325ade7baae4ae8585246d0d4829ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0328650cd325ade7baae4ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 28 11:27:01 2021 -0500 krnl386: Print %bp, %ss, and %sp for register functions in relay_call_from_16(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/relay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 6eab9970a90..3559bb460a7 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -538,10 +538,10 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte if (!j) /* register function */ { args32[nb_args++] = (int)context; - TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x ds=%04x es=%04x efl=%08x\n", + TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x bp=%04x ss:sp=%04x:%04x ds=%04x es=%04x efl=%08x\n", frame->cs, frame->ip, (WORD)context->Eax, (WORD)context->Ebx, (WORD)context->Ecx, - (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi, (WORD)context->SegDs, - (WORD)context->SegEs, context->EFlags ); + (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi, (WORD)context->Ebp, + (WORD)context->SegSs, (WORD)context->Esp, (WORD)context->SegDs, (WORD)context->SegEs, context->EFlags ); } else TRACE( ") ret=%04x:%04x ds=%04x\n", frame->cs, frame->ip, frame->ds );

1 0

Rémi Bernon : dinput: Implement HID joystick DIPROP_(DEADZONE|SATURATION|GRANULARITY).
by Alexandre Julliard Sept. 28, 2021

Sept. 28, 2021

Module: wine Branch: master Commit: 5eb65418eb5e02963efd028256b71b220c7b1f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb65418eb5e02963efd0282… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 28 09:30:13 2021 +0200 dinput: Implement HID joystick DIPROP_(DEADZONE|SATURATION|GRANULARITY). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 119 ++++++++++++++++++++++++++++++++++++++++++--- dlls/dinput8/tests/hid.c | 30 ------------ 2 files changed, 113 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5eb65418eb5e02963efd…

1 0