- wine-devel - winehq.org

[PATCH v2 3/3] mpr: Implement support for deleting persistent, connections.
by Pierre Schweitzer 12 Nov '18

12 Nov '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH v2 2/3] mpr: Implement support for making connections persistent.
by Pierre Schweitzer 12 Nov '18

12 Nov '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH v3 1/3] mpr: Implement remembered connection enumeration.
by Pierre Schweitzer 12 Nov '18

12 Nov '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH] msvcrt/tests: Remove unused todo field.
by Daniel Lehman 12 Nov '18

12 Nov '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msvcrt/tests/string.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d0988bf86c..0568bcf5df 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3493,7 +3493,6 @@ static void test__tcsnicoll(void) const char *str2; size_t count; int exp; - BOOL todo; }; static const struct test tests[] = { { "English", "abcd", "ABCD", 4, 0 }, -- 2.17.1

2 1

[PATCH] msvcr120: Add nexttoward implementation.
by Zebediah Figura 12 Nov '18

12 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120/tests/msvcr120.c | 49 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 16 ++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- 6 files changed, 77 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5587..f5e4fb1f8f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 47834e5d62..cfb7889d4a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e42b..42bb6257b5 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -192,6 +192,9 @@ static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +255,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -964,6 +970,48 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + d = p_nexttoward(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Expected %0.16e, got %0.16e.\n", tests[i].d, d); + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Expected %0.8e, got %0.8e.\n", tests[i].f, f); + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Expected %0.16e, got %0.16e.\n", tests[i].d, d); + } + + d = p_nexttoward(NAN, 0); + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + d = p_nexttoward(0, NAN); + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1031,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e5b26a4746..c139b8e251 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..c83818c9ce 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1542,6 +1542,22 @@ double CDECL MSVCRT__nextafter(double num, double next) return retval; } +/********************************************************************* + * nexttoward (MSVCRT.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ + return nexttoward(num, next); +} + +/********************************************************************* + * nexttoward (MSVCRT.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ + return nexttowardf(num, next); +} + /********************************************************************* * _ecvt (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 142ac86913..7c729123d9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml -- 2.19.1

3 2

[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@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@XZ @ thiscall -arch=i386 ??0CVssWriter@@QAE@XZ(ptr) VSSAPI_CVssWriter_default_ctor +@ cdecl -arch=win64 ??0CVssWriter@@QEAA@XZ(ptr) VSSAPI_CVssWriter_default_ctor @ stub ??1CVssJetWriter@@UAE@XZ @ thiscall -arch=i386 ??1CVssWriter@@UAE@XZ(ptr) VSSAPI_CVssWriter_dtor +@ cdecl -arch=win64 ??1CVssWriter@@UEAA@XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ @ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z @@ -28,6 +30,7 @@ @ stub ?GetSnapshotDeviceName@CVssWriter@@IBGJPBGPAPBG@Z @ stub ?Initialize@CVssJetWriter@@QAGJU_GUID@@PBG_N211K@Z @ thiscall -arch=i386 ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize +@ cdecl -arch=win64 ?Initialize@CVssWriter@@QEAAJU_GUID@@PEBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N1@Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize @ stub ?InstallAlternateWriter@CVssWriter@@QAGJU_GUID@@0@Z @ stub ?IsBootableSystemStateBackedUp@CVssJetWriter@@IBG_NXZ @ stub ?IsBootableSystemStateBackedUp@CVssWriter@@IBG_NXZ @@ -68,8 +71,10 @@ @ stub ?SetWriterFailure@CVssJetWriter@@IAGJJ@Z @ stub ?SetWriterFailure@CVssWriter@@IAGJJ@Z @ thiscall -arch=i386 ?Subscribe@CVssWriter@@QAGJK@Z(ptr long) VSSAPI_CVssWriter_Subscribe +@ cdecl -arch=win64 ?Subscribe@CVssWriter@@QEAAJK@Z(ptr long) VSSAPI_CVssWriter_Subscribe @ stub ?Uninitialize@CVssJetWriter@@QAGXXZ @ thiscall -arch=i386 ?Unsubscribe@CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe +@ cdecl -arch=win64 ?Unsubscribe@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

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

12 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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..1e7034050b 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_B8G8R8A8_UNORM;//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 v2] wineps: Cope correctly with a missing table.
by Huw Davies 12 Nov '18

12 Nov '18

From: Wolfgang Walter <wine(a)stwm.de> Signed-off-by: Wolfgang Walter <wine(a)stwm.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineps.drv/type42.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 8a56cc6b6c..c808ddbde4 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -100,10 +100,15 @@ struct tagTYPE42 { static BOOL LoadTable(HDC hdc, OTTable *table) { unsigned int i; + DWORD len; if(table->MS_tag == MS_MAKE_TAG('g','d','i','r')) return TRUE; - table->len = GetFontData(hdc, table->MS_tag, 0, NULL, 0); - table->data = HeapAlloc(GetProcessHeap(), 0, (table->len + 3) & ~3 ); + table->len = 0; + len = GetFontData(hdc, table->MS_tag, 0, NULL, 0); + if(len == GDI_ERROR) return FALSE; + table->data = HeapAlloc(GetProcessHeap(), 0, (len + 3) & ~3); + if(!table->data) return FALSE; + table->len = len; memset(table->data + ((table->len - 1) & ~3), 0, sizeof(DWORD)); GetFontData(hdc, table->MS_tag, 0, table->data, table->len); table->check = 0; -- 2.18.0

1 0

[PATCH 5/5] d3d8: Do not add map access indiscriminately in texture_init().
by Henri Verbeet 12 Nov '18

12 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 7bfca865133..0b86ed9571b 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1110,8 +1110,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1; -- 2.11.0

2 1

[PATCH 4/5] d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d8_device_CreateImageSurface().
by Henri Verbeet 12 Nov '18

12 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b91a3836520..885849f671a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1245,7 +1245,7 @@ static HRESULT WINAPI d3d8_device_CreateImageSurface(IDirect3DDevice8 *iface, UI *surface = NULL; - return d3d8_device_create_surface(device, width, height, format, WINED3D_TEXTURE_CREATE_MAPPABLE, + return d3d8_device_create_surface(device, width, height, format, 0, surface, 0, D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0); } -- 2.11.0

2 1

[PATCH 3/5] d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d8_device_CreateDepthStencilSurface().
by Henri Verbeet 12 Nov '18

12 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1d7e3dfc387..b91a3836520 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1230,7 +1230,7 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if *surface = NULL; /* TODO: Verify that Discard is false */ - return d3d8_device_create_surface(device, width, height, format, WINED3D_TEXTURE_CREATE_MAPPABLE, + return d3d8_device_create_surface(device, width, height, format, 0, surface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, 0); } -- 2.11.0

2 1

[PATCH 2/5] d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in cubetexture_init().
by Henri Verbeet 12 Nov '18

12 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/texture.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index b06ebd446a0..7bfca865133 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1163,9 +1163,6 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.depth = 1; desc.size = 0; - if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; - if (!levels) levels = wined3d_log2i(edge_length) + 1; -- 2.11.0

2 1

[PATCH 1/5] d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in texture_init().
by Henri Verbeet 12 Nov '18

12 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/texture.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 1c144a14dae..b06ebd446a0 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1117,9 +1117,6 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.depth = 1; desc.size = 0; - if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; - if (!levels) levels = wined3d_log2i(max(width, height)) + 1; -- 2.11.0

2 1

[PATCH] winhttp: Make constant 'cookieW' static
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winhttp/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 0a7f7f0e1c..88365f5949 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -344,7 +344,7 @@ BOOL add_cookie_headers( request_t *request ) if (strstrW( request->path, cookie->path ) == request->path) { - const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; int len, len_cookie = ARRAY_SIZE( cookieW ), len_name = strlenW( cookie->name ); WCHAR *header; -- 2.19.1

2 1

[PATCH] msi: Allow ARM64 installations
by André Hentschel 12 Nov '18

12 Nov '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- dlls/msi/msipriv.h | 4 +++- dlls/msi/package.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4e61fdb929..1ea6b77fb9 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -361,7 +361,8 @@ enum platform PLATFORM_INTEL, PLATFORM_INTEL64, PLATFORM_X64, - PLATFORM_ARM + PLATFORM_ARM, + PLATFORM_ARM64 }; enum clr_version @@ -1185,6 +1186,7 @@ static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; +static const WCHAR szARM64[] = {'A','r','m','6','4',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 6ac73a3a3f..b57e89d077 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1208,6 +1208,7 @@ static enum platform parse_platform( const WCHAR *str ) else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64; else if (!strcmpW( str, szX64 ) || !strcmpW( str, szAMD64 )) return PLATFORM_X64; else if (!strcmpW( str, szARM )) return PLATFORM_ARM; + else if (!strcmpW( str, szARM64 )) return PLATFORM_ARM64; return PLATFORM_UNKNOWN; } @@ -1289,6 +1290,10 @@ static UINT validate_package( MSIPACKAGE *package ) #ifndef __arm__ if (package->platform == PLATFORM_ARM) return ERROR_INSTALL_PLATFORM_UNSUPPORTED; +#endif +#ifndef __aarch64__ + if (package->platform == PLATFORM_ARM64) + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; #endif if (package->platform == PLATFORM_X64) { -- 2.17.1

2 1

[PATCH 1/2] mf: Add a trace to MFCreateTopology.
by Sven Baars 12 Nov '18

12 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mf/topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 924d3863c8..e8389cf4df 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -507,6 +507,8 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) { mftopology *object; + TRACE("(%p)\n", topology); + if (!topology) return E_POINTER; -- 2.17.1

2 2

[PATCH v2] kernel32: Implement GetMaximumProcessorCount
by Alex Henrie 12 Nov '18

12 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45961 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Remove accidentally included tests for GetActiveProcessorCount and implement GetMaximumProcessorCount in a hopefully more correct way by copying the current implementation of GetActiveProcessorCount --- dlls/kernel32/cpu.c | 15 +++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 1e99951993..89482a65e1 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -328,6 +328,21 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) return cpus; } +/*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + SYSTEM_INFO si; + DWORD cpus; + + GetSystemInfo( &si ); + cpus = si.dwNumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + /*********************************************************************** * GetEnabledXStateFeatures (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 74af2a4570..c370a068c2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -718,7 +718,7 @@ # @ stub GetLongPathNameTransactedW @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) -# @ stub GetMaximumProcessorCount +@ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long) -- 2.19.1

1 0

[PATCH] kernel32: Implement GetMaximumProcessorCount
by Alex Henrie 12 Nov '18

12 Nov '18

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45961 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- https://github.com/wine-staging/wine-staging/blob/master/patches/kernel32-P… --- dlls/kernel32/cpu.c | 17 +++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/process.c | 23 +++++++++++++++++++++++ include/winnt.h | 2 ++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 1e99951993..452f3789c0 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -328,6 +328,23 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) return cpus; } +/*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + TRACE("(%u)\n", group); + + if (group && group != ALL_PROCESSOR_GROUPS) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + /* Wine only counts active processors so far */ + return system_info.NumberOfProcessors; +} + /*********************************************************************** * GetEnabledXStateFeatures (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 74af2a4570..c370a068c2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -718,7 +718,7 @@ # @ stub GetLongPathNameTransactedW @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) -# @ stub GetMaximumProcessorCount +@ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f99720f32..850495bff7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void); static BOOL (WINAPI *pInitializeProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD, SIZE_T*); static BOOL (WINAPI *pUpdateProcThreadAttribute)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD_PTR, void *,SIZE_T,void*,SIZE_T*); static void (WINAPI *pDeleteProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*); +static DWORD (WINAPI *pGetActiveProcessorCount)(WORD); /* ############################### */ static char base[MAX_PATH]; @@ -258,6 +259,7 @@ static BOOL init(void) pInitializeProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "InitializeProcThreadAttributeList"); pUpdateProcThreadAttribute = (void *)GetProcAddress(hkernel32, "UpdateProcThreadAttribute"); pDeleteProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "DeleteProcThreadAttributeList"); + pGetActiveProcessorCount = (void *)GetProcAddress(hkernel32, "GetActiveProcessorCount"); return TRUE; } @@ -3655,6 +3657,26 @@ static void test_GetLogicalProcessorInformationEx(void) HeapFree(GetProcessHeap(), 0, info); } +static void test_GetActiveProcessorCount(void) +{ + DWORD count; + + if (!pGetActiveProcessorCount) + { + win_skip("GetActiveProcessorCount not available, skipping test\n"); + return; + } + + count = pGetActiveProcessorCount(0); + ok(count, "GetActiveProcessorCount failed, error %u\n", GetLastError()); + + /* Test would fail on systems with more than 6400 processors */ + SetLastError(0xdeadbeef); + count = pGetActiveProcessorCount(101); + ok(count == 0, "Expeced GetActiveProcessorCount to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); +} + static void test_largepages(void) { SIZE_T size; @@ -3868,6 +3890,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); + test_GetActiveProcessorCount(); test_largepages(); test_ProcThreadAttributeList(); test_SuspendProcessState(); diff --git a/include/winnt.h b/include/winnt.h index b8a630e6d3..d801de9df9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6089,6 +6089,8 @@ typedef struct _GROUP_AFFINITY WORD Reserved[3]; } GROUP_AFFINITY, *PGROUP_AFFINITY; +#define ALL_PROCESSOR_GROUPS 0xffff + typedef struct _PROCESSOR_NUMBER { WORD Group; -- 2.19.1

2 1

[PATCH] dbghelp: Turn variable 'code' into a static constant
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dbghelp/minidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 1a5dca9de6..975bb45c9a 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -670,7 +670,7 @@ static unsigned dump_system_info(struct dump_context* dc) /* write Wine specific system information just behind the structure, and before any string */ if (wine_extra) { - char code[] = {'W','I','N','E'}; + static const char code[] = {'W','I','N','E'}; WriteFile(dc->hFile, code, 4, &written, NULL); /* number of sub-info, so that we can extend structure if needed */ -- 2.19.1

1 0

[PATCH] d3dcompiler_43: Turn variable 'c' into a static constant
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/d3dcompiler_43/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 748501f207..bda41c4ea9 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2176,7 +2176,7 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } else { - char c[] = {'x', 'y', 'z', 'w'}; + static const char c[] = {'x', 'y', 'z', 'w'}; for (i = 0; i < swizzle->node.data_type->dimx; ++i) TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]); -- 2.19.1

1 0

[PATCH] atl: Turn variable 'mshtml_prefixW' into a static constant
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/atl/atl_ax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index ff627ccddb..81212780e0 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1001,9 +1001,9 @@ enum content static enum content get_content_type(LPCOLESTR name, CLSID *control_id) { + static const WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':',0}; WCHAR new_urlW[MAX_PATH]; DWORD size = MAX_PATH; - WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; if (!name || !name[0]) { -- 2.19.1

1 0

[PATCH] testbot/TestLauncher: Remove a dependency on msvcrt.
by Francois Gouget 12 Nov '18

12 Nov '18

Use MAX_PATH instead of _MAX_PATH. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 3052198228..15929c50ab 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -102,7 +102,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName, const char *Subtest) DWORD NR; DWORD NewPos; DWORD FileOffset; - char ModuleName[_MAX_PATH]; + char ModuleName[MAX_PATH]; BOOL Found; BOOL AllPresent; @@ -284,10 +284,10 @@ int main(int argc, char *argv[]) int Arg; DWORD Start, TimeOut; BOOL UsageError; - char TestExeFullName[_MAX_PATH]; + char TestExeFullName[MAX_PATH]; char *TestExeFileName; const char *Suffix; - char TestName[_MAX_PATH]; + char TestName[MAX_PATH]; const char *Subtest; int TestArg; char *CommandLine; -- 2.19.1

1 0

[PATCH] widl: Don't make proxy vtbl const in interpreted mode.
by Jacek Caban 11 Nov '18

11 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/proxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] widl: Write async interface IIDs to _i.c file.
by Jacek Caban 11 Nov '18

11 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/widl.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH v2 2/3] comctl32/status: Hide size grip when the parent window is maximized.
by Waritnan Sookbuntherng 11 Nov '18

11 Nov '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- dlls/comctl32/status.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cb27ee868c..3bf72fa577 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt; -- 2.19.1

2 1

[PATCH v2 1/3] comctl32/tests: Test statusbar size grip behavior.
by Waritnan Sookbuntherng 11 Nov '18

11 Nov '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- dlls/comctl32/tests/status.c | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..483b227a3e 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -586,6 +586,62 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + int r; + LONG oldstyle; + RECT rc; + POINT pt; + LPARAM lParam; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + GetClientRect(hwndStatus, &rc); + + /* get bottom right of the window */ + pt.x = rc.right; + pt.y = rc.bottom; + ClientToScreen(hwndStatus, &pt); + lParam = MAKELPARAM(pt.x, pt.y); + + /* check size grip on bottom right */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r == HTBOTTOMRIGHT, "expected HTBOTTOMRIGHT from WM_NCHITTEST, got %d\n", r); + + /* maximize the main window */ + oldstyle = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + SetWindowLongA(g_hMainWnd, GWL_STYLE, oldstyle|WS_MAXIMIZE); + + /* check size grip again */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r != HTBOTTOMRIGHT, "WM_NCHITTEST returned HTBOTTOMRIGHT\n"); + + /* set WS_EX_LAYOUTRTL which move size grip to the left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + /* check size grip on bottom left */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r != HTBOTTOMLEFT, "WM_NCHITTEST returned HTBOTTOMLEFT\n"); + + /* unset WS_MAXIMIZE */ + SetWindowLongA(g_hMainWnd, GWL_STYLE, oldstyle & ~WS_MAXIMIZE); + + /* get new bottom left point */ + pt.x = rc.right; + pt.y = rc.bottom; + ClientToScreen(hwndStatus, &pt); + lParam = MAKELPARAM(pt.x, pt.y); + + /* check size grip again */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r == HTBOTTOMLEFT, "expected HTBOTTOMLEFT from WM_NCHITTEST, got %d\n", r); + + SetWindowLongA(g_hMainWnd, GWL_STYLE, oldstyle); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +676,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

2 1

[PATCH v2 3/3] comctl32/status: Checking size grip bounds inclusively.
by Waritnan Sookbuntherng 11 Nov '18

11 Nov '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- dlls/comctl32/status.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3bf72fa577..ad69c54ba8 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1011,6 +1011,9 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) rect.left = rect.right - 13; rect.top += 2; + /* checking POINT in RECT inclusively */ + rect.right += 1; + rect.bottom += 1; if (PtInRect (&rect, pt)) { -- 2.19.1

1 0

[PATCH] mlang: Add basic implementation for IMultiLanguage3_DetectInputCodepage
by Fabian Maurer 11 Nov '18

11 Nov '18

This is a first basic implementation that can handle UTF-16/UTF-8 and should cover most text files. It's currently not used by any known program, but I intend to use the function for find.exe to detect encodings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mlang/mlang.c | 35 +++++++++++- dlls/mlang/tests/mlang.c | 114 +++++++++++++++++++++++++++++++++++++++ include/mlang.idl | 12 ++++- 3 files changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f12df298f1..e33c982c76 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3097,8 +3097,39 @@ static HRESULT WINAPI fnIMultiLanguage3_DetectInputCodepage( DetectEncodingInfo* lpEncoding, INT* pnScores) { - FIXME("\n"); - return E_NOTIMPL; + INT test; + + FIXME("(%u %u, %p, %p, %p, %p - semi-stub!\n", dwFlag, dwPrefWinCodePage, pSrcStr, pcSrcSize, lpEncoding, pnScores); + + if (!pSrcStr || !lpEncoding || *pcSrcSize <= 0 || *pnScores <= 0) + return E_INVALIDARG; + + test = IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_REVERSE_SIGNATURE; + IsTextUnicode(pSrcStr, *pcSrcSize, &test); + + if (test & IS_TEXT_UNICODE_SIGNATURE) + { + *pnScores = 1; + lpEncoding[0].nCodePage = 1200; + return S_OK; + } + + if (test & IS_TEXT_UNICODE_REVERSE_SIGNATURE) + { + *pnScores = 1; + lpEncoding[0].nCodePage = 1201; + return S_OK; + } + + /* Check for valid UTF-8 */ + if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, pSrcStr, *pcSrcSize, NULL, 0) > 0) + { + *pnScores = 1; + lpEncoding[0].nCodePage = 65001; + return S_OK; + } + + return S_FALSE; } static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePage( diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index b5d6fc6114..f57a870d93 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2695,6 +2695,119 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) ReleaseDC(NULL, hdc); } +static void test_DetectInputCodepage(IMultiLanguage2 *ml2) +{ + static char str_empty[] = {0}; + static char str_utf8_bom1[] = "\xef\xbb\xbf this is a test string with utf8 bom"; + static char str_utf8_bom2[] = "\xef\xbb\xbf this is a test string with utf8 bom this is a test string with utf8 bom this is a test string with utf8 bom" + "this is a test string with utf8 bom this is a test string with utf8 bom this is a test string with utf8 bom this is a test string with utf8 bom"; + static char str_shift_jis[] = {0x82, 0xB1, 0x82, 0xEA, 0x82, 0xCD, 0x93, 0xFA, 0x96, 0x7B, 0x8C, 0xEA, 0x82, 0xCC, 0x83, 0x65, 0x83, 0x4C, 0x83, 0x58, 0x83, 0x67, 0x82, 0xC5, 0x82, 0xB7, 0x00 }; + static char str_utf16_be_with_bom[] = { + 0xFE, 0xFF, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x78, 0x00, 0x74, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6E, + 0x00, 0x20, 0x00, 0x55, 0x00, 0x54, 0x00, 0x46, 0x00, 0x31, 0x00, 0x36, 0x00 }; + char *str_utf16_be_without_bom = &str_utf16_be_with_bom[2]; + static char str_utf16_le_with_bom[] = { + 0xFF, 0xFE, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, 0x00, + 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x78, 0x00, 0x74, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6E, 0x00, + 0x20, 0x00, 0x55, 0x00, 0x54, 0x00, 0x46, 0x00, 0x31, 0x00, 0x36, 0x00, 0x00 }; + char *str_utf16_le_without_bom = &str_utf16_le_with_bom[2]; + static char str_utf8_hello_without_bom[] = { /* Hello in english, russian and japanese */ + 0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, + 0xD1, 0x82, 0x20, 0xE4, 0xBB, 0x8A, 0xE6, 0x97, 0xA5, 0xE3, 0x81, 0xAF, 0x00 }; + + DetectEncodingInfo encoding_info[5]; + HRESULT result; + INT str_size; + INT encoding_count; + + /* Test error conditions */ + + str_size = sizeof(str_empty); + encoding_count = ARRAY_SIZE(encoding_info); + result = IMultiLanguage2_DetectInputCodepage(ml2, MLDETECTCP_NONE, 0, NULL, &str_size, encoding_info, &encoding_count); + ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %#x\n", result); + ok(5 == encoding_count, "Expected encoding_count to be %d, got %d\n", 5, encoding_count); + + str_size = sizeof(str_empty); + encoding_count = ARRAY_SIZE(encoding_info); + result = IMultiLanguage2_DetectInputCodepage(ml2, MLDETECTCP_NONE, 0, str_empty, &str_size, NULL, &encoding_count); + ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %#x\n", result); + ok(5 == encoding_count, "Expected encoding_count to be %d, got %d\n", 5, encoding_count); + + str_size = 0; + encoding_count = ARRAY_SIZE(encoding_info); + result = IMultiLanguage2_DetectInputCodepage(ml2, MLDETECTCP_NONE, 0, str_empty, &str_size, encoding_info, &encoding_count); + ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %#x\n", result); + ok(5 == encoding_count, "Expected encoding_count to be %d, got %d\n", 5, encoding_count); + + str_size = sizeof(str_empty); + encoding_count = 0; + result = IMultiLanguage2_DetectInputCodepage(ml2, MLDETECTCP_NONE, 0, str_empty, &str_size, encoding_info, &encoding_count); + ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %#x\n", result); + ok(0 == encoding_count, "Expected encoding_count to be %d, got %d\n", 0, encoding_count); + + /* Test strings */ + +#define run_DetectInputCodepage(flags, codepage_default, str) \ + str_size = sizeof(str); \ + encoding_count = ARRAY_SIZE(encoding_info); \ + memset(&encoding_info, 0, sizeof(encoding_info)); \ + result = IMultiLanguage2_DetectInputCodepage(ml2, flags, codepage_default, str, &str_size, encoding_info, &encoding_count); + + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_utf8_bom1); + todo_wine + ok(result == S_FALSE, "Expected %#x, got %#x\n", S_FALSE, result); + ok(1 == encoding_count, "Expected encoding_count to be %d, got %d\n", 1, encoding_count); + ok(encoding_info[0].nCodePage == 65001, "Expected code-page %d, got %d\n", 65001, encoding_info[0].nCodePage); + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_utf8_bom2); + ok(result == S_OK, "Expected %#x, got %#x\n", S_OK, result); + todo_wine + ok(2 == encoding_count, "Expected encoding_count to be %d, got %d\n", 2, encoding_count); + todo_wine + ok(encoding_info[0].nCodePage == 1252, "Expected code-page %d, got %d\n", 1252, encoding_info[0].nCodePage); + todo_wine + ok(encoding_info[1].nCodePage == 65001, "Expected code-page %d, got %d\n", 65001, encoding_info[1].nCodePage); + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_shift_jis); + todo_wine + ok(result == S_OK, "Expected %#x, got %#x\n", S_OK, result); + todo_wine + ok(1 == encoding_count, "Expected encoding_count to be %d, got %d\n", 1, encoding_count); + todo_wine + ok(encoding_info[0].nCodePage == 932, "Expected code-page %d, got %d\n", 932, encoding_info[0].nCodePage); + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_utf16_be_with_bom); + ok(result == S_OK, "Expected %#x, got %#x\n", S_OK, result); + ok(1 == encoding_count, "Expected encoding_count to be %d, got %d\n", 1, encoding_count); + ok(encoding_info[0].nCodePage == 1201, "Expected code-page %d, got %d\n", 1201, encoding_info[0].nCodePage); + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_utf16_le_with_bom); + ok(result == S_OK, "Expected %#x, got %#x\n", S_OK, result); + ok(1 == encoding_count, "Expected encoding_count to be %d, got %d\n", 1, encoding_count); + ok(encoding_info[0].nCodePage == 1200, "Expected code-page %d, got %d\n", 1200, encoding_info[0].nCodePage); + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_utf16_be_without_bom); + ok(result == S_OK, "Expected %#x, got %#x\n", S_OK, result); + ok(1 == encoding_count, "Expected encoding_count to be %d, got %d\n", 1, encoding_count); + todo_wine + ok(encoding_info[0].nCodePage == 20127, "Expected code-page %d, got %d\n", 20127, encoding_info[0].nCodePage); + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_utf16_le_without_bom); + ok(result == S_OK, "Expected %#x, got %#x\n", S_OK, result); + ok(1 == encoding_count, "Expected encoding_count to be %d, got %d\n", 1, encoding_count); + todo_wine + ok(encoding_info[0].nCodePage == 20127, "Expected code-page %d, got %d\n", 20127, encoding_info[0].nCodePage); + + run_DetectInputCodepage(MLDETECTCP_NONE, 0, str_utf8_hello_without_bom); + todo_wine + ok(result == S_FALSE, "Expected %#x, got %#x\n", S_FALSE, result); + ok(1 == encoding_count, "Expected encoding_count to be %d, got %d\n", 1, encoding_count); + ok(encoding_info[0].nCodePage == 65001, "Expected code-page %d, got %d\n", 65001, encoding_info[0].nCodePage); +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -2761,6 +2874,7 @@ START_TEST(mlang) test_IMultiLanguage2_ConvertStringFromUnicode(iML2); test_IsCodePageInstallable(iML2); + test_DetectInputCodepage(iML2); IMultiLanguage2_Release(iML2); diff --git a/include/mlang.idl b/include/mlang.idl index 5867648b04..a23fdb85f4 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -25,6 +25,16 @@ interface IStream; cpp_quote("#define CPIOD_PEEK 0x40000000") cpp_quote("#define CPIOD_FORCE_PROMPT 0x80000000") +typedef enum tagMLDETECTCP +{ + MLDETECTCP_NONE = 0, + MLDETECTCP_7BIT = 1, + MLDETECTCP_8BIT = 2, + MLDETECTCP_DBCS = 4, + MLDETECTCP_HTML = 8, + MLDETECTCP_NUMBER = 16, +} MLDETECTCP; + [ object, uuid(359f3443-bd4a-11d0-b188-00aa0038c969), @@ -677,7 +687,7 @@ interface IMultiLanguage2 : IUnknown [in,out] INT *pnScores); HRESULT DetectInputCodepage( - [in] DWORD dwFlag, + [in] MLDETECTCP dwFlag, [in] DWORD dwPrefWinCodePage, [in] CHAR *pSrcStr, [in,out] INT *pcSrcSize, -- 2.19.1

2 2

[PATCH v3 1/8] comctl32/tests: Test for LB_SETCOUNT without LBS_NODATA
by Gabriel Ivăncescu 11 Nov '18

11 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Fix the tests on broken Windows versions (only on WOW64) and place the tests at the beginning of the patchset. Hopefully this should be enough now. dlls/comctl32/tests/listbox.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index d4bb2cc..60aa59a 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1766,6 +1766,13 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + DestroyWindow( listbox ); + + listbox = create_listbox( LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent ); + + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + todo_wine ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); + DestroyWindow( listbox ); DestroyWindow( parent ); } -- 2.19.1

2 15

[RFC 1/2] user32/combo: Apply code formatting from comctl32
by Fabian Maurer 11 Nov '18

11 Nov '18

--- dlls/user32/combo.c | 847 +++++++++++++++++++++++--------------------- 1 file changed, 445 insertions(+), 402 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 31ec6af526..8b7cd17909 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -132,9 +132,9 @@ static BOOL COMBO_Init(void) */ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) { - LPHEADCOMBO lphc; + HEADCOMBO *lphc; - if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) + if (COMBO_Init() && (lphc = heap_alloc_zero(sizeof(*lphc)))) { lphc->self = hwnd; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); @@ -165,20 +165,20 @@ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) /*********************************************************************** * COMBO_NCDestroy */ -static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) +static LRESULT COMBO_NCDestroy( HEADCOMBO *lphc ) { + if (lphc) + { + TRACE("[%p]: freeing storage\n", lphc->self); - if( lphc ) - { - TRACE("[%p]: freeing storage\n", lphc->self); + if ( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) + DestroyWindow( lphc->hWndLBox ); - if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) - DestroyWindow( lphc->hWndLBox ); + SetWindowLongPtrW( lphc->self, 0, 0 ); + heap_free( lphc ); + } - SetWindowLongPtrW( lphc->self, 0, 0 ); - HeapFree( GetProcessHeap(), 0, lphc ); - } - return 0; + return 0; } /*********************************************************************** @@ -684,9 +684,7 @@ static HBRUSH COMBO_PrepareColors( * * Paint CBS_DROPDOWNLIST text field / update edit control contents. */ -static void CBPaintText( - LPHEADCOMBO lphc, - HDC hdc_paint) +static void CBPaintText(HEADCOMBO *lphc, HDC hdc_paint) { RECT rectEdit = lphc->textRect; INT id, size = 0; @@ -702,7 +700,7 @@ static void CBPaintText( size = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, id, 0); if (size == LB_ERR) FIXME("LB_ERR probably not handled yet\n"); - if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) + if ((pText = heap_alloc((size + 1) * sizeof(WCHAR)))) { /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, id, (LPARAM)pText); @@ -800,7 +798,8 @@ static void CBPaintText( if( !hdc_paint ) ReleaseDC( lphc->self, hdc ); } - HeapFree( GetProcessHeap(), 0, pText ); + + heap_free(pText); } /*********************************************************************** @@ -901,8 +900,8 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) idx = LB_ERR; length = SendMessageW( lphc->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ); - if( length > 0 ) - pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + if (length > 0) + pText = heap_alloc((length + 1) * sizeof(WCHAR)); TRACE("\t edit text length %i\n", length ); @@ -910,7 +909,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) { GetWindowTextW( lphc->hWndEdit, pText, length + 1); idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, -1, (LPARAM)pText); - HeapFree( GetProcessHeap(), 0, pText ); + heap_free( pText ); } SendMessageW(lphc->hWndLBox, LB_SETCURSEL, bSelect ? idx : -1, 0); @@ -940,10 +939,8 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, index, 0); if( length != LB_ERR) { - if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) - { + if ((pText = heap_alloc((length + 1) * sizeof(WCHAR)))) SendMessageW(lphc->hWndLBox, LB_GETTEXT, index, (LPARAM)pText); - } } } @@ -957,7 +954,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - HeapFree( GetProcessHeap(), 0, pText ); + heap_free( pText ); } /*********************************************************************** @@ -1178,7 +1175,7 @@ static void COMBO_KillFocus( LPHEADCOMBO lphc ) if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST ) SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0); - lphc->wState &= ~CBF_FOCUSED; + lphc->wState &= ~CBF_FOCUSED; /* redraw text */ if( !(lphc->wState & CBF_EDIT) ) @@ -1349,7 +1346,7 @@ static LRESULT COMBO_ItemOp( LPHEADCOMBO lphc, UINT msg, LPARAM lParam ) /*********************************************************************** * COMBO_GetTextW */ -static LRESULT COMBO_GetTextW( LPHEADCOMBO lphc, INT count, LPWSTR buf ) +static LRESULT COMBO_GetTextW( HEADCOMBO *lphc, INT count, LPWSTR buf ) { INT length; @@ -1369,7 +1366,7 @@ static LRESULT COMBO_GetTextW( LPHEADCOMBO lphc, INT count, LPWSTR buf ) /* 'length' is without the terminating character */ if (length >= count) { - LPWSTR lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + WCHAR *lpBuffer = heap_alloc((length + 1) * sizeof(WCHAR)); if (!lpBuffer) goto error; length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)lpBuffer); @@ -1379,7 +1376,7 @@ static LRESULT COMBO_GetTextW( LPHEADCOMBO lphc, INT count, LPWSTR buf ) lstrcpynW( buf, lpBuffer, count ); length = count; } - HeapFree( GetProcessHeap(), 0, lpBuffer ); + heap_free( lpBuffer ); } else length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)buf); @@ -1786,393 +1783,439 @@ static char *strdupA(LPCSTR str) */ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { - LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); + HEADCOMBO *lphc = (HEADCOMBO *)GetWindowLongPtrW( hwnd, 0 ); - TRACE("[%p]: msg %s wp %08lx lp %08lx\n", - hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); + TRACE("[%p]: msg %s wp %08lx lp %08lx\n", + hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); - if (!IsWindow(hwnd)) return 0; + if (!IsWindow(hwnd)) return 0; - if( lphc || message == WM_NCCREATE ) - switch(message) - { + if (lphc || message == WM_NCCREATE) + switch(message) + { - /* System messages */ + /* System messages */ - case WM_NCCREATE: - { - LONG style = unicode ? ((LPCREATESTRUCTW)lParam)->style : - ((LPCREATESTRUCTA)lParam)->style; - return COMBO_NCCreate(hwnd, style); - } - case WM_NCDESTROY: - COMBO_NCDestroy(lphc); - break;/* -> DefWindowProc */ - - case WM_CREATE: - { - HWND hwndParent; - LONG style; - if(unicode) - { - hwndParent = ((LPCREATESTRUCTW)lParam)->hwndParent; - style = ((LPCREATESTRUCTW)lParam)->style; - } - else - { - hwndParent = ((LPCREATESTRUCTA)lParam)->hwndParent; - style = ((LPCREATESTRUCTA)lParam)->style; - } - return COMBO_Create(hwnd, lphc, hwndParent, style, unicode); - } + case WM_NCCREATE: + { + LONG style = unicode ? ((LPCREATESTRUCTW)lParam)->style : + ((LPCREATESTRUCTA)lParam)->style; + return COMBO_NCCreate(hwnd, style); + } + case WM_NCDESTROY: + COMBO_NCDestroy(lphc); + break;/* -> DefWindowProc */ - case WM_PRINTCLIENT: - /* Fallthrough */ - case WM_PAINT: - /* wParam may contain a valid HDC! */ - return COMBO_Paint(lphc, (HDC)wParam); + case WM_CREATE: + { + HWND hwndParent; + LONG style; + if(unicode) + { + hwndParent = ((LPCREATESTRUCTW)lParam)->hwndParent; + style = ((LPCREATESTRUCTW)lParam)->style; + } + else + { + hwndParent = ((LPCREATESTRUCTA)lParam)->hwndParent; + style = ((LPCREATESTRUCTA)lParam)->style; + } + return COMBO_Create(hwnd, lphc, hwndParent, style, unicode); + } - case WM_ERASEBKGND: - /* do all painting in WM_PAINT like Windows does */ - return 1; + case WM_PRINTCLIENT: + case WM_PAINT: + /* wParam may contain a valid HDC! */ + return COMBO_Paint(lphc, (HDC)wParam); - case WM_GETDLGCODE: - { - LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS; - if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) - { - int vk = (int)((LPMSG)lParam)->wParam; + case WM_ERASEBKGND: + /* do all painting in WM_PAINT like Windows does */ + return 1; - if ((vk == VK_RETURN || vk == VK_ESCAPE) && (lphc->wState & CBF_DROPPED)) - result |= DLGC_WANTMESSAGE; - } - return result; - } - case WM_SIZE: - if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); - return TRUE; - case WM_SETFONT: - COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); - return TRUE; - case WM_GETFONT: - return (LRESULT)lphc->hFont; - case WM_SETFOCUS: - if( lphc->wState & CBF_EDIT ) { - SetFocus( lphc->hWndEdit ); - /* The first time focus is received, select all the text */ - if( !(lphc->wState & CBF_BEENFOCUSED) ) { - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - lphc->wState |= CBF_BEENFOCUSED; - } - } - else - COMBO_SetFocus( lphc ); - return TRUE; - case WM_KILLFOCUS: + case WM_GETDLGCODE: + { + LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS; + if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) + { + int vk = (int)((LPMSG)lParam)->wParam; + + if ((vk == VK_RETURN || vk == VK_ESCAPE) && (lphc->wState & CBF_DROPPED)) + result |= DLGC_WANTMESSAGE; + } + return result; + } + + case WM_SIZE: + if (lphc->hWndLBox && !(lphc->wState & CBF_NORESIZE)) + COMBO_Size( lphc ); + return TRUE; + + case WM_SETFONT: + COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); + return TRUE; + + case WM_GETFONT: + return (LRESULT)lphc->hFont; + + case WM_SETFOCUS: + if (lphc->wState & CBF_EDIT) + { + SetFocus( lphc->hWndEdit ); + /* The first time focus is received, select all the text */ + if (!(lphc->wState & CBF_BEENFOCUSED)) { - HWND hwndFocus = WIN_GetFullHandle( (HWND)wParam ); - if( !hwndFocus || - (hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox )) - COMBO_KillFocus( lphc ); - return TRUE; + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + lphc->wState |= CBF_BEENFOCUSED; } - case WM_COMMAND: - return COMBO_Command( lphc, wParam, WIN_GetFullHandle( (HWND)lParam ) ); - case WM_GETTEXT: - return unicode ? COMBO_GetTextW( lphc, wParam, (LPWSTR)lParam ) - : COMBO_GetTextA( lphc, wParam, (LPSTR)lParam ); - case WM_SETTEXT: - case WM_GETTEXTLENGTH: - case WM_CLEAR: - if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT)) - { - int j = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); - if (j == -1) return 0; - return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, j, 0) : - SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, j, 0); - } - else if( lphc->wState & CBF_EDIT ) - { - LRESULT ret; - lphc->wState |= CBF_NOEDITNOTIFY; - ret = unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : - SendMessageA(lphc->hWndEdit, message, wParam, lParam); - lphc->wState &= ~CBF_NOEDITNOTIFY; - return ret; - } - else return CB_ERR; - case WM_CUT: - case WM_PASTE: - case WM_COPY: - if( lphc->wState & CBF_EDIT ) - { - return unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : - SendMessageA(lphc->hWndEdit, message, wParam, lParam); - } - else return CB_ERR; - - case WM_DRAWITEM: - case WM_DELETEITEM: - case WM_COMPAREITEM: - case WM_MEASUREITEM: - return COMBO_ItemOp(lphc, message, lParam); - case WM_ENABLE: - if( lphc->wState & CBF_EDIT ) - EnableWindow( lphc->hWndEdit, (BOOL)wParam ); - EnableWindow( lphc->hWndLBox, (BOOL)wParam ); - - /* Force the control to repaint when the enabled state changes. */ - InvalidateRect(lphc->self, NULL, TRUE); - return TRUE; - case WM_SETREDRAW: - if( wParam ) - lphc->wState &= ~CBF_NOREDRAW; - else - lphc->wState |= CBF_NOREDRAW; - - if( lphc->wState & CBF_EDIT ) - SendMessageW(lphc->hWndEdit, message, wParam, lParam); - SendMessageW(lphc->hWndLBox, message, wParam, lParam); - return 0; - case WM_SYSKEYDOWN: - if( KEYDATA_ALT & HIWORD(lParam) ) - if( wParam == VK_UP || wParam == VK_DOWN ) - COMBO_FlipListbox( lphc, FALSE, FALSE ); - return 0; - - case WM_KEYDOWN: - if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && - (lphc->wState & CBF_DROPPED)) - { - CBRollUp( lphc, wParam == VK_RETURN, FALSE ); - return TRUE; - } - else if ((wParam == VK_F4) && !(lphc->wState & CBF_EUI)) - { - COMBO_FlipListbox( lphc, FALSE, FALSE ); - return TRUE; - } - /* fall through */ - case WM_CHAR: - case WM_IME_CHAR: - { - HWND hwndTarget; + } + else + COMBO_SetFocus( lphc ); + return TRUE; - if( lphc->wState & CBF_EDIT ) - hwndTarget = lphc->hWndEdit; - else - hwndTarget = lphc->hWndLBox; - - return unicode ? SendMessageW(hwndTarget, message, wParam, lParam) : - SendMessageA(hwndTarget, message, wParam, lParam); - } - case WM_LBUTTONDOWN: - if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self ); - if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam ); - return TRUE; - case WM_LBUTTONUP: - COMBO_LButtonUp( lphc ); - return TRUE; - case WM_MOUSEMOVE: - if( lphc->wState & CBF_CAPTURE ) - COMBO_MouseMove( lphc, wParam, lParam ); - return TRUE; - - case WM_MOUSEWHEEL: - if (wParam & (MK_SHIFT | MK_CONTROL)) - return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : - DefWindowProcA(hwnd, message, wParam, lParam); - - if (GET_WHEEL_DELTA_WPARAM(wParam) > 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_UP, 0); - if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); - return TRUE; - - /* Combo messages */ - - case CB_ADDSTRING: - if( unicode ) - { - if( lphc->dwStyle & CBS_LOWERCASE ) - CharLowerW((LPWSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - CharUpperW((LPWSTR)lParam); - return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); - } - else /* unlike the unicode version, the ansi version does not overwrite - the string if converting case */ - { - char *string = NULL; - LRESULT ret; - if( lphc->dwStyle & CBS_LOWERCASE ) - { - string = strdupA((LPSTR)lParam); - CharLowerA(string); - } - - else if( lphc->dwStyle & CBS_UPPERCASE ) - { - string = strdupA((LPSTR)lParam); - CharUpperA(string); - } - - ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); - HeapFree(GetProcessHeap(), 0, string); - return ret; - } - case CB_INSERTSTRING: - if( unicode ) - { - if( lphc->dwStyle & CBS_LOWERCASE ) - CharLowerW((LPWSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - CharUpperW((LPWSTR)lParam); - return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); - } - else - { - if( lphc->dwStyle & CBS_LOWERCASE ) - CharLowerA((LPSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - CharUpperA((LPSTR)lParam); + case WM_KILLFOCUS: + { + HWND hwndFocus = WIN_GetFullHandle( (HWND)wParam ); + if (!hwndFocus || (hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox)) + COMBO_KillFocus( lphc ); + return TRUE; + } - return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); - } - case CB_DELETESTRING: - return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) : - SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0); - case CB_SELECTSTRING: - return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode); - case CB_FINDSTRING: - return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam); - case CB_FINDSTRINGEXACT: - return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam); - case CB_SETITEMHEIGHT: - return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam); - case CB_GETITEMHEIGHT: - if( (INT)wParam >= 0 ) /* listbox item */ - return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); - return CBGetTextAreaHeight(hwnd, lphc); - case CB_RESETCONTENT: - SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); - if( (lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc) ) - { - static const WCHAR empty_stringW[] = { 0 }; - SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW); - } - else - InvalidateRect(lphc->self, NULL, TRUE); - return TRUE; - case CB_INITSTORAGE: - return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam); - case CB_GETHORIZONTALEXTENT: - return SendMessageW(lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0); - case CB_SETHORIZONTALEXTENT: - return SendMessageW(lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0); - case CB_GETTOPINDEX: - return SendMessageW(lphc->hWndLBox, LB_GETTOPINDEX, 0, 0); - case CB_GETLOCALE: - return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0); - case CB_SETLOCALE: - return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0); - case CB_SETDROPPEDWIDTH: - if( (CB_GETTYPE(lphc) == CBS_SIMPLE) || - (INT)wParam >= 32768 ) - return CB_ERR; - /* new value must be higher than combobox width */ - if((INT)wParam >= lphc->droppedRect.right - lphc->droppedRect.left) - lphc->droppedWidth = wParam; - else if(wParam) - lphc->droppedWidth = 0; - - /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); - - /* fall through */ - case CB_GETDROPPEDWIDTH: - if( lphc->droppedWidth ) - return lphc->droppedWidth; - return lphc->droppedRect.right - lphc->droppedRect.left; - case CB_GETDROPPEDCONTROLRECT: - if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); - return CB_OKAY; - case CB_GETDROPPEDSTATE: - return (lphc->wState & CBF_DROPPED) != 0; - case CB_DIR: - return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam); - - case CB_SHOWDROPDOWN: - if( CB_GETTYPE(lphc) != CBS_SIMPLE ) - { - if( wParam ) - { - if( !(lphc->wState & CBF_DROPPED) ) - CBDropDown( lphc ); - } - else - if( lphc->wState & CBF_DROPPED ) - CBRollUp( lphc, FALSE, TRUE ); - } - return TRUE; - case CB_GETCOUNT: - return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0); - case CB_GETCURSEL: - return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); - case CB_SETCURSEL: - lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0); - if( lParam >= 0 ) - SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0); - - /* no LBN_SELCHANGE in this case, update manually */ - CBPaintText( lphc, NULL ); - lphc->wState &= ~CBF_SELCHANGE; - return lParam; - case CB_GETLBTEXT: - return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam); - case CB_GETLBTEXTLEN: - return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0) : - SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0); - case CB_GETITEMDATA: - return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0); - case CB_SETITEMDATA: - return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam); - case CB_GETEDITSEL: - /* Edit checks passed parameters itself */ - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam); - return CB_ERR; - case CB_SETEDITSEL: - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_SETSEL, - (INT)(SHORT)LOWORD(lParam), (INT)(SHORT)HIWORD(lParam) ); - return CB_ERR; - case CB_SETEXTENDEDUI: - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - return CB_ERR; - if( wParam ) - lphc->wState |= CBF_EUI; - else lphc->wState &= ~CBF_EUI; - return CB_OKAY; - case CB_GETEXTENDEDUI: - return (lphc->wState & CBF_EUI) != 0; - case CB_GETCOMBOBOXINFO: - return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); - case CB_LIMITTEXT: - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); - return TRUE; - default: - if (message >= WM_USER) - WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", - message - WM_USER, wParam, lParam ); - break; - } - return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : - DefWindowProcA(hwnd, message, wParam, lParam); + case WM_COMMAND: + return COMBO_Command( lphc, wParam, WIN_GetFullHandle( (HWND)lParam ) ); + + case WM_GETTEXT: + return unicode ? COMBO_GetTextW( lphc, wParam, (LPWSTR)lParam ) + : COMBO_GetTextA( lphc, wParam, (LPSTR)lParam ); + + case WM_SETTEXT: + case WM_GETTEXTLENGTH: + case WM_CLEAR: + if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT)) + { + int j = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); + if (j == -1) return 0; + return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, j, 0) : + SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, j, 0); + } + else if ( lphc->wState & CBF_EDIT ) + { + LRESULT ret; + lphc->wState |= CBF_NOEDITNOTIFY; + ret = unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : + SendMessageA(lphc->hWndEdit, message, wParam, lParam); + lphc->wState &= ~CBF_NOEDITNOTIFY; + return ret; + } + else + return CB_ERR; + + case WM_CUT: + case WM_PASTE: + case WM_COPY: + if (lphc->wState & CBF_EDIT) + { + return unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : + SendMessageA(lphc->hWndEdit, message, wParam, lParam); + } + else return CB_ERR; + + case WM_DRAWITEM: + case WM_DELETEITEM: + case WM_COMPAREITEM: + case WM_MEASUREITEM: + return COMBO_ItemOp(lphc, message, lParam); + + case WM_ENABLE: + if (lphc->wState & CBF_EDIT) + EnableWindow( lphc->hWndEdit, (BOOL)wParam ); + EnableWindow( lphc->hWndLBox, (BOOL)wParam ); + + /* Force the control to repaint when the enabled state changes. */ + InvalidateRect(lphc->self, NULL, TRUE); + return TRUE; + + case WM_SETREDRAW: + if (wParam) + lphc->wState &= ~CBF_NOREDRAW; + else + lphc->wState |= CBF_NOREDRAW; + + if ( lphc->wState & CBF_EDIT ) + SendMessageW(lphc->hWndEdit, message, wParam, lParam); + SendMessageW(lphc->hWndLBox, message, wParam, lParam); + return 0; + + case WM_SYSKEYDOWN: + if ( KEYDATA_ALT & HIWORD(lParam) ) + if( wParam == VK_UP || wParam == VK_DOWN ) + COMBO_FlipListbox( lphc, FALSE, FALSE ); + return 0; + + case WM_KEYDOWN: + if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && + (lphc->wState & CBF_DROPPED)) + { + CBRollUp( lphc, wParam == VK_RETURN, FALSE ); + return TRUE; + } + else if ((wParam == VK_F4) && !(lphc->wState & CBF_EUI)) + { + COMBO_FlipListbox( lphc, FALSE, FALSE ); + return TRUE; + } + /* fall through */ + case WM_CHAR: + case WM_IME_CHAR: + { + HWND hwndTarget; + + if ( lphc->wState & CBF_EDIT ) + hwndTarget = lphc->hWndEdit; + else + hwndTarget = lphc->hWndLBox; + + return unicode ? SendMessageW(hwndTarget, message, wParam, lParam) : + SendMessageA(hwndTarget, message, wParam, lParam); + } + + case WM_LBUTTONDOWN: + if ( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self ); + if ( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam ); + return TRUE; + + case WM_LBUTTONUP: + COMBO_LButtonUp( lphc ); + return TRUE; + + case WM_MOUSEMOVE: + if (lphc->wState & CBF_CAPTURE) + COMBO_MouseMove( lphc, wParam, lParam ); + return TRUE; + + case WM_MOUSEWHEEL: + if (wParam & (MK_SHIFT | MK_CONTROL)) + return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : + DefWindowProcA(hwnd, message, wParam, lParam); + + if (GET_WHEEL_DELTA_WPARAM(wParam) > 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_UP, 0); + if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); + return TRUE; + + /* Combo messages */ + + case CB_ADDSTRING: + if( unicode ) + { + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerW((LPWSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); + } + else /* unlike the unicode version, the ansi version does not overwrite + the string if converting case */ + { + char *string = NULL; + LRESULT ret; + if( lphc->dwStyle & CBS_LOWERCASE ) + { + string = strdupA((LPSTR)lParam); + CharLowerA(string); + } + + else if( lphc->dwStyle & CBS_UPPERCASE ) + { + string = strdupA((LPSTR)lParam); + CharUpperA(string); + } + + ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); + HeapFree(GetProcessHeap(), 0, string); + return ret; + } + case CB_INSERTSTRING: + if( unicode ) + { + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerW((LPWSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } + else + { + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerA((LPSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperA((LPSTR)lParam); + + return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } + case CB_DELETESTRING: + return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) : + SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0); + + case CB_SELECTSTRING: + return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode); + + case CB_FINDSTRING: + return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam); + + case CB_FINDSTRINGEXACT: + return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam); + + case CB_SETITEMHEIGHT: + return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam); + + case CB_GETITEMHEIGHT: + if ((INT)wParam >= 0) /* listbox item */ + return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); + return CBGetTextAreaHeight(hwnd, lphc); + + case CB_RESETCONTENT: + SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); + + if ((lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc)) + { + static const WCHAR empty_stringW[] = { 0 }; + SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW); + } + else + InvalidateRect(lphc->self, NULL, TRUE); + return TRUE; + + case CB_INITSTORAGE: + return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam); + + case CB_GETHORIZONTALEXTENT: + return SendMessageW(lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0); + + case CB_SETHORIZONTALEXTENT: + return SendMessageW(lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0); + + case CB_GETTOPINDEX: + return SendMessageW(lphc->hWndLBox, LB_GETTOPINDEX, 0, 0); + + case CB_GETLOCALE: + return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0); + + case CB_SETLOCALE: + return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0); + + case CB_SETDROPPEDWIDTH: + if ((CB_GETTYPE(lphc) == CBS_SIMPLE) || (INT)wParam >= 32768) + return CB_ERR; + + /* new value must be higher than combobox width */ + if ((INT)wParam >= lphc->droppedRect.right - lphc->droppedRect.left) + lphc->droppedWidth = wParam; + else if (wParam) + lphc->droppedWidth = 0; + + /* recalculate the combobox area */ + CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + + /* fall through */ + case CB_GETDROPPEDWIDTH: + if (lphc->droppedWidth) + return lphc->droppedWidth; + return lphc->droppedRect.right - lphc->droppedRect.left; + + case CB_GETDROPPEDCONTROLRECT: + if (lParam) + CBGetDroppedControlRect(lphc, (LPRECT)lParam ); + return CB_OKAY; + + case CB_GETDROPPEDSTATE: + return (lphc->wState & CBF_DROPPED) != 0; + + case CB_DIR: + return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam); + + case CB_SHOWDROPDOWN: + if (CB_GETTYPE(lphc) != CBS_SIMPLE) + { + if (wParam) + { + if (!(lphc->wState & CBF_DROPPED)) + CBDropDown( lphc ); + } + else if (lphc->wState & CBF_DROPPED) + CBRollUp( lphc, FALSE, TRUE ); + } + return TRUE; + + case CB_GETCOUNT: + return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0); + + case CB_GETCURSEL: + return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); + + case CB_SETCURSEL: + lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0); + if (lParam >= 0) + SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0); + + /* no LBN_SELCHANGE in this case, update manually */ + CBPaintText(lphc, NULL); + lphc->wState &= ~CBF_SELCHANGE; + return lParam; + + case CB_GETLBTEXT: + return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam); + + case CB_GETLBTEXTLEN: + return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0) : + SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0); + + case CB_GETITEMDATA: + return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0); + + case CB_SETITEMDATA: + return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam); + + case CB_GETEDITSEL: + /* Edit checks passed parameters itself */ + if (lphc->wState & CBF_EDIT) + return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam); + return CB_ERR; + + case CB_SETEDITSEL: + if (lphc->wState & CBF_EDIT) + return SendMessageW(lphc->hWndEdit, EM_SETSEL, (INT)(SHORT)LOWORD(lParam), (INT)(SHORT)HIWORD(lParam) ); + return CB_ERR; + + case CB_SETEXTENDEDUI: + if (CB_GETTYPE(lphc) == CBS_SIMPLE ) + return CB_ERR; + if (wParam) + lphc->wState |= CBF_EUI; + else + lphc->wState &= ~CBF_EUI; + return CB_OKAY; + + case CB_GETEXTENDEDUI: + return (lphc->wState & CBF_EUI) != 0; + + case CB_GETCOMBOBOXINFO: + return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); + + case CB_LIMITTEXT: + if (lphc->wState & CBF_EDIT) + return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); + return TRUE; + + default: + if (message >= WM_USER) + WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", message - WM_USER, wParam, lParam ); + break; + } + return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : + DefWindowProcA(hwnd, message, wParam, lParam); } /************************************************************************* -- 2.19.1

3 5

[v5 PATCH 1/4] comctl32/tests: Add more Listbox tests for ownerdraw styles.
by Nikolay Sivov 11 Nov '18

11 Nov '18

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index d4bb2cc2a8..c118047b4f 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -433,6 +433,35 @@ static void test_ownerdraw(void) ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); DestroyWindow(hLB); + + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, + NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); +todo_wine + ok(ret == 42, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + + DestroyWindow (hLB); + DestroyWindow(parent); } @@ -1737,7 +1766,13 @@ static void test_listbox_dlgdir(void) static void test_set_count( void ) { + static const DWORD styles[] = + { + LBS_OWNERDRAWFIXED, + LBS_HASSTRINGS, + }; HWND parent, listbox; + unsigned int i; LONG ret; RECT r; @@ -1767,6 +1802,21 @@ static void test_set_count( void ) ok( !IsRectEmpty( &r ), "got empty rect\n"); DestroyWindow( listbox ); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + listbox = create_listbox( styles[i] | WS_CHILD | WS_VISIBLE, parent ); + + SetLastError( 0xdeadbeef ); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + todo_wine_if(i == 0) + ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); + todo_wine_if(i == 1) + ok( GetLastError() == 0xdeadbeef, "Unexpected error %d.\n", GetLastError() ); + + DestroyWindow( listbox ); + } + DestroyWindow( parent ); } -- 2.19.1

1 3

[PATCH] dwrite: Improve returned font metrics when OS/2 table is missing.
by Nikolay Sivov 11 Nov '18

11 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 7 ++ dlls/dwrite/tests/font.c | 211 +++++++++++++++++++++++---------------- 2 files changed, 130 insertions(+), 88 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index db44368b2f..db7dabcd56 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1309,6 +1309,13 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->hasTypographicMetrics = TRUE; } } + else { + metrics->strikethroughPosition = metrics->designUnitsPerEm / 3; + if (tt_hhea) { + metrics->ascent = GET_BE_WORD(tt_hhea->ascender); + metrics->descent = abs((SHORT)GET_BE_WORD(tt_hhea->descender)); + } + } if (tt_post) { metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f21aecdd5d..29fa2f3b53 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -511,6 +511,27 @@ static void _delete_testfontfile(const WCHAR *filename, int line) ok_(__FILE__,line)(ret, "failed to delete file %s, error %d\n", wine_dbgstr_w(filename), GetLastError()); } +static void get_combined_font_name(const WCHAR *familyW, const WCHAR *faceW, WCHAR *nameW) +{ + static const WCHAR spaceW[] = {' ', 0}; + lstrcpyW(nameW, familyW); + lstrcatW(nameW, spaceW); + lstrcatW(nameW, faceW); +} + +static BOOL has_face_variations(IDWriteFontFace *fontface) +{ + IDWriteFontFace5 *fontface5; + BOOL ret = FALSE; + + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5))) { + ret = IDWriteFontFace5_HasVariations(fontface5); + IDWriteFontFace5_Release(fontface5); + } + + return ret; +} + struct test_fontenumerator { IDWriteFontFileEnumerator IDWriteFontFileEnumerator_iface; @@ -1916,6 +1937,13 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET metrics->superscriptSizeX = GET_BE_WORD(tt_os2->ySuperscriptXSize); metrics->superscriptSizeY = GET_BE_WORD(tt_os2->ySuperscriptYSize); } + else { + metrics->strikethroughPosition = metrics->designUnitsPerEm / 3; + if (tt_hhea) { + metrics->ascent = GET_BE_WORD(tt_hhea->ascender); + metrics->descent = abs((SHORT)GET_BE_WORD(tt_hhea->descender)); + } + } if (tt_post) { metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); @@ -1937,55 +1965,72 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET IDWriteFontFace_ReleaseFontTable(fontface, post_context); } -static void check_font_metrics(const WCHAR *nameW, BOOL has_metrics1, const DWRITE_FONT_METRICS *got, - const DWRITE_FONT_METRICS1 *expected) +static void check_font_metrics(const WCHAR *nameW, IDWriteFontFace *fontface, const DWRITE_FONT_METRICS1 *expected) { - ok(got->designUnitsPerEm == expected->designUnitsPerEm, "font %s: designUnitsPerEm %u, expected %u\n", - wine_dbgstr_w(nameW), got->designUnitsPerEm, expected->designUnitsPerEm); - ok(got->ascent == expected->ascent, "font %s: ascent %u, expected %u\n", wine_dbgstr_w(nameW), got->ascent, + IDWriteFontFace1 *fontface1 = NULL; + DWRITE_FONT_METRICS1 metrics; + DWORD simulations; + BOOL has_metrics1; + + has_metrics1 = SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1)); + simulations = IDWriteFontFace_GetSimulations(fontface); + + if (fontface1) { + IDWriteFontFace1_GetMetrics(fontface1, &metrics); + IDWriteFontFace1_Release(fontface1); + } + else + IDWriteFontFace_GetMetrics(fontface, (DWRITE_FONT_METRICS *)&metrics); + + ok(metrics.designUnitsPerEm == expected->designUnitsPerEm, "font %s: designUnitsPerEm %u, expected %u\n", + wine_dbgstr_w(nameW), metrics.designUnitsPerEm, expected->designUnitsPerEm); + ok(metrics.ascent == expected->ascent, "font %s: ascent %u, expected %u\n", wine_dbgstr_w(nameW), metrics.ascent, expected->ascent); - ok(got->descent == expected->descent, "font %s: descent %u, expected %u\n", wine_dbgstr_w(nameW), got->descent, - expected->descent); - ok(got->lineGap == expected->lineGap, "font %s: lineGap %d, expected %d\n", wine_dbgstr_w(nameW), got->lineGap, - expected->lineGap); - ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", - wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); - ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " - "expected %u\n", wine_dbgstr_w(nameW), got->underlineThickness, expected->underlineThickness); - ok(got->strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", - wine_dbgstr_w(nameW), got->strikethroughPosition, expected->strikethroughPosition); - ok(got->strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " - "expected %u\n", wine_dbgstr_w(nameW), got->strikethroughThickness, expected->strikethroughThickness); + ok(metrics.descent == expected->descent, "font %s: descent %u, expected %u\n", wine_dbgstr_w(nameW), + metrics.descent, expected->descent); + ok(metrics.lineGap == expected->lineGap, "font %s: lineGap %d, expected %d\n", wine_dbgstr_w(nameW), + metrics.lineGap, expected->lineGap); + ok(metrics.underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.underlinePosition, expected->underlinePosition); + ok(metrics.underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " + "expected %u\n", wine_dbgstr_w(nameW), metrics.underlineThickness, expected->underlineThickness); + ok(metrics.strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.strikethroughPosition, expected->strikethroughPosition); + ok(metrics.strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " + "expected %u\n", wine_dbgstr_w(nameW), metrics.strikethroughThickness, expected->strikethroughThickness); if (has_metrics1) { - const DWRITE_FONT_METRICS1 *m1 = (const DWRITE_FONT_METRICS1*)got; - ok(m1->hasTypographicMetrics == expected->hasTypographicMetrics, "font %s: hasTypographicMetrics %d, " - "expected %d\n", wine_dbgstr_w(nameW), m1->hasTypographicMetrics, expected->hasTypographicMetrics); - ok(m1->glyphBoxLeft == expected->glyphBoxLeft, "font %s: glyphBoxLeft %d, expected %d\n", wine_dbgstr_w(nameW), - m1->glyphBoxLeft, expected->glyphBoxLeft); - ok(m1->glyphBoxTop == expected->glyphBoxTop, "font %s: glyphBoxTop %d, expected %d\n", wine_dbgstr_w(nameW), - m1->glyphBoxTop, expected->glyphBoxTop); - ok(m1->glyphBoxRight == expected->glyphBoxRight, "font %s: glyphBoxRight %d, expected %d\n", wine_dbgstr_w(nameW), - m1->glyphBoxRight, expected->glyphBoxRight); - ok(m1->glyphBoxBottom == expected->glyphBoxBottom, "font %s: glyphBoxBottom %d, expected %d\n", wine_dbgstr_w(nameW), - m1->glyphBoxBottom, expected->glyphBoxBottom); - - ok(m1->subscriptPositionX == expected->subscriptPositionX, "font %s: subscriptPositionX %d, expected %d\n", - wine_dbgstr_w(nameW), m1->subscriptPositionX, expected->subscriptPositionX); - ok(m1->subscriptPositionY == expected->subscriptPositionY, "font %s: subscriptPositionY %d, expected %d\n", - wine_dbgstr_w(nameW), m1->subscriptPositionY, expected->subscriptPositionY); - ok(m1->subscriptSizeX == expected->subscriptSizeX, "font %s: subscriptSizeX %d, expected %d\n", - wine_dbgstr_w(nameW), m1->subscriptSizeX, expected->subscriptSizeX); - ok(m1->subscriptSizeY == expected->subscriptSizeY, "font %s: subscriptSizeY %d, expected %d\n", - wine_dbgstr_w(nameW), m1->subscriptSizeY, expected->subscriptSizeY); - ok(m1->superscriptPositionX == expected->superscriptPositionX, "font %s: superscriptPositionX %d, expected %d\n", - wine_dbgstr_w(nameW), m1->superscriptPositionX, expected->superscriptPositionX); - ok(m1->superscriptPositionY == expected->superscriptPositionY, "font %s: superscriptPositionY %d, expected %d\n", - wine_dbgstr_w(nameW), m1->superscriptPositionY, expected->superscriptPositionY); - ok(m1->superscriptSizeX == expected->superscriptSizeX, "font %s: superscriptSizeX %d, expected %d\n", - wine_dbgstr_w(nameW), m1->superscriptSizeX, expected->superscriptSizeX); - ok(m1->superscriptSizeY == expected->superscriptSizeY, "font %s: superscriptSizeY %d, expected %d\n", - wine_dbgstr_w(nameW), m1->superscriptSizeY, expected->superscriptSizeY); + /* For simulated faces metrics are adjusted. Enable tests when exact pattern is understood. */ + if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) + return; + + ok(metrics.hasTypographicMetrics == expected->hasTypographicMetrics, "font %s: hasTypographicMetrics %d, " + "expected %d\n", wine_dbgstr_w(nameW), metrics.hasTypographicMetrics, expected->hasTypographicMetrics); + ok(metrics.glyphBoxLeft == expected->glyphBoxLeft, "font %s: glyphBoxLeft %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.glyphBoxLeft, expected->glyphBoxLeft); + ok(metrics.glyphBoxTop == expected->glyphBoxTop, "font %s: glyphBoxTop %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.glyphBoxTop, expected->glyphBoxTop); + ok(metrics.glyphBoxRight == expected->glyphBoxRight, "font %s: glyphBoxRight %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.glyphBoxRight, expected->glyphBoxRight); + ok(metrics.glyphBoxBottom == expected->glyphBoxBottom, "font %s: glyphBoxBottom %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.glyphBoxBottom, expected->glyphBoxBottom); + + ok(metrics.subscriptPositionX == expected->subscriptPositionX, "font %s: subscriptPositionX %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.subscriptPositionX, expected->subscriptPositionX); + ok(metrics.subscriptPositionY == expected->subscriptPositionY, "font %s: subscriptPositionY %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.subscriptPositionY, expected->subscriptPositionY); + ok(metrics.subscriptSizeX == expected->subscriptSizeX, "font %s: subscriptSizeX %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.subscriptSizeX, expected->subscriptSizeX); + ok(metrics.subscriptSizeY == expected->subscriptSizeY, "font %s: subscriptSizeY %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.subscriptSizeY, expected->subscriptSizeY); + ok(metrics.superscriptPositionX == expected->superscriptPositionX, "font %s: superscriptPositionX %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.superscriptPositionX, expected->superscriptPositionX); + ok(metrics.superscriptPositionY == expected->superscriptPositionY, "font %s: superscriptPositionY %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.superscriptPositionY, expected->superscriptPositionY); + ok(metrics.superscriptSizeX == expected->superscriptSizeX, "font %s: superscriptSizeX %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.superscriptSizeX, expected->superscriptSizeX); + ok(metrics.superscriptSizeY == expected->superscriptSizeY, "font %s: superscriptSizeY %d, expected %d\n", + wine_dbgstr_w(nameW), metrics.superscriptSizeY, expected->superscriptSizeY); } } @@ -2195,47 +2240,53 @@ static void test_GetMetrics(void) count = IDWriteFontCollection_GetFontFamilyCount(syscollection); for (i = 0; i < count; i++) { - DWRITE_FONT_METRICS1 expected_metrics, metrics1; + DWRITE_FONT_METRICS1 expected_metrics; + WCHAR familyW[256], faceW[256]; IDWriteLocalizedStrings *names; - IDWriteFontFace1 *fontface1; IDWriteFontFamily *family; + UINT32 fontcount, j; IDWriteFont *font; - WCHAR nameW[256]; hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, - DWRITE_FONT_STYLE_NORMAL, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); + fontcount = IDWriteFontFamily_GetFontCount(family); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get family names, hr %#x.\n", hr); + get_enus_string(names, familyW, ARRAY_SIZE(familyW)); + IDWriteLocalizedStrings_Release(names); - fontface1 = NULL; - IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + for (j = 0; j < fontcount; j++) { + WCHAR nameW[256]; - hr = IDWriteFontFamily_GetFamilyNames(family, &names); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get a font, hr %#x.\n", hr); - get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create face instance, hr %#x.\n", hr); - IDWriteLocalizedStrings_Release(names); - IDWriteFont_Release(font); + hr = IDWriteFont_GetFaceNames(font, &names); + ok(hr == S_OK, "Failed to get face names, hr %#x.\n", hr); + get_enus_string(names, faceW, ARRAY_SIZE(faceW)); + IDWriteLocalizedStrings_Release(names); - get_expected_font_metrics(fontface, &expected_metrics); - if (fontface1) { - IDWriteFontFace1_GetMetrics(fontface1, &metrics1); - check_font_metrics(nameW, TRUE, (const DWRITE_FONT_METRICS*)&metrics1, &expected_metrics); - } - else { - IDWriteFontFace_GetMetrics(fontface, &metrics); - check_font_metrics(nameW, FALSE, &metrics, &expected_metrics); + IDWriteFont_Release(font); + + get_combined_font_name(familyW, faceW, nameW); + + if (has_face_variations(fontface)) { + skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + IDWriteFontFace_Release(fontface); + continue; + } + + get_expected_font_metrics(fontface, &expected_metrics); + check_font_metrics(nameW, fontface, &expected_metrics); + + IDWriteFontFace_Release(fontface); } - if (fontface1) - IDWriteFontFace1_Release(fontface1); - IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family); } IDWriteFontCollection_Release(syscollection); @@ -2542,19 +2593,6 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) IDWriteFontFace_Release(fontface); } -static BOOL has_face_variations(IDWriteFontFace *fontface) -{ - IDWriteFontFace5 *fontface5; - BOOL ret = FALSE; - - if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5))) { - ret = IDWriteFontFace5_HasVariations(fontface5); - IDWriteFontFace5_Release(fontface5); - } - - return ret; -} - static void test_ConvertFontFaceToLOGFONT(void) { IDWriteFontCollection *collection; @@ -2606,7 +2644,6 @@ if (0) /* crashes on native */ font_count = IDWriteFontFamily_GetFontCount(family); for (j = 0; j < font_count; j++) { - static const WCHAR spaceW[] = {' ', 0}; IDWriteFontFace *fontface; hr = IDWriteFontFamily_GetFont(family, j, &font); @@ -2618,9 +2655,7 @@ if (0) /* crashes on native */ get_enus_string(names, facenameW, ARRAY_SIZE(facenameW)); IDWriteLocalizedStrings_Release(names); - lstrcpyW(nameW, familynameW); - lstrcatW(nameW, spaceW); - lstrcatW(nameW, facenameW); + get_combined_font_name(familynameW, facenameW, nameW); hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.19.1

1 0

[RFC] widl: Add option to generate classfactory
by Fabian Maurer 10 Nov '18

10 Nov '18

Since the com simplification with the macros is probably not feasible, here an approach that reuses an old idea - using widl to generate a classfactory. Feedback appreciated! --- dlls/uiribbon/main.c | 141 ---------------- dlls/uiribbon/uiribbon.c | 8 +- dlls/uiribbon/uiribbon_classes.idl | 1 + tools/makedep.c | 9 +- tools/widl/Makefile.in | 1 + tools/widl/factory.c | 250 +++++++++++++++++++++++++++++ tools/widl/parser.y | 1 + tools/widl/widl.c | 23 ++- tools/widl/widl.h | 3 + 9 files changed, 291 insertions(+), 146 deletions(-) create mode 100644 tools/widl/factory.c diff --git a/dlls/uiribbon/main.c b/dlls/uiribbon/main.c index a76c349ad9..b54644599f 100644 --- a/dlls/uiribbon/main.c +++ b/dlls/uiribbon/main.c @@ -56,147 +56,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -typedef struct { - IClassFactory IClassFactory_iface; - - LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, void **ppObj); -} IClassFactoryImpl; - -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) -{ - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); -} - -struct object_creation_info -{ - const CLSID *clsid; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, void **ppObj); -}; - -static const struct object_creation_info object_creation[] = -{ - { &CLSID_UIRibbonFramework, UIRibbonFrameworkImpl_Create }, -}; - -static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, void **ppobj) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IClassFactory)) - { - IClassFactory_AddRef(iface); - *ppobj = &This->IClassFactory_iface; - return S_OK; - } - - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI XFCF_AddRef(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - return InterlockedIncrement(&This->ref); -} - -static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - ULONG ref = InterlockedDecrement(&This->ref); - - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); - - return ref; -} - -static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, void **ppobj) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - HRESULT hres; - LPUNKNOWN punk; - - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - - *ppobj = NULL; - hres = This->pfnCreateInstance(pOuter, (void **) &punk); - if (SUCCEEDED(hres)) { - hres = IUnknown_QueryInterface(punk, riid, ppobj); - IUnknown_Release(punk); - } - return hres; -} - -static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d), stub!\n",This,dolock); - return S_OK; -} - -static const IClassFactoryVtbl XFCF_Vtbl = -{ - XFCF_QueryInterface, - XFCF_AddRef, - XFCF_Release, - XFCF_CreateInstance, - XFCF_LockServer -}; - -/******************************************************************************* - * Retrieves class object from a DLL object - * - * NOTES - * Docs say returns STDAPI - * - * PARAMS - * rclsid [I] CLSID for the class object - * riid [I] Reference to identifier of interface for class object - * ppv [O] Address of variable to receive interface pointer for riid - * - * RETURNS - * Success: S_OK - * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, - * E_UNEXPECTED - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) -{ - unsigned int i; - IClassFactoryImpl *factory; - - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - - if ( !IsEqualGUID( &IID_IClassFactory, riid ) - && ! IsEqualGUID( &IID_IUnknown, riid) ) - return E_NOINTERFACE; - - for (i = 0; i < ARRAY_SIZE(object_creation); i++) - { - if (IsEqualGUID(object_creation[i].clsid, rclsid)) - break; - } - - if (i == ARRAY_SIZE(object_creation)) - { - FIXME("%s: no class found.\n", debugstr_guid(rclsid)); - return CLASS_E_CLASSNOTAVAILABLE; - } - - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; - - factory->IClassFactory_iface.lpVtbl = &XFCF_Vtbl; - factory->ref = 1; - - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - - *ppv = &(factory->IClassFactory_iface); - return S_OK; -} - HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; diff --git a/dlls/uiribbon/uiribbon.c b/dlls/uiribbon/uiribbon.c index 58ac51aece..5385af5430 100644 --- a/dlls/uiribbon/uiribbon.c +++ b/dlls/uiribbon/uiribbon.c @@ -156,7 +156,7 @@ static const IUIFrameworkVtbl IUIFramework_Vtbl = UIRibbonFrameworkImpl_SetModes }; -HRESULT UIRibbonFrameworkImpl_Create(IUnknown *pUnkOuter, void **ppObj) +HRESULT UIRibbonFramework_Create(IUnknown *pUnkOuter, void **ppObj) { UIRibbonFrameworkImpl *object; @@ -173,3 +173,9 @@ HRESULT UIRibbonFrameworkImpl_Create(IUnknown *pUnkOuter, void **ppObj) return S_OK; } + +HRESULT UIRibbonImageFromBitmapFactory_Create(IUnknown *unk_outer, void **obj) +{ + FIXME("(%p, %p) - stub!\n", unk_outer, obj); + return E_FAIL; +} diff --git a/dlls/uiribbon/uiribbon_classes.idl b/dlls/uiribbon/uiribbon_classes.idl index bd8bdde6b6..78d79a13fc 100644 --- a/dlls/uiribbon/uiribbon_classes.idl +++ b/dlls/uiribbon/uiribbon_classes.idl @@ -17,5 +17,6 @@ */ #pragma makedep register +#pragma makedep factory #include "uiribbon.idl" diff --git a/tools/makedep.c b/tools/makedep.c index e3bb04ae82..755635f5dc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -100,6 +100,7 @@ struct incl_file #define FLAG_RC_PO 0x010000 /* rc file contains translations */ #define FLAG_C_IMPLIB 0x020000 /* file is part of an import library */ #define FLAG_SFD_FONTS 0x040000 /* sfd file generated bitmap fonts */ +#define FLAG_IDL_FACTORY 0x080000 /* generates a factory (_f.c) file */ static const struct { @@ -114,7 +115,8 @@ static const struct { FLAG_IDL_PROXY, "_p.c" }, { FLAG_IDL_SERVER, "_s.c" }, { FLAG_IDL_REGISTER, "_r.res" }, - { FLAG_IDL_HEADER, ".h" } + { FLAG_IDL_HEADER, ".h" }, + { FLAG_IDL_FACTORY, "_f.c" } }; #define HASH_SIZE 997 @@ -996,6 +998,7 @@ static void parse_pragma_directive( struct file *source, char *str ) else if (!strcmp( flag, "typelib" )) source->flags |= FLAG_IDL_TYPELIB; else if (!strcmp( flag, "register" )) source->flags |= FLAG_IDL_REGISTER; else if (!strcmp( flag, "regtypelib" )) source->flags |= FLAG_IDL_REGTYPELIB; + else if (!strcmp( flag, "factory" )) source->flags |= FLAG_IDL_FACTORY; } else if (strendswith( source->name, ".rc" )) { @@ -1821,6 +1824,10 @@ static void add_generated_sources( struct makefile *make ) add_dependency( file->file, replace_extension( source->name, ".idl", ".h" ), INCL_NORMAL ); add_all_includes( make, file, file->file ); } + if (source->file->flags & FLAG_IDL_FACTORY) + { + add_generated_source( make, replace_extension( source->name, ".idl", "_f.c" ), NULL ); + } if (source->file->flags & FLAG_IDL_IDENT) { file = add_generated_source( make, replace_extension( source->name, ".idl", "_i.c" ), NULL ); diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index e06d6cc5b3..3e725a1c69 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -4,6 +4,7 @@ MANPAGES = widl.man.in C_SRCS = \ client.c \ expr.c \ + factory.c \ hash.c \ header.c \ proxy.c \ diff --git a/tools/widl/factory.c b/tools/widl/factory.c new file mode 100644 index 0000000000..4ed0459b20 --- /dev/null +++ b/tools/widl/factory.c @@ -0,0 +1,250 @@ +/* + * IDL Compiler + * + * Copyright 2018 Fabian Maurer + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdio.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <string.h> +#include <ctype.h> + +#include "widl.h" +#include "utils.h" +#include "parser.h" +#include "header.h" + +#include "widltypes.h" +#include "typegen.h" +#include "expr.h" + +static FILE* factory; +static int indent = 0; + +static void print_factory( const char *format, ... ) __attribute__((format (printf, 1, 2))); +static void print_factory( const char *format, ... ) +{ + va_list va; + va_start(va, format); + print(factory, indent, format, va); + va_end(va); +} + +static void init_factory(void) +{ + if (factory) return; + if (!(factory = fopen(factory_name, "w"))) + error("Could not open %s for output\n", factory_name); + + print_factory("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); + print_factory("#define COBJMACROS\n"); + print_factory("#include \"%s\"\n", header_name); + print_factory("#include \"wine/debug.h\"\n"); + print_factory("\n"); + print_factory("WINE_DEFAULT_DEBUG_CHANNEL(classfactory);\n"); + print_factory("const char *source = \"%s\";", dup_basename(input_name, ".idl")); + print_factory("\n"); + print_factory("\n"); + +} + +static void write_class_array(const statement_list_t *stmts) +{ + const statement_t *stmt; + + /* Declare all functions which need to be provided for the factory */ + LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_COCLASS) + { + type_t *object = stmt->u.type; + print_factory("HRESULT %s_Create(IUnknown *unk_outer, void **obj);\n", object->name); + } + } + print_factory("\n"); + + + print_factory("struct object_creation_info\n"); + print_factory("{\n"); + print_factory(" const CLSID *clsid;\n"); + print_factory(" HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **obj);\n"); + print_factory("};\n"); + print_factory("\n"); + + print_factory("static const struct object_creation_info object_creation[] =\n"); + print_factory("{\n"); + + LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_COCLASS) + { + type_t *object = stmt->u.type; + print_factory(" {&CLSID_%s, &%s_Create },\n", object->name, object->name); + } + } + print_factory("};\n"); +} + +void write_factory_methods(void) +{ + print_factory("typedef struct {\n"); + print_factory(" IClassFactory IClassFactory_iface;\n"); + print_factory(" LONG ref;\n"); + print_factory(" HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **obj);\n"); + print_factory("} IClassFactoryImpl;\n"); + print_factory("\n"); + + print_factory("static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)\n"); + print_factory("{\n"); + print_factory(" return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);\n"); + print_factory("}\n"); + print_factory("\n"); + + print_factory("static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj)\n"); + print_factory("{\n"); + print_factory(" IClassFactoryImpl *impl = impl_from_IClassFactory(iface);\n"); + print_factory("\n"); + print_factory(" if (IsEqualGUID(riid, &IID_IUnknown)\n"); + print_factory(" || IsEqualGUID(riid, &IID_IClassFactory))\n"); + print_factory(" {\n"); + print_factory(" IClassFactory_AddRef(iface);\n"); + print_factory(" *ppobj = &impl->IClassFactory_iface;\n"); + print_factory(" return S_OK;\n"); + print_factory(" }\n"); + print_factory("\n"); + print_factory(" WARN(\"%%s - (%%p)->(%%s,%%p),not found\\n\", source, impl, debugstr_guid(riid), ppobj);\n"); + print_factory(" return E_NOINTERFACE;\n"); + print_factory("}\n"); + print_factory("\n"); + + print_factory("static ULONG WINAPI classfactory_AddRef(IClassFactory *iface)\n"); + print_factory("{\n"); + print_factory(" IClassFactoryImpl *This = impl_from_IClassFactory(iface);\n"); + print_factory(" return InterlockedIncrement(&This->ref);\n"); + print_factory("}\n"); + print_factory("\n"); + + print_factory("static ULONG WINAPI classfactory_Release(IClassFactory *iface)\n"); + print_factory("{\n"); + print_factory(" IClassFactoryImpl *impl = impl_from_IClassFactory(iface);\n"); + print_factory(" ULONG ref = InterlockedDecrement(&impl->ref);\n"); + print_factory("\n"); + print_factory(" if (ref == 0)\n"); + print_factory(" HeapFree(GetProcessHeap(), 0, impl);\n"); + print_factory("\n"); + print_factory(" return ref;\n"); + print_factory("}\n"); + print_factory("\n"); + + print_factory("static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer_unk, REFIID riid, void **ppobj)\n"); + print_factory("{\n"); + print_factory(" IClassFactoryImpl *impl = impl_from_IClassFactory(iface);\n"); + print_factory(" HRESULT hres;\n"); + print_factory(" IUnknown *unk;\n"); + print_factory("\n"); + print_factory(" TRACE(\"%%s - (%%p)->(%%p,%%s,%%p)\\n\", source, impl, outer_unk, debugstr_guid(riid), ppobj);\n"); + print_factory("\n"); + print_factory(" *ppobj = NULL;\n"); + print_factory(" hres = impl->pfnCreateInstance(outer_unk, (void **) &unk);\n"); + print_factory(" if (SUCCEEDED(hres))\n"); + print_factory(" {\n"); + print_factory(" hres = IUnknown_QueryInterface(unk, riid, ppobj);\n"); + print_factory(" IUnknown_Release(unk);\n"); + print_factory(" }\n"); + print_factory(" return hres;\n"); + print_factory("}\n"); + print_factory("\n"); + + print_factory("static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock)\n"); + print_factory("{\n"); + print_factory(" IClassFactoryImpl *impl = impl_from_IClassFactory(iface);\n"); + print_factory(" FIXME(\"%%s - (%%p)->(%%d), stub!\\n\", source, impl, dolock);\n"); + print_factory(" return S_OK;\n"); + print_factory("}\n"); + print_factory("\n"); + + print_factory("static const IClassFactoryVtbl classfactory_Vtbl =\n"); + print_factory("{\n"); + print_factory(" classfactory_QueryInterface,\n"); + print_factory(" classfactory_AddRef,\n"); + print_factory(" classfactory_Release,\n"); + print_factory(" classfactory_CreateInstance,\n"); + print_factory(" classfactory_LockServer\n"); + print_factory("};\n"); + print_factory("\n"); + + print_factory("HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)\n"); + print_factory("{\n"); + print_factory(" unsigned int i;\n"); + print_factory(" IClassFactoryImpl *factory;\n"); + print_factory("\n"); + print_factory(" TRACE(\"(%%s - %%s,%%s,%%p)\\n\", source, debugstr_guid(rclsid), debugstr_guid(riid), ppv);\n"); + print_factory("\n"); + print_factory(" if (!IsEqualGUID(&IID_IClassFactory, riid)\n"); + print_factory(" && !IsEqualGUID( &IID_IUnknown, riid))\n"); + print_factory(" return E_NOINTERFACE;\n"); + print_factory("\n"); + print_factory(" for (i = 0; i < ARRAY_SIZE(object_creation); i++)\n"); + print_factory(" {\n"); + print_factory(" if (IsEqualGUID(object_creation[i].clsid, rclsid))\n"); + print_factory(" break;\n"); + print_factory(" }\n"); + print_factory("\n"); + print_factory(" if (i == ARRAY_SIZE(object_creation))\n"); + print_factory(" {\n"); + print_factory(" FIXME(\"%%s - %%s: no class found.\\n\", source, debugstr_guid(rclsid));\n"); + print_factory(" return CLASS_E_CLASSNOTAVAILABLE;\n"); + print_factory(" }\n"); + print_factory("\n"); + print_factory(" factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory));\n"); + print_factory(" if (factory == NULL)\n"); + print_factory(" return E_OUTOFMEMORY;\n"); + print_factory("\n"); + print_factory(" factory->IClassFactory_iface.lpVtbl = &classfactory_Vtbl;\n"); + print_factory(" factory->ref = 1;\n"); + print_factory("\n"); + print_factory(" factory->pfnCreateInstance = object_creation[i].pfnCreateInstance;\n"); + print_factory("\n"); + print_factory(" *ppv = &factory->IClassFactory_iface;\n"); + print_factory(" return S_OK;\n"); + print_factory("}\n"); +} + +void write_factory(const statement_list_t *stmts) +{ + + if (!do_factory) + return; + + if (!stmts) + return; + + init_factory(); + if (!factory) + return; + + write_class_array(stmts); + write_factory_methods(); + + fclose(factory); +} diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d979394182..ed46b216d0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -334,6 +334,7 @@ input: gbl_statements m_acf { fix_incomplete(); write_typelib_regscript($1); write_dlldata($1); write_local_stubs($1); + write_factory($1); } ; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 410efb4c4c..6e10a5d092 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -58,6 +58,7 @@ static const char usage[] = " -d n Set debug level to 'n'\n" " -D id[=val] Define preprocessor identifier id=val\n" " -E Preprocess only\n" +" -f Generate class factory\n" " --help Display this help and exit\n" " -h Generate headers\n" " -H file Name of header file (default is infile.h)\n" @@ -111,6 +112,7 @@ int do_server = 0; int do_regscript = 0; int do_idfile = 0; int do_dlldata = 0; +int do_factory = 0; static int no_preprocess = 0; int old_names = 0; int do_win32 = 1; @@ -137,6 +139,7 @@ char *server_name; char *server_token; char *regscript_name; char *regscript_token; +char *factory_name; static char *idfile_name; char *temp_name; const char *prefix_client = ""; @@ -172,7 +175,7 @@ enum { }; static const char short_options[] = - "b:cC:d:D:EhH:I:m:No:O:pP:rsS:tT:uU:VW"; + "b:cC:d:D:EfhH:I:m:No:O:pP:rsS:tT:uU:VW"; static const struct option long_options[] = { { "acf", 1, NULL, ACF_OPTION }, { "app_config", 0, NULL, APP_CONFIG_OPTION }, @@ -319,6 +322,7 @@ static void set_everything(int x) do_regscript = x; do_idfile = x; do_dlldata = x; + do_factory = x; } void start_cplusplus_guard(FILE *fp) @@ -647,6 +651,10 @@ int main(int argc,char *argv[]) do_everything = 0; preprocess_only = 1; break; + case 'f': + do_everything = 0; + do_factory = 1; + break; case 'h': do_everything = 0; do_header = 1; @@ -725,7 +733,7 @@ int main(int argc,char *argv[]) /* if nothing specified, try to guess output type from the output file name */ if (output_name && do_everything && !do_header && !do_typelib && !do_proxies && - !do_client && !do_server && !do_regscript && !do_idfile && !do_dlldata) + !do_client && !do_server && !do_regscript && !do_idfile && !do_dlldata && !do_factory) { do_everything = 0; if (strendswith( output_name, ".h" )) do_header = 1; @@ -737,6 +745,7 @@ int main(int argc,char *argv[]) else if (strendswith( output_name, "_r.res" )) do_regscript = 1; else if (strendswith( output_name, "_t.res" )) do_typelib = 1; else if (strendswith( output_name, "dlldata.c" )) do_dlldata = 1; + else if (strendswith( output_name, "_f.c" )) do_factory = 1; else do_everything = 1; } @@ -747,7 +756,7 @@ int main(int argc,char *argv[]) if (!output_name) output_name = dup_basename(input_name, ".idl"); if (do_header + do_typelib + do_proxies + do_client + - do_server + do_regscript + do_idfile + do_dlldata == 1) + do_server + do_regscript + do_idfile + do_dlldata + do_factory == 1) { if (do_header) header_name = output_name; else if (do_typelib) typelib_name = output_name; @@ -757,6 +766,7 @@ int main(int argc,char *argv[]) else if (do_regscript) regscript_name = output_name; else if (do_idfile) idfile_name = output_name; else if (do_dlldata) dlldata_name = output_name; + else if (do_factory) factory_name = output_name; } if (!dlldata_name && do_dlldata) @@ -832,6 +842,11 @@ int main(int argc,char *argv[]) strcat(idfile_name, "_i.c"); } + if (!factory_name && do_factory) { + factory_name = dup_basename(input_name, ".idl"); + strcat(factory_name, "_f.c"); + } + if (do_proxies) proxy_token = dup_basename_token(proxy_name,"_p.c"); if (do_client) client_token = dup_basename_token(client_name,"_c.c"); if (do_server) server_token = dup_basename_token(server_name,"_s.c"); @@ -922,4 +937,6 @@ static void rm_tempfile(void) unlink(proxy_name); if (do_typelib) unlink(typelib_name); + if (do_factory) + unlink(factory_name); } diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 118e2245c2..759a7b818e 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -44,6 +44,7 @@ extern int do_server; extern int do_regscript; extern int do_idfile; extern int do_dlldata; +extern int do_factory; extern int old_names; extern int do_win32; extern int do_win64; @@ -66,6 +67,7 @@ extern char *client_name; extern char *client_token; extern char *server_name; extern char *server_token; +extern char *factory_name; extern char *regscript_name; extern char *regscript_token; extern const char *prefix_client; @@ -94,6 +96,7 @@ extern void write_typelib_regscript(const statement_list_t *stmts); extern void output_typelib_regscript( const typelib_t *typelib ); extern void write_local_stubs(const statement_list_t *stmts); extern void write_dlldata(const statement_list_t *stmts); +extern void write_factory(const statement_list_t *stmts); extern void start_cplusplus_guard(FILE *fp); extern void end_cplusplus_guard(FILE *fp); -- 2.19.1

2 1

[v4 PATCH 1/4] comctl32/tests: Add more Listbox tests for ownerdraw styles.
by Nikolay Sivov 10 Nov '18

10 Nov '18

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index d4bb2cc2a8..c118047b4f 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -433,6 +433,35 @@ static void test_ownerdraw(void) ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); DestroyWindow(hLB); + + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, + NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); +todo_wine + ok(ret == 42, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + + DestroyWindow (hLB); + DestroyWindow(parent); } @@ -1737,7 +1766,13 @@ static void test_listbox_dlgdir(void) static void test_set_count( void ) { + static const DWORD styles[] = + { + LBS_OWNERDRAWFIXED, + LBS_HASSTRINGS, + }; HWND parent, listbox; + unsigned int i; LONG ret; RECT r; @@ -1767,6 +1802,21 @@ static void test_set_count( void ) ok( !IsRectEmpty( &r ), "got empty rect\n"); DestroyWindow( listbox ); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + listbox = create_listbox( styles[i] | WS_CHILD | WS_VISIBLE, parent ); + + SetLastError( 0xdeadbeef ); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + todo_wine_if(i == 0) + ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); + todo_wine_if(i == 1) + ok( GetLastError() == 0xdeadbeef, "Unexpected error %d.\n", GetLastError() ); + + DestroyWindow( listbox ); + } + DestroyWindow( parent ); } -- 2.19.1

2 6

[PATCH] ntdll: Call system hook in LdrResolveDelayLoadedAPI when dll hook is missing (try 2)
by André Hentschel 10 Nov '18

10 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46089 Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- try 2: Fixed bad assumption about the purpose of hook return values dlls/kernel32/tests/loader.c | 53 ++++++++++++++++++++++++++++++++---- dlls/ntdll/loader.c | 18 ++++++++++-- include/delayloadhandler.h | 1 + 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index bc88c5f6cf..01c7cfa8a9 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -48,7 +48,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE }; static LONG *child_failures; -static WORD cb_count; +static WORD cb_count, cb_count_sys; static DWORD page_size; static BOOL is_win64 = sizeof(void *) > sizeof(int); static BOOL is_wow64; @@ -70,7 +70,8 @@ static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, - PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, + PDELAYLOAD_FAILURE_DLL_CALLBACK, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE, PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); @@ -3339,6 +3340,14 @@ static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) return (void*)0xdeadbeef; } +static PVOID WINAPI failuresyshook(const char *dll, const char *function) +{ + ok(!strcmp(dll, "secur32.dll"), "wrong dll: %s\n", dll); + ok(!((ULONG_PTR)function >> 16), "expected ordinal, got %p\n", function); + cb_count_sys++; + return (void*)0x12345678; +} + static void test_ResolveDelayLoadedAPI(void) { static const char test_dll[] = "secur32.dll"; @@ -3573,8 +3582,9 @@ static void test_ResolveDelayLoadedAPI(void) load = (void *)GetProcAddress(htarget, (char*)iibn->Name); } - cb_count = 0; - ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, NULL, &itda[i], 0); + /* test without failure dll callback */ + cb_count = cb_count_sys = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, NULL, failuresyshook, &itda[i], 0); if (td[i].succeeds) { ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); @@ -3582,11 +3592,42 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret == (void*)itda[i].u1.AddressOfData, "Test %u: expected %p, got %p\n", i, ret, (void*)itda[i].u1.AddressOfData); ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); } else { - ok(ret == (void*)0xdeadbeef, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); - ok(cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(ret == (void*)0x12345678, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(cb_count_sys == 1, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + + /* test with failure dll callback */ + cb_count = cb_count_sys = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, failuresyshook, &itda[i], 0); + if (td[i].succeeds) + { + ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); + ok(ret == load, "Test %u: expected %p, got %p\n", i, load, ret); + ok(ret == (void*)itda[i].u1.AddressOfData, "Test %u: expected %p, got %p\n", + i, ret, (void*)itda[i].u1.AddressOfData); + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else + { + if (ret == (void*)0x12345678) + { + /* Win10+ sometimes buffers the address of the stub function */ + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else if (ret == (void*)0xdeadbeef) + { + ok(cb_count == 1, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else + ok(0, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); } } delaydir++; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c5e8d0d7c1..ce1b1f28ec 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2934,7 +2934,8 @@ BOOLEAN WINAPI RtlDllShutdownInProgress(void) * LdrResolveDelayLoadedAPI (NTDLL.@) */ void* WINAPI LdrResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, - PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, void* syshook, + PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, IMAGE_THUNK_DATA* addr, ULONG flags ) { IMAGE_THUNK_DATA *pIAT, *pINT; @@ -2992,7 +2993,20 @@ fail: delayinfo.TargetModuleBase = *phmod; delayinfo.Unused = NULL; delayinfo.LastError = nts; - return dllhook(4, &delayinfo); + + if (dllhook) + return dllhook(4, &delayinfo); + + if (IMAGE_SNAP_BY_ORDINAL(pINT[id].u1.Ordinal)) + { + DWORD_PTR ord = LOWORD(pINT[id].u1.Ordinal); + return syshook(name, (char*)ord); + } + else + { + const IMAGE_IMPORT_BY_NAME* iibn = get_rva(base, pINT[id].u1.AddressOfData); + return syshook(name, (char*)iibn->Name); + } } /****************************************************************** diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h index 06b658990c..e8336111ff 100644 --- a/include/delayloadhandler.h +++ b/include/delayloadhandler.h @@ -47,6 +47,7 @@ typedef struct _DELAYLOAD_INFO } DELAYLOAD_INFO, *PDELAYLOAD_INFO; typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_DLL_CALLBACK)(ULONG, PDELAYLOAD_INFO); +typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_SYSTEM_ROUTINE)(LPCSTR, LPCSTR); #ifdef __cplusplus } -- 2.17.1

2 1

[PATCH] server: Fix keyboard hardware message regression
by Andre Heider 10 Nov '18

10 Nov '18

The same "struct message" cannot be reused easily, revert to old behavior and allocate a new one. This fixes keyboard input on e.g. Witcher 3, which would just hang upon pressing the first key. Fixes: 383cf211 ("server: Add a helper function to allocate a hardware message.") Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- server/queue.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 9dfbd1e294..545991b99c 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1775,11 +1775,11 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } - if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; - msg_data = msg->data; - if ((device = current->process->rawinput_kbd)) { + if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + msg_data = msg->data; + msg->win = device->target; msg->msg = WM_INPUT; msg->wparam = RIM_INPUT; @@ -1793,6 +1793,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c queue_hardware_message( desktop, msg, 0 ); } + if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + msg_data = msg->data; + msg->win = get_user_full_handle( win ); msg->msg = message_code; msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */ -- 2.19.1

1 0

[PATCH] kernel32/tests: Fix skips for implemented functions.
by Nikolay Sivov 10 Nov '18

10 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/process.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0c99fca0d1..168bdd5e7b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4710,7 +4710,7 @@ static void test_GetFinalPathNameByHandleA(void) if (!pGetFinalPathNameByHandleA) { - skip("GetFinalPathNameByHandleA is missing\n"); + win_skip("GetFinalPathNameByHandleA is missing\n"); return; } @@ -4803,7 +4803,7 @@ static void test_GetFinalPathNameByHandleW(void) if (!pGetFinalPathNameByHandleW) { - skip("GetFinalPathNameByHandleW is missing\n"); + win_skip("GetFinalPathNameByHandleW is missing\n"); return; } @@ -5026,7 +5026,7 @@ static void test_post_completion(void) if (!pGetQueuedCompletionStatusEx) { - skip("GetQueuedCompletionStatusEx not available\n"); + win_skip("GetQueuedCompletionStatusEx not available\n"); CloseHandle( port ); return; } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f99720f32..fe68d28e91 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2117,7 +2117,7 @@ static void test_IsWow64Process(void) if (!pIsWow64Process) { - skip("IsWow64Process is not available\n"); + win_skip("IsWow64Process is not available\n"); return; } @@ -3660,7 +3660,7 @@ static void test_largepages(void) SIZE_T size; if (!pGetLargePageMinimum) { - skip("No GetLargePageMinimum support.\n"); + win_skip("No GetLargePageMinimum support.\n"); return; } size = pGetLargePageMinimum(); -- 2.19.1

1 0

[PATCH 2/2] include: Add more PROCESSOR_ARCHITECTURE defines
by André Hentschel 10 Nov '18

10 Nov '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 9edd65ed3a..6b5b66002a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -653,6 +653,8 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_NEUTRAL 11 #define PROCESSOR_ARCHITECTURE_ARM64 12 +#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 +#define PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 14 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* dwProcessorType */ -- 2.17.1

1 0

[PATCH 1/2] include: Add IMAGE_REL_ARM64_BRANCH19
by André Hentschel 10 Nov '18

10 Nov '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index b8a630e6d3..9edd65ed3a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3490,6 +3490,7 @@ typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR; #define IMAGE_REL_ARM64_TOKEN 0x000C #define IMAGE_REL_ARM64_SECTION 0x000D #define IMAGE_REL_ARM64_ADDR64 0x000E +#define IMAGE_REL_ARM64_BRANCH19 0x000F /* IA64 relocation types */ #define IMAGE_REL_IA64_ABSOLUTE 0x0000 -- 2.17.1

1 0

[PATCH vkd3d 5/5] vkd3d: Validate heap type for render target and unordered access buffers.
by Józef Kucia 10 Nov '18

10 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 18 ++++++--- tests/d3d12.c | 94 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a2a00d3d5f57..78101a5e1aad 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1051,12 +1051,20 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->desc = *desc; - if (d3d12_resource_is_texture(resource) - && (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD - || heap_properties->Type == D3D12_HEAP_TYPE_READBACK)) + if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD + || heap_properties->Type == D3D12_HEAP_TYPE_READBACK) { - WARN("Texture cannot be created on a UPLOAD/READBACK heap.\n"); - return E_INVALIDARG; + if (d3d12_resource_is_texture(resource)) + { + WARN("Textures cannot be created on upload/readback heaps.\n"); + return E_INVALIDARG; + } + + if (desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)) + { + WARN("Render target and unordered access buffers cannot be created on upload/readback heaps.\n"); + return E_INVALIDARG; + } } if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD && initial_state != D3D12_RESOURCE_STATE_GENERIC_READ) diff --git a/tests/d3d12.c b/tests/d3d12.c index 92b37a3fc549..1ddf7c2d4a48 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1669,10 +1669,26 @@ static void test_create_committed_resource(void) D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; + D3D12_RESOURCE_STATES state; ID3D12Resource *resource; + unsigned int i; ULONG refcount; HRESULT hr; + static const struct + { + D3D12_HEAP_TYPE heap_type; + D3D12_RESOURCE_FLAGS flags; + } + invalid_buffer_desc_tests[] = + { + /* Render target or unordered access resources are not allowed with UPLOAD or READBACK. */ + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + }; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -1876,6 +1892,33 @@ static void test_create_committed_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = invalid_buffer_desc_tests[i].heap_type; + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = invalid_buffer_desc_tests[i].flags; + + if (invalid_buffer_desc_tests[i].heap_type == D3D12_HEAP_TYPE_UPLOAD) + state = D3D12_RESOURCE_STATE_GENERIC_READ; + else + state = D3D12_RESOURCE_STATE_COPY_DEST; + + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, state, NULL, &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } @@ -2014,12 +2057,28 @@ static void test_create_placed_resource(void) D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; + D3D12_RESOURCE_STATES state; D3D12_HEAP_DESC heap_desc; ID3D12Resource *resource; ID3D12Heap *heap; + unsigned int i; ULONG refcount; HRESULT hr; + static const struct + { + D3D12_HEAP_TYPE heap_type; + D3D12_RESOURCE_FLAGS flags; + } + invalid_buffer_desc_tests[] = + { + /* Render target or unordered access resources are not allowed with UPLOAD or READBACK. */ + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + }; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -2090,6 +2149,41 @@ static void test_create_placed_resource(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D12Heap_Release(heap); + + for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i) + { + heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = invalid_buffer_desc_tests[i].heap_type; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Test %u: Failed to create heap, hr %#x.\n", i, hr); + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = invalid_buffer_desc_tests[i].flags; + + if (invalid_buffer_desc_tests[i].heap_type == D3D12_HEAP_TYPE_UPLOAD) + state = D3D12_RESOURCE_STATE_GENERIC_READ; + else + state = D3D12_RESOURCE_STATE_COPY_DEST; + + hr = ID3D12Device_CreatePlacedResource(device, heap, 0, + &resource_desc, state, &clear_value, &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + + ID3D12Heap_Release(heap); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.18.1

2 1

[PATCH vkd3d 4/5] vkd3d: Translate pthread error numbers to HRESULTs.
by Józef Kucia 10 Nov '18

10 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 20 ++++++++++---------- libs/vkd3d/device.c | 2 +- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/utils.c | 18 ++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5ccf492e663d..9e5921ef81e2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -33,7 +33,7 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device, { ERR("Failed to initialize mutex, error %d.\n", rc); vkd3d_free(object); - return E_FAIL; + return hresult_from_errno(rc); } object->vk_family_index = family_index; @@ -89,7 +89,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, if ((rc = pthread_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (!vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size, @@ -255,14 +255,14 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, if ((rc = pthread_mutex_init(&worker->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if ((rc = pthread_cond_init(&worker->cond, NULL))) { ERR("Failed to initialize condition variable, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); - return E_FAIL; + return hresult_from_errno(rc); } if (device->create_thread) @@ -283,7 +283,7 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, ERR("Failed to create fence worker thread, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); - return E_FAIL; + return hresult_from_errno(rc); } return S_OK; @@ -300,7 +300,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if ((rc = pthread_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } worker->should_exit = true; @@ -321,7 +321,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if ((rc = pthread_join(worker->u.thread, NULL))) { ERR("Failed to join fence worker thread, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } } @@ -472,7 +472,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (value <= fence->value) @@ -521,7 +521,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 v if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } fence->value = value; @@ -580,7 +580,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if ((rc = pthread_mutex_init(&fence->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (flags) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e41a309a21a5..c85405024e75 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1275,7 +1275,7 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 21096e5e3e3d..a2a00d3d5f57 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -245,7 +245,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **dat { ERR("Failed to lock mutex, error %d.\n", rc); *data = NULL; - return E_FAIL; + return hresult_from_errno(rc); } if (!heap->map_ptr) @@ -365,7 +365,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, if ((rc = pthread_mutex_init(&heap->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index a2424449660c..b7ebbdd75bdd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -18,6 +18,8 @@ #include "vkd3d_private.h" +#include <errno.h> + #define COLOR (VK_IMAGE_ASPECT_COLOR_BIT) #define DEPTH (VK_IMAGE_ASPECT_DEPTH_BIT) #define STENCIL (VK_IMAGE_ASPECT_STENCIL_BIT) @@ -381,6 +383,22 @@ const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) return vkd3d_dbg_sprintf("%s", &buffer[3]); } +HRESULT hresult_from_errno(int rc) +{ + switch (rc) + { + case 0: + return S_OK; + case ENOMEM: + return E_OUTOFMEMORY; + case EINVAL: + return E_INVALIDARG; + default: + FIXME("Unhandled errno %d.\n", rc); + return E_FAIL; + } +} + HRESULT hresult_from_vk_result(VkResult vr) { switch (vr) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 982ed68f0089..d6c821b75884 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -896,6 +896,7 @@ static inline void debug_ignored_node_mask(unsigned int mask) FIXME("Ignoring node mask 0x%08x.\n", mask); } +HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; -- 2.18.1

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel