November 2018 - Wine-devel - list.winehq.org

[PATCH] winmm: Attempt only once to load the default joystick driver
by Baruch Rutman 12 Nov '18

12 Nov '18

Reduce disk usage by preventing frequent calls to load an non-existant driver. ReactOS issue: https://jira.reactos.org/browse/CORE-15336 Signed-off-by: Baruch Rutman <peterooch(a)gmail.com> --- dlls/winmm/joystick.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 8a52942ca6..5a12b3685b 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -68,12 +68,21 @@ static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; */ static BOOL JOY_LoadDriver(DWORD dwJoyID) { - if (dwJoyID >= MAXJOYSTICK) + static BOOL winejoystick_missing = FALSE; + + if (dwJoyID >= MAXJOYSTICK || winejoystick_missing) return FALSE; if (JOY_Sticks[dwJoyID].hDriver) return TRUE; JOY_Sticks[dwJoyID].hDriver = OpenDriverA("winejoystick.drv", 0, dwJoyID); + + if (!JOY_Sticks[dwJoyID].hDriver) + { + /* The default driver is missing, don't attempt to load it again */ + winejoystick_missing = TRUE; + } + return (JOY_Sticks[dwJoyID].hDriver != 0); } -- 2.19.1.windows.1

2 1

[PATCH] server: Do not signal violently terminated threads until they are really gone
by Gabriel Ivăncescu 12 Nov '18

12 Nov '18

From: Sebastian Lackner <sebastian(a)fds-team.de> When a thread is terminated violently (such as by using TerminateThread) that is not the current thread, the server sends a signal to the thread to terminate it, but it immediately wakes up anything waiting on it. The caller can expect WaitForSingleObject (or similar) to return when the thread is really gone and doesn't execute anything anymore, and this is exactly what happens on Windows. If that thread was altering global state, and the thread that was waiting on it will read (or alter) the global state *after* waiting for it and expecting it to not change (because it assumes the thread is terminated by that point, as on Windows), the result will be a race condition, since there's no guarantee currently that the terminated thread really stopped executing. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Trying to upstream a wine-staging patch properly. This affects MSYS2 apps and Cygwin under Wine. The known side-effects of this bug have been fixed with this iteration on it, which only waits if the thread was terminated violently (otherwise, it doesn't matter) so it removes the impact it has on most apps. In other words, I can confirm that https://bugs.winehq.org/show_bug.cgi?id=41107 is no longer a side-effect issue with this version of the patch. So that bug can be also marked fixed (though it affects only wine-staging). Note that I tried different methods to get rid of the polling because it's ugly, but none worked. POSIX or Linux really don't seem to offer any functionality to wait on an arbitrary (non-child) thread or process, which really sucks. As for test-cases: I'm really not sure how to test race conditions reliably. I did a bunch of simple tests but all passed even without the patch on my machine, so it's quite difficult to have reliable failures (maybe sending SIGQUIT was much faster than the round trip back from the wineserver, by happenstance). However, it's clear that no wait is being done so just relying on luck like currently is not ideal, either. server/thread.c | 32 +++++++++++++++++++++++++++++--- server/thread.h | 1 + 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index 7162fc3..372882f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -199,6 +199,7 @@ static inline void init_thread_structure( struct thread *thread ) thread->suspend = 0; thread->desktop_users = 0; thread->token = NULL; + thread->exit_poll = NULL; thread->creation_time = current_time; thread->exit_time = 0; @@ -347,6 +348,7 @@ static void destroy_thread( struct object *obj ) list_remove( &thread->entry ); cleanup_thread( thread ); release_object( thread->process ); + if (thread->exit_poll) remove_timeout_user( thread->exit_poll ); if (thread->id) free_ptid( thread->id ); if (thread->token) release_object( thread->token ); } @@ -364,7 +366,7 @@ static void dump_thread( struct object *obj, int verbose ) static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) { struct thread *mythread = (struct thread *)obj; - return (mythread->state == TERMINATED); + return mythread->state == TERMINATED && !mythread->exit_poll; } static unsigned int thread_map_access( struct object *obj, unsigned int access ) @@ -1125,6 +1127,26 @@ int thread_get_inflight_fd( struct thread *thread, int client ) return -1; } +static void check_terminated( void *arg ) +{ + struct thread *thread = arg; + assert( thread->obj.ops == &thread_ops ); + assert( thread->state == TERMINATED ); + + /* don't wake up until the thread is really dead, to avoid race conditions */ + if (thread->unix_tid != -1 && !kill( thread->unix_tid, 0 )) + { + thread->exit_poll = add_timeout_user( -TICKS_PER_SEC / 1000, check_terminated, thread ); + return; + } + + /* grab reference since object can be destroyed while trying to wake up */ + grab_object( &thread->obj ); + thread->exit_poll = NULL; + wake_up( &thread->obj, 0 ); + release_object( &thread->obj ); +} + /* kill a thread on the spot */ void kill_thread( struct thread *thread, int violent_death ) { @@ -1145,8 +1167,12 @@ void kill_thread( struct thread *thread, int violent_death ) kill_console_processes( thread, 0 ); debug_exit_thread( thread ); abandon_mutexes( thread ); - wake_up( &thread->obj, 0 ); - if (violent_death) send_thread_signal( thread, SIGQUIT ); + if (violent_death) + { + send_thread_signal( thread, SIGQUIT ); + check_terminated( thread ); + } + else wake_up( &thread->obj, 0 ); cleanup_thread( thread ); remove_process_thread( thread->process, thread ); release_object( thread ); diff --git a/server/thread.h b/server/thread.h index e4332df..1b01c68 100644 --- a/server/thread.h +++ b/server/thread.h @@ -89,6 +89,7 @@ struct thread timeout_t creation_time; /* Thread creation time */ timeout_t exit_time; /* Thread exit time */ struct token *token; /* security token associated with this thread */ + struct timeout_user *exit_poll; /* poll if the thread/process has exited already */ }; struct thread_snapshot -- 2.19.1

1 0

[PATCH v3 1/3] gdi32: Specify the hinting algorithms to apply explicitly.
by Byeongsik Jeon 12 Nov '18

12 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- As a result of analyzing the native Tahoma font in the ftview, I realized that the bug #41639 is a result of not specifying the appropriate hinting algorithm. https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#F… --- .. values to select a specific hinting algorithm for the hinter. .. You can use a hinting algorithm that doesn't correspond to the same rendering mode. As an example, it is possible to use the ‘light’ hinting algorithm and have the results rendered in horizontal LCD pixel mode, with code like FT_Load_Glyph( face, glyph_index, load_flags | FT_LOAD_TARGET_LIGHT ); FT_Render_Glyph( face->glyph, FT_RENDER_MODE_LCD ); --- FT_LOAD_TARGET_NORMAL is 0. So, we have been applying FT_LOAD_TARGET_NORMAL to all load_flags. --- FT_LOAD_TARGET_NORMAL : Default render mode; it corresponds to 8-bit anti-aliased bitmaps. FT_LOAD_TARGET_MONO : Strong hinting algorithm that should only be used for monochrome output. --- We usually do not see this problem because we use the Wine's Tahoma with the embeded bitmap. MacOS XQuartz 2.7.11, Freetype 2.7: - subpixel rendering disabled Freetype. - MacOS builtined Tahoma. This bug appears because of the combination of two situations. This is about the Freetype interpreter version 40. Version 40 is the default. dlls/gdi32/freetype.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 07de6f2f6c..56d1e99873 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7001,6 +7001,30 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; + if (!(load_flags & FT_LOAD_NO_HINTING)) + { + switch (format) + { + case GGO_BITMAP: + load_flags |= FT_LOAD_TARGET_MONO; + break; + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + load_flags |= FT_LOAD_TARGET_NORMAL; + break; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD; + break; + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD_V; + break; + } + } + err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); if(err) { -- 2.19.1

2 4

[PATCH] vssapi: add a few win64 spec entries
by Louis Lenders 12 Nov '18

12 Nov '18

From: louis <louis(a)debian> https://bugs.winehq.org/show_bug.cgi?id=46129 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/vssapi/vssapi.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 77599ab8ba..146feb4adf 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -3,8 +3,10 @@ @ stub ShouldBlockRevert @ stub ??0CVssJetWriter@@QAE(a)XZ @ thiscall -arch=i386 ??0CVssWriter@@QAE(a)XZ(ptr) VSSAPI_CVssWriter_default_ctor +@ cdecl -arch=win64 ??0CVssWriter@@QEAA(a)XZ(ptr) VSSAPI_CVssWriter_default_ctor @ stub ??1CVssJetWriter@@UAE(a)XZ @ thiscall -arch=i386 ??1CVssWriter@@UAE(a)XZ(ptr) VSSAPI_CVssWriter_dtor +@ cdecl -arch=win64 ??1CVssWriter@@UEAA(a)XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected(a)CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected(a)CVssWriter@@IBG_NXZ @ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z @@ -28,6 +30,7 @@ @ stub ?GetSnapshotDeviceName(a)CVssWriter@@IBGJPBGPAPBG(a)Z @ stub ?Initialize(a)CVssJetWriter@@QAGJU_GUID@@PBG_N211K(a)Z @ thiscall -arch=i386 ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize +@ cdecl -arch=win64 ?Initialize(a)CVssWriter@@QEAAJU_GUID@@PEBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N1(a)Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize @ stub ?InstallAlternateWriter(a)CVssWriter@@QAGJU_GUID@@0(a)Z @ stub ?IsBootableSystemStateBackedUp(a)CVssJetWriter@@IBG_NXZ @ stub ?IsBootableSystemStateBackedUp(a)CVssWriter@@IBG_NXZ @@ -68,8 +71,10 @@ @ stub ?SetWriterFailure(a)CVssJetWriter@@IAGJJ(a)Z @ stub ?SetWriterFailure(a)CVssWriter@@IAGJJ(a)Z @ thiscall -arch=i386 ?Subscribe(a)CVssWriter@@QAGJK(a)Z(ptr long) VSSAPI_CVssWriter_Subscribe +@ cdecl -arch=win64 ?Subscribe(a)CVssWriter@@QEAAJK(a)Z(ptr long) VSSAPI_CVssWriter_Subscribe @ stub ?Uninitialize(a)CVssJetWriter@@QAGXXZ @ thiscall -arch=i386 ?Unsubscribe(a)CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe +@ cdecl -arch=win64 ?Unsubscribe(a)CVssWriter@@QEAAJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe @ stub CreateVssBackupComponentsInternal @ stub CreateVssExamineWriterMetadataInternal @ stub CreateVssExpressWriterInternal -- 2.19.1

1 0

[PATCH 4/4] ddraw: Do not use unset viewport in viewport_activate().
by Józef Kucia 12 Nov '18

12 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/viewport.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 8cc60f1eb158..e6f862156ea7 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -68,6 +68,12 @@ void viewport_activate(struct d3d_viewport *This, BOOL ignore_lights) } } + if (This->version == DDRAW_VIEWPORT_VERSION_NONE) + { + TRACE("Viewport data was not set.\n"); + return; + } + /* And copy the values in the structure used by the device */ if (This->version == DDRAW_VIEWPORT_VERSION_2) { -- 2.18.1

3 2

[PATCH 3/4] ddraw: Do not return unset viewport from GetViewport().
by Józef Kucia 12 Nov '18

12 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/ddraw_private.h | 9 +++++++- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/viewport.c | 42 +++++++++++++++++++++++++------------- 5 files changed, 43 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 495cb8be68bc..b035a7e0509f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -474,6 +474,13 @@ struct d3d_material void material_activate(struct d3d_material *material) DECLSPEC_HIDDEN; struct d3d_material *d3d_material_create(struct ddraw *ddraw) DECLSPEC_HIDDEN; +enum ddraw_viewport_version +{ + DDRAW_VIEWPORT_VERSION_NONE, + DDRAW_VIEWPORT_VERSION_1, + DDRAW_VIEWPORT_VERSION_2, +}; + /***************************************************************************** * IDirect3DViewport - Wraps to D3D7 *****************************************************************************/ @@ -491,7 +498,7 @@ struct d3d_viewport DWORD num_lights; DWORD map_lights; - int use_vp2; + enum ddraw_viewport_version version; union { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7d8ccec7bbc6..59d07b7d76fc 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1260,7 +1260,7 @@ static void test_viewport_object(void) todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); desc.vp1.dwSize = sizeof(desc.vp1); hr = IDirect3DViewport_GetViewport(viewport, &desc.vp1); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); /* E_FAIL return values are returned by Winetestbot Windows NT machines. While not supporting diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1ae7ffe3fae8..8b9b249a3a4e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1435,11 +1435,11 @@ static void test_viewport_object(void) todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); desc.vp1.dwSize = sizeof(desc.vp1); hr = IDirect3DViewport2_GetViewport(viewport2, &desc.vp1); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); hr = IDirect3DViewport2_GetViewport2(viewport2, &desc.vp2); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); - todo_wine ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); desc.vp2.dwSize = sizeof(desc.vp2) + 1; hr = IDirect3DViewport2_GetViewport2(viewport2, &desc.vp2); todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 28d724062fd8..443c78b64390 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1591,11 +1591,11 @@ static void test_viewport_object(void) todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); desc.vp1.dwSize = sizeof(desc.vp1); hr = IDirect3DViewport3_GetViewport(viewport3, &desc.vp1); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); hr = IDirect3DViewport3_GetViewport2(viewport3, &desc.vp2); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); - todo_wine ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); desc.vp2.dwSize = sizeof(desc.vp2) + 1; hr = IDirect3DViewport3_GetViewport2(viewport3, &desc.vp2); todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 6f8f33b3508b..8cc60f1eb158 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -69,7 +69,7 @@ void viewport_activate(struct d3d_viewport *This, BOOL ignore_lights) } /* And copy the values in the structure used by the device */ - if (This->use_vp2) + if (This->version == DDRAW_VIEWPORT_VERSION_2) { vp.dwX = This->viewports.vp2.dwX; vp.dwY = This->viewports.vp2.dwY; @@ -259,10 +259,17 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE if (!vp) return DDERR_INVALIDPARAMS; + if (viewport->version == DDRAW_VIEWPORT_VERSION_NONE) + { + WARN("Viewport data was not set.\n"); + return D3DERR_VIEWPORTDATANOTSET; + } + wined3d_mutex_lock(); size = vp->dwSize; - if (!viewport->use_vp2) + memset(vp, 0, size); + if (viewport->version == DDRAW_VIEWPORT_VERSION_1) { memcpy(vp, &viewport->viewports.vp1, size); } @@ -275,10 +282,10 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE vp1.dwY = viewport->viewports.vp2.dwY; vp1.dwWidth = viewport->viewports.vp2.dwWidth; vp1.dwHeight = viewport->viewports.vp2.dwHeight; - vp1.dvMaxX = 0.0; - vp1.dvMaxY = 0.0; - vp1.dvScaleX = 0.0; - vp1.dvScaleY = 0.0; + vp1.dvMaxX = 0.0f; + vp1.dvMaxY = 0.0f; + vp1.dvScaleX = 0.0f; + vp1.dvScaleY = 0.0f; vp1.dvMinZ = viewport->viewports.vp2.dvMinZ; vp1.dvMaxZ = viewport->viewports.vp2.dvMaxZ; memcpy(vp, &vp1, size); @@ -348,7 +355,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE } } - viewport->use_vp2 = 0; + viewport->version = DDRAW_VIEWPORT_VERSION_1; viewport->viewports.vp1 = *vp; /* Empirical testing on a couple of d3d1 games showed that these values @@ -906,9 +913,16 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI if (!vp) return DDERR_INVALIDPARAMS; + if (viewport->version == DDRAW_VIEWPORT_VERSION_NONE) + { + WARN("Viewport data was not set.\n"); + return D3DERR_VIEWPORTDATANOTSET; + } + wined3d_mutex_lock(); size = vp->dwSize; - if (viewport->use_vp2) + memset(vp, 0, size); + if (viewport->version == DDRAW_VIEWPORT_VERSION_2) { memcpy(vp, &viewport->viewports.vp2, size); } @@ -921,10 +935,10 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI vp2.dwY = viewport->viewports.vp1.dwY; vp2.dwWidth = viewport->viewports.vp1.dwWidth; vp2.dwHeight = viewport->viewports.vp1.dwHeight; - vp2.dvClipX = 0.0; - vp2.dvClipY = 0.0; - vp2.dvClipWidth = 0.0; - vp2.dvClipHeight = 0.0; + vp2.dvClipX = 0.0f; + vp2.dvClipY = 0.0f; + vp2.dvClipWidth = 0.0f; + vp2.dvClipHeight = 0.0f; vp2.dvMinZ = viewport->viewports.vp1.dvMinZ; vp2.dvMaxZ = viewport->viewports.vp1.dvMaxZ; memcpy(vp, &vp2, size); @@ -994,7 +1008,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI } } - viewport->use_vp2 = 1; + viewport->version = DDRAW_VIEWPORT_VERSION_2; viewport->viewports.vp2 = *vp; if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) @@ -1175,6 +1189,6 @@ void d3d_viewport_init(struct d3d_viewport *viewport, struct ddraw *ddraw) viewport->IDirect3DViewport3_iface.lpVtbl = &d3d_viewport_vtbl; viewport->ref = 1; viewport->ddraw = ddraw; - viewport->use_vp2 = 0xff; + viewport->version = DDRAW_VIEWPORT_VERSION_NONE; list_init(&viewport->light_list); } -- 2.18.1

3 2

[PATCH 2/4] ddraw/tests: Add more tests for viewports.
by Józef Kucia 12 Nov '18

12 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 78 +++++++++++++++----- dlls/ddraw/tests/ddraw2.c | 135 ++++++++++++++++++++++++---------- dlls/ddraw/tests/ddraw4.c | 149 ++++++++++++++++++++++++++------------ 3 files changed, 256 insertions(+), 106 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 1f93a97329eb..7d8ccec7bbc6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1212,6 +1212,7 @@ static void test_viewport_object(void) IDirect3D *d3d; HRESULT hr; ULONG ref; + D3DVIEWPORT vp; IDirect3DViewport *viewport, *another_vp; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -1219,6 +1220,11 @@ static void test_viewport_object(void) IUnknown *unknown; IDirect3DDevice *device; HWND window; + union + { + D3DVIEWPORT vp1; + BYTE blob[1024]; + } desc; window = create_window(); ddraw = create_ddraw(); @@ -1234,14 +1240,28 @@ static void test_viewport_object(void) hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D, (void **)&d3d); ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); ref = get_refcount((IUnknown *) d3d); - ok(ref == 2, "IDirect3D refcount is %d\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3D_CreateViewport(d3d, &viewport, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); - ok(ref == 1, "Initial IDirect3DViewport refcount is %u\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == 2, "IDirect3D refcount is %u\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + + memset(&desc, 0, sizeof(desc)); + hr = IDirect3DViewport_GetViewport(viewport, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1) + 1; + hr = IDirect3DViewport_GetViewport(viewport, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1) - 1; + hr = IDirect3DViewport_GetViewport(viewport, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1); + hr = IDirect3DViewport_GetViewport(viewport, &desc.vp1); + todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); /* E_FAIL return values are returned by Winetestbot Windows NT machines. While not supporting * newer interfaces is legitimate for old ddraw versions, E_FAIL violates Microsoft's rules @@ -1259,9 +1279,9 @@ static void test_viewport_object(void) if (viewport2) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); IDirect3DViewport2_Release(viewport2); viewport2 = NULL; } @@ -1272,47 +1292,65 @@ static void test_viewport_object(void) if (viewport3) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); IDirect3DViewport3_Release(viewport3); } hr = IDirect3DViewport_QueryInterface(viewport, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); - if (unknown) - { - ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); - ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %u\n", ref); - IUnknown_Release(unknown); - } + ref = get_refcount((IUnknown *)viewport); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ref = get_refcount(unknown); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + IUnknown_Release(unknown); - /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice_DeleteViewport(device, NULL); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); hr = IDirect3D_CreateViewport(d3d, &another_vp, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice_AddViewport(device, viewport); ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3DDevice_AddViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + + memset(&vp, 0, sizeof(vp)); + vp.dwX = 0; + vp.dwY = 0; + vp.dwWidth = 640; + vp.dwHeight = 480; + vp.dvMinZ = 0.0f; + vp.dvMaxZ = 1.0f; + vp.dvScaleX = vp.dwWidth / 2.0f; + vp.dvScaleY = vp.dwHeight / 2.0f; + vp.dvMaxX = 1.0f; + vp.dvMaxY = 1.0f; + hr = IDirect3DViewport_SetViewport(viewport, &vp); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport_SetViewport(viewport, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); hr = IDirect3DDevice_DeleteViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 1, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); IDirect3DDevice_Release(device); ref = get_refcount((IUnknown *) viewport); - ok(ref == 1, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); + + hr = IDirect3DViewport_SetViewport(viewport, &vp); + ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr); IDirect3DViewport_Release(another_vp); IDirect3D_Release(d3d); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 95cdf8bd82d4..1ae7ffe3fae8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1380,6 +1380,8 @@ static void test_viewport_object(void) IDirect3D2 *d3d; HRESULT hr; ULONG ref, old_d3d_ref; + D3DVIEWPORT vp; + D3DVIEWPORT2 vp2; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2, *another_vp, *test_vp; IDirect3DViewport3 *viewport3; @@ -1387,6 +1389,12 @@ static void test_viewport_object(void) IUnknown *unknown; IDirect3DDevice2 *device; HWND window; + union + { + D3DVIEWPORT2 vp2; + D3DVIEWPORT vp1; + BYTE blob[1024]; + } desc; window = create_window(); ddraw = create_ddraw(); @@ -1412,52 +1420,64 @@ static void test_viewport_object(void) hr = IDirect3D2_CreateViewport(d3d, &viewport2, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 1, "Initial IDirect3DViewport2 refcount is %u\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D2 refcount is %u\n", ref); + ok(ref == old_d3d_ref, "Got unexpected refcount %u.\n", ref); + + memset(&desc, 0, sizeof(desc)); + hr = IDirect3DViewport2_GetViewport(viewport2, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1) + 1; + hr = IDirect3DViewport2_GetViewport(viewport2, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1) - 1; + hr = IDirect3DViewport2_GetViewport(viewport2, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1); + hr = IDirect3DViewport2_GetViewport(viewport2, &desc.vp1); + todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); + hr = IDirect3DViewport2_GetViewport2(viewport2, &desc.vp2); + todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + todo_wine ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); + desc.vp2.dwSize = sizeof(desc.vp2) + 1; + hr = IDirect3DViewport2_GetViewport2(viewport2, &desc.vp2); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirectDrawGammaControl, (void **)&gamma); ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(gamma == NULL, "Interface not set to NULL by failed QI call: %p\n", gamma); - if (SUCCEEDED(hr)) IDirectDrawGammaControl_Release(gamma); + ok(!gamma, "Interface not set to NULL by failed QI call: %p\n", gamma); /* NULL iid: Segfaults */ hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirect3DViewport, (void **)&viewport); ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport, hr %#x.\n", hr); - if (viewport) - { - ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); - ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); - IDirect3DViewport_Release(viewport); - viewport = NULL; - } + ref = get_refcount((IUnknown *)viewport); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ref = get_refcount((IUnknown *)viewport2); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + IDirect3DViewport_Release(viewport); + viewport = NULL; hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirect3DViewport3, (void **)&viewport3); ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); if (viewport3) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); IDirect3DViewport3_Release(viewport3); } hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); - if (unknown) - { - ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); - ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %u\n", ref); - IUnknown_Release(unknown); - } + ref = get_refcount((IUnknown *)viewport2); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ref = get_refcount(unknown); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + IUnknown_Release(unknown); - /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice2_DeleteViewport(device, NULL); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetCurrentViewport(device, NULL); @@ -1470,14 +1490,15 @@ static void test_viewport_object(void) hr = IDirect3DDevice2_SetCurrentViewport(device, another_vp); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice2_AddViewport(device, viewport2); ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport2); - ok(ref == 2, "viewport2 refcount is %d\n", ref); + ok(ref == 2, "viewport2 refcount is %u.\n", ref); hr = IDirect3DDevice2_AddViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 2, "another_vp refcount is %d\n", ref); + ok(ref == 2, "another_vp refcount is %u.\n", ref); test_vp = (IDirect3DViewport2 *) 0xbaadc0de; hr = IDirect3DDevice2_GetCurrentViewport(device, &test_vp); @@ -1487,17 +1508,18 @@ static void test_viewport_object(void) hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport2); - ok(ref == 3, "viewport2 refcount is %d\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) device); - ok(ref == 1, "device refcount is %d\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); test_vp = NULL; hr = IDirect3DDevice2_GetCurrentViewport(device, &test_vp); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(test_vp == viewport2, "Got unexpected viewport %p\n", test_vp); ref = get_refcount((IUnknown *) viewport2); - ok(ref == 4, "viewport2 refcount is %d\n", ref); - if(test_vp) IDirect3DViewport2_Release(test_vp); + ok(ref == 4, "Got unexpected refcount %u.\n", ref); + if (test_vp) + IDirect3DViewport2_Release(test_vp); /* GetCurrentViewport with a viewport set and NULL input param: Segfault */ @@ -1508,44 +1530,79 @@ static void test_viewport_object(void) hr = IDirect3DDevice2_GetCurrentViewport(device, &test_vp); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(test_vp == viewport2, "Got unexpected viewport %p\n", test_vp); - if(test_vp) IDirect3DViewport2_Release(test_vp); + if (test_vp) + IDirect3DViewport2_Release(test_vp); /* SetCurrentViewport properly releases the old viewport's reference */ hr = IDirect3DDevice2_SetCurrentViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport2); - ok(ref == 2, "viewport2 refcount is %d\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 3, "another_vp refcount is %d\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); /* Deleting the viewport removes the reference added by AddViewport, but not * the one added by SetCurrentViewport. */ hr = IDirect3DDevice2_DeleteViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); - todo_wine ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + todo_wine ok(ref == 2, "Got unexpected refcount %u.\n", ref); /* GetCurrentViewport fails though */ test_vp = NULL; hr = IDirect3DDevice2_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(test_vp == NULL, "Got unexpected viewport %p\n", test_vp); - if(test_vp) IDirect3DViewport2_Release(test_vp); + ok(!test_vp, "Got unexpected viewport %p\n", test_vp); /* Setting a different viewport does not free the leaked reference. How * do I get rid of it? Leak the viewport for now. */ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport2); - ok(ref == 3, "viewport2 refcount is %d\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); - todo_wine ok(ref == 2, "another_vp refcount is %d\n", ref); + todo_wine ok(ref == 2, "Got unexpected refcount %u.\n", ref); + + memset(&vp, 0, sizeof(vp)); + memset(&vp, 0, sizeof(vp2)); + vp.dwX = vp2.dwX = 0; + vp.dwY = vp2.dwY = 0; + vp.dwWidth = vp2.dwWidth = 640; + vp.dwHeight = vp2.dwHeight = 480; + vp.dvMinZ = vp2.dvMinZ = 0.0f; + vp.dvMaxZ = vp2.dvMaxZ = 1.0f; + vp.dvScaleX = vp.dwWidth / 2.0f; + vp.dvScaleY = vp.dwHeight / 2.0f; + vp.dvMaxX = 1.0f; + vp.dvMaxY = 1.0f; + vp2.dvClipX = -1.0f; + vp2.dvClipY = 1.0f; + vp2.dvClipWidth = 2.0f; + vp2.dvClipHeight = 2.0f; + hr = IDirect3DViewport2_SetViewport(viewport2, &vp); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport2_SetViewport2(viewport2, &vp2); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport2_SetViewport(viewport2, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport2_SetViewport2(viewport2, &vp2); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); /* Destroying the device removes the viewport, but does not free the reference * added by SetCurrentViewport. */ IDirect3DDevice2_Release(device); ref = get_refcount((IUnknown *) viewport2); - todo_wine ok(ref == 2, "viewport2 refcount is %d\n", ref); + todo_wine ok(ref == 2, "Got unexpected refcount %u.\n", ref); + + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport2_SetViewport(viewport2, &vp); + ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport2_SetViewport2(viewport2, &vp2); + ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr); IDirect3DViewport2_Release(another_vp); IDirect3DViewport2_Release(viewport2); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a62aaf0f30ec..28d724062fd8 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1544,6 +1544,8 @@ static void test_viewport_object(void) IDirect3D3 *d3d; HRESULT hr, old_d3d_ref; ULONG ref; + D3DVIEWPORT vp; + D3DVIEWPORT2 vp2; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3, *another_vp, *test_vp; @@ -1551,6 +1553,12 @@ static void test_viewport_object(void) IUnknown *unknown; HWND window; IDirect3DDevice3 *device; + union + { + D3DVIEWPORT2 vp2; + D3DVIEWPORT vp1; + BYTE blob[1024]; + } desc; window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) @@ -1568,52 +1576,61 @@ static void test_viewport_object(void) hr = IDirect3D3_CreateViewport(d3d, &viewport3, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 1, "Initial IDirect3DViewport3 refcount is %u\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D3 refcount is %u\n", ref); + ok(ref == old_d3d_ref, "Got unexpected refcount %u.\n", ref); + + memset(&desc, 0, sizeof(desc)); + hr = IDirect3DViewport3_GetViewport(viewport3, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1) + 1; + hr = IDirect3DViewport3_GetViewport(viewport3, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1) - 1; + hr = IDirect3DViewport3_GetViewport(viewport3, &desc.vp1); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + desc.vp1.dwSize = sizeof(desc.vp1); + hr = IDirect3DViewport3_GetViewport(viewport3, &desc.vp1); + todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); + hr = IDirect3DViewport3_GetViewport2(viewport3, &desc.vp2); + todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + todo_wine ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); + desc.vp2.dwSize = sizeof(desc.vp2) + 1; + hr = IDirect3DViewport3_GetViewport2(viewport3, &desc.vp2); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport3, &IID_IDirectDrawGammaControl, (void **)&gamma); ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(gamma == NULL, "Interface not set to NULL by failed QI call: %p\n", gamma); - if (SUCCEEDED(hr)) IDirectDrawGammaControl_Release(gamma); + ok(!gamma, "Interface not set to NULL by failed QI call: %p\n", gamma); /* NULL iid: Segfaults */ hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport, (void **)&viewport); ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport, hr %#x.\n", hr); - if (viewport) - { - ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); - ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); - IDirect3DViewport_Release(viewport); - viewport = NULL; - } + ref = get_refcount((IUnknown *)viewport); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ref = get_refcount((IUnknown *)viewport3); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + IDirect3DViewport_Release(viewport); + viewport = NULL; hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport3, (void **)&viewport2); ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); - if (viewport2) - { - ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); - ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); - IDirect3DViewport3_Release(viewport2); - } + ref = get_refcount((IUnknown *)viewport2); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ref = get_refcount((IUnknown *)viewport3); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + IDirect3DViewport3_Release(viewport2); hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); - if (unknown) - { - ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); - ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %u\n", ref); - IUnknown_Release(unknown); - } + ref = get_refcount((IUnknown *)viewport3); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + ref = get_refcount(unknown); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); + IUnknown_Release(unknown); - /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice3_DeleteViewport(device, NULL); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetCurrentViewport(device, NULL); @@ -1626,14 +1643,15 @@ static void test_viewport_object(void) hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice3_AddViewport(device, viewport3); ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); - ok(ref == 2, "viewport3 refcount is %d\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3DDevice3_AddViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 2, "another_vp refcount is %d\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); test_vp = (IDirect3DViewport3 *) 0xbaadc0de; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); @@ -1643,17 +1661,18 @@ static void test_viewport_object(void) hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); - ok(ref == 3, "viewport3 refcount is %d\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) device); - ok(ref == 1, "device refcount is %d\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); ref = get_refcount((IUnknown *) viewport3); - ok(ref == 4, "viewport3 refcount is %d\n", ref); - if(test_vp) IDirect3DViewport3_Release(test_vp); + ok(ref == 4, "Got unexpected refcount %u.\n", ref); + if (test_vp) + IDirect3DViewport3_Release(test_vp); /* GetCurrentViewport with a viewport set and NULL input param: Segfault */ @@ -1664,47 +1683,83 @@ static void test_viewport_object(void) hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); - if(test_vp) IDirect3DViewport3_Release(test_vp); + if (test_vp) + IDirect3DViewport3_Release(test_vp); /* SetCurrentViewport properly releases the old viewport's reference */ hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); - ok(ref == 2, "viewport3 refcount is %d\n", ref); + ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 3, "another_vp refcount is %d\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); /* Unlike device2::DeleteViewport, device3::DeleteViewport releases the * reference held by SetCurrentViewport */ hr = IDirect3DDevice3_DeleteViewport(device, another_vp); ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 1, "another_vp refcount is %d\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); /* GetCurrentViewport still fails */ test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(test_vp == NULL, "Got unexpected viewport %p\n", test_vp); - if(test_vp) IDirect3DViewport3_Release(test_vp); + ok(!test_vp, "Got unexpected viewport %p\n", test_vp); /* Setting a different viewport doesn't have any surprises now */ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); - ok(ref == 3, "viewport3 refcount is %d\n", ref); + ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); - ok(ref == 1, "another_vp refcount is %d\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); + + memset(&vp, 0, sizeof(vp)); + memset(&vp, 0, sizeof(vp2)); + vp.dwSize = vp2.dwSize = 0; + vp.dwX = vp2.dwX = 0; + vp.dwY = vp2.dwY = 0; + vp.dwWidth = vp2.dwWidth = 640; + vp.dwHeight = vp2.dwHeight = 480; + vp.dvMinZ = vp2.dvMinZ = 0.0f; + vp.dvMaxZ = vp2.dvMaxZ = 1.0f; + vp.dvScaleX = vp.dwWidth / 2.0f; + vp.dvScaleY = vp.dwHeight / 2.0f; + vp.dvMaxX = 1.0f; + vp.dvMaxY = 1.0f; + vp2.dvClipX = -1.0f; + vp2.dvClipY = 1.0f; + vp2.dvClipWidth = 2.0f; + vp2.dvClipHeight = 2.0f; + hr = IDirect3DViewport3_SetViewport(viewport3, &vp); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_SetViewport(viewport3, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); /* Destroying the device removes the viewport and releases the reference */ IDirect3DDevice3_Release(device); ref = get_refcount((IUnknown *) viewport3); - ok(ref == 1, "viewport3 refcount is %d\n", ref); + ok(ref == 1, "Got unexpected refcount %u.\n", ref); + + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_SetViewport(viewport3, &vp); + ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr); + vp2.dwSize = sizeof(vp2); + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == D3DERR_VIEWPORTHASNODEVICE, "Got unexpected hr %#x.\n", hr); ref = IDirect3DViewport3_Release(another_vp); - ok(ref == 0, "Got unexpected ref %d\n", ref); + ok(!ref, "Got unexpected refcount %u.\n", ref); ref = IDirect3DViewport3_Release(viewport3); - ok(ref == 0, "Got unexpected ref %d\n", ref); + ok(!ref, "Got unexpected refcount %u.\n", ref); IDirect3D3_Release(d3d); DestroyWindow(window); IDirectDraw4_Release(ddraw); -- 2.18.1

3 2

[PATCH 1/4] ddraw: Validate "dwSize" when setting viewports.
by Józef Kucia 12 Nov '18

12 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/viewport.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index fad079f1edbc..6f8f33b3508b 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -309,6 +309,12 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE if (!vp) return DDERR_INVALIDPARAMS; + if (vp->dwSize != sizeof(*vp)) + { + WARN("Invalid D3DVIEWPORT size %u.\n", vp->dwSize); + return DDERR_INVALIDPARAMS; + } + if (TRACE_ON(ddraw)) { TRACE(" getting D3DVIEWPORT :\n"); @@ -343,13 +349,12 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE } viewport->use_vp2 = 0; - memset(&viewport->viewports.vp1, 0, sizeof(viewport->viewports.vp1)); - memcpy(&viewport->viewports.vp1, vp, vp->dwSize); + viewport->viewports.vp1 = *vp; /* Empirical testing on a couple of d3d1 games showed that these values * should be ignored. */ - viewport->viewports.vp1.dvMinZ = 0.0; - viewport->viewports.vp1.dvMaxZ = 1.0; + viewport->viewports.vp1.dvMinZ = 0.0f; + viewport->viewports.vp1.dvMaxZ = 1.0f; if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) { @@ -950,6 +955,12 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI if (!vp) return DDERR_INVALIDPARAMS; + if (vp->dwSize != sizeof(*vp)) + { + WARN("Invalid D3DVIEWPORT2 size %u.\n", vp->dwSize); + return DDERR_INVALIDPARAMS; + } + if (TRACE_ON(ddraw)) { TRACE(" getting D3DVIEWPORT2 :\n"); @@ -984,8 +995,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI } viewport->use_vp2 = 1; - memset(&viewport->viewports.vp2, 0, sizeof(viewport->viewports.vp2)); - memcpy(&viewport->viewports.vp2, vp, vp->dwSize); + viewport->viewports.vp2 = *vp; if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) { -- 2.18.1

3 2

[v3 PATCH] d2d1: Implement GetMaximumBitmapSize().
by Nikolay Sivov 12 Nov '18

12 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: removed commented part dlls/d2d1/device.c | 4 +- dlls/d2d1/tests/d2d1.c | 119 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0e96224ec3..7c398962d6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1720,9 +1720,9 @@ static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_device_context_GetPixelSize(ID2D1Devi static UINT32 STDMETHODCALLTYPE d2d_device_context_GetMaximumBitmapSize(ID2D1DeviceContext *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - return 0; + return D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; } static BOOL STDMETHODCALLTYPE d2d_device_context_IsSupported(ID2D1DeviceContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b7d3bfa09c..617977f400 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7925,6 +7925,124 @@ todo_wine ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_max_bitmap_size(void) +{ + D2D1_RENDER_TARGET_PROPERTIES desc; + D2D1_BITMAP_PROPERTIES bitmap_desc; + IDXGISwapChain *swapchain; + ID2D1Factory *factory; + IDXGISurface *surface; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + ID2D1Bitmap *bitmap; + UINT32 bitmap_size; + unsigned int i, j; + HWND window; + HRESULT hr; + + static const struct + { + const char *name; + DWORD type; + } + device_types[] = + { + { "HW", D3D10_DRIVER_TYPE_HARDWARE }, + { "WARP", D3D10_DRIVER_TYPE_WARP }, + { "REF", D3D10_DRIVER_TYPE_REFERENCE }, + }; + static const struct + { + const char *name; + DWORD type; + } + target_types[] = + { + { "DEFAULT", D2D1_RENDER_TARGET_TYPE_DEFAULT }, + { "HW", D2D1_RENDER_TARGET_TYPE_HARDWARE }, + }; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(device_types); ++i) + { + if (FAILED(hr = D3D10CreateDevice1(NULL, device_types[i].type, NULL, D3D10_CREATE_DEVICE_BGRA_SUPPORT, + D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) + { + skip("Failed to create %s d3d device, hr %#x.\n", device_types[i].name, hr); + continue; + } + + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(target_types); ++j) + { + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + D2D1_SIZE_U size; + + desc.type = target_types[j].type; + desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + desc.dpiX = 0.0f; + desc.dpiY = 0.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + + hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, &desc, &rt); + ok(SUCCEEDED(hr), "%s/%s: failed to create render target, hr %#x.\n", device_types[i].name, + target_types[j].name, hr); + + bitmap_size = ID2D1RenderTarget_GetMaximumBitmapSize(rt); + ok(bitmap_size >= D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION, "%s/%s: unexpected bitmap size %u.\n", + device_types[i].name, target_types[j].name, bitmap_size); + + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + + size.width = bitmap_size; + size.height = 1; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + ID2D1Bitmap_Release(bitmap); + + ID2D1RenderTarget_Release(rt); + + texture_desc.Width = bitmap_size; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr) || broken(hr == E_INVALIDARG && device_types[i].type == D3D10_DRIVER_TYPE_WARP) /* Vista */, + "%s/%s: failed to create texture, hr %#x.\n", device_types[i].name, target_types[j].name, hr); + if (SUCCEEDED(hr)) + ID3D10Texture2D_Release(texture); + } + + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + DestroyWindow(window); + + ID3D10Device1_Release(device); + } + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -7969,6 +8087,7 @@ START_TEST(d2d1) queue_test(test_invert_matrix); queue_test(test_skew_matrix); queue_test(test_command_list); + queue_test(test_max_bitmap_size); run_queued_tests(); } -- 2.19.1

2 1

[PATCH 1/5] rpcrt4: Write type format strings for Automation types.
by Zebediah Figura 12 Nov '18

12 Nov '18

From: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/Makefile.in | 8 +++-- dlls/rpcrt4/ndr_typelib.c | 75 +++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/ndr_types.idl | 30 ++++++++++++++++ 3 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 dlls/rpcrt4/ndr_types.idl diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index ad67edf92e..2aa2a5376a 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -2,7 +2,9 @@ EXTRADEFS = -D_RPCRT4_ -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 -DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 +DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 oleaut32 + +ndr_types_EXTRAIDLFLAGS = -Oicf C_SRCS = \ cproxy.c \ @@ -27,4 +29,6 @@ C_SRCS = \ RC_SRCS = version.rc -IDL_SRCS = epm.idl +IDL_SRCS = \ + epm.idl \ + ndr_types.idl diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 37926dfb99..f81902623c 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -29,6 +29,9 @@ #include "wine/heap.h" #include "cpsf.h" +#include "initguid.h" +#include "ndr_types.h" +#include "ndr_stubless.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -42,6 +45,67 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, #define WRITE_INT(str, len, val) \ do { if ((str)) *((int *)((str) + (len))) = (val); (len) += 4; } while (0) +extern const ExtendedProxyFileInfo ndr_types_ProxyFileInfo; + +static const MIDL_STUBLESS_PROXY_INFO *get_ndr_types_proxy_info(void) +{ + return ndr_types_ProxyFileInfo.pProxyVtblList[0]->header.pStublessProxyInfo; +} + +static const NDR_PARAM_OIF *get_ndr_types_params( unsigned int *nb_params ) +{ + const MIDL_STUBLESS_PROXY_INFO *proxy = get_ndr_types_proxy_info(); + const unsigned char *format = proxy->ProcFormatString + proxy->FormatStringOffset[3]; + const NDR_PROC_HEADER *proc = (const NDR_PROC_HEADER *)format; + const NDR_PROC_PARTIAL_OIF_HEADER *header; + + if (proc->Oi_flags & Oi_HAS_RPCFLAGS) + format += sizeof(NDR_PROC_HEADER_RPC); + else + format += sizeof(NDR_PROC_HEADER); + + header = (const NDR_PROC_PARTIAL_OIF_HEADER *)format; + format += sizeof(*header); + if (header->Oi2Flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *ext = (const NDR_PROC_HEADER_EXTS *)format; + format += ext->Size; + } + *nb_params = header->number_of_params; + return (const NDR_PARAM_OIF *)format; +} + +static unsigned short get_tfs_offset( int param ) +{ + unsigned int nb_params; + const NDR_PARAM_OIF *params = get_ndr_types_params( &nb_params ); + + assert( param < nb_params ); + return params[param].u.type_offset; +} + +static const unsigned char *get_type_format_string( size_t *size ) +{ + unsigned int nb_params; + const NDR_PARAM_OIF *params = get_ndr_types_params( &nb_params ); + + *size = params[nb_params - 1].u.type_offset; + return get_ndr_types_proxy_info()->pStubDesc->pFormatTypes; +} + +static unsigned short write_oleaut_tfs(VARTYPE vt) +{ + switch (vt) + { + case VT_BSTR: return get_tfs_offset( 0 ); + case VT_UNKNOWN: return get_tfs_offset( 1 ); + case VT_DISPATCH: return get_tfs_offset( 2 ); + case VT_VARIANT: return get_tfs_offset( 3 ); + case VT_SAFEARRAY: return get_tfs_offset( 4 ); + } + return 0; +} + static unsigned char get_base_type(VARTYPE vt) { switch (vt) @@ -341,6 +405,9 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, TRACE("vt %d%s\n", desc->vt, toplevel ? " (toplevel)" : ""); + if ((off = write_oleaut_tfs(desc->vt))) + return off; + switch (desc->vt) { case VT_PTR: @@ -684,7 +751,9 @@ static HRESULT build_format_strings(ITypeInfo *typeinfo, WORD funcs, const unsigned char **type_ret, const unsigned char **proc_ret, unsigned short **offset_ret) { - size_t typelen = 0, proclen = 0; + size_t tfs_size; + const unsigned char *tfs = get_type_format_string( &tfs_size ); + size_t typelen = tfs_size, proclen = 0; unsigned char *type, *proc; unsigned short *offset; HRESULT hr; @@ -702,7 +771,8 @@ static HRESULT build_format_strings(ITypeInfo *typeinfo, WORD funcs, goto err; } - typelen = 0; + memcpy(type, tfs, tfs_size); + typelen = tfs_size; proclen = 0; hr = write_iface_fs(typeinfo, funcs, type, &typelen, proc, &proclen, offset); @@ -759,6 +829,7 @@ static void init_stub_desc(MIDL_STUB_DESC *desc) desc->pfnAllocate = NdrOleAllocate; desc->pfnFree = NdrOleFree; desc->Version = 0x50002; + desc->aUserMarshalQuadruple = get_ndr_types_proxy_info()->pStubDesc->aUserMarshalQuadruple; /* type format string is initialized with proc format string and offset table */ } diff --git a/dlls/rpcrt4/ndr_types.idl b/dlls/rpcrt4/ndr_types.idl new file mode 100644 index 0000000000..ff34ae47fb --- /dev/null +++ b/dlls/rpcrt4/ndr_types.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2018 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep proxy + +import "oaidl.idl"; + +[ + object, + uuid(bfc61495-76bb-4855-8c2f-3764fd42523a) +] +interface dummy : IUnknown +{ + void dummy( BSTR a, IUnknown *b, IDispatch *c, VARIANT d, LPSAFEARRAY e, BSTR *last ); +} -- 2.19.1

4 13