September 2019 - Wine-devel

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 05 Sep '19

05 Sep '19

1 0

[PATCH 1/2] winevdm: Increase length of 'buf' to 308.
by Isira Seneviratne 05 Sep '19

05 Sep '19

1 0

[PATCH resend] user32: Send a WM_ACTIVATE message after restoring a minimized window.
by Zhiyi Zhang 05 Sep '19

05 Sep '19

The message sequences in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() call for restoring a minimized window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 167 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 9 ++- 2 files changed, 175 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..f8342306c6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -890,6 +890,91 @@ static const struct message WmShowVisMaxPopupSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(hwnd, SW_RESTORE) to an active minimized window */ +static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE message even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to an active minimized window */ +static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Following optional messages are present on XP */ + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and with flag SW_SHOWNOACTIVATE */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_RESTORE) to a minimized child window. Here are messages received by the parent */ +static const struct message WmShowRestoreMinimizedChildSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_NCCALCSIZE, sent }, + { WM_CHILDACTIVATE, sent }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|optional }, + { WM_SETFOCUS, sent }, + { WM_PAINT, sent }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint }, + { 0 } +}; /* CreateWindow (for a child popup window, not initially visible) */ static const struct message WmCreateChildPopupSeq[] = { { HCBT_CREATEWND, hook }, @@ -4770,6 +4855,47 @@ static void test_showwindow(void) ok_sequence(WmShowVisMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); DestroyWindow(hwnd); flush_sequence(); + + /* Test 5: + * 1. Restoring a minimized active window. + */ + hwnd = CreateWindowA("TestWindowClass", "parent", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE):active minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE):active minimized overlapped", TRUE); + + hchild = CreateWindowA("TestWindowClass", "child", WS_VISIBLE | WS_CHILD, 0, 0, 100, 100, hwnd, 0, 0, 0); + ok(hchild != NULL, "Failed to create child window\n"); + ShowWindow(hchild, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hchild, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinimizedChildSeq, "ShowWindow(hwnd, SW_RESTORE): minimized child", FALSE); + DestroyWindow(hchild); + + DestroyWindow(hwnd); + flush_sequence(); } static void test_sys_menu(void) @@ -15385,6 +15511,39 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to an active minimized window */ +static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE messages even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15446,7 +15605,15 @@ static void test_defwinproc(void) DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); flush_events(); ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); flush_sequence(); + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); GetCursorPos(&pos); GetWindowRect(hwnd, &rect); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bbbab60fbe..6c1cd1a037 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1182,7 +1182,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) else WIN_ReleasePtr( wndPtr ); /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) SetFocus( hwnd ); + if (style & WS_MINIMIZE) + { + SetFocus( hwnd ); + /* Send a WM_ACTIVATE message for a visible top level window, even if the window is already active */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & (WS_CHILD | WS_MINIMIZE)) && (style & WS_VISIBLE) && !(swp & SWP_NOACTIVATE)) + SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); + } done: SetThreadDpiAwarenessContext( context ); -- 2.23.0.rc1

3 3

[PATCH 1/5] amstream: Get rid of the AudioMediaStreamImpl typedef.
by Zebediah Figura 05 Sep '19

05 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/audiostream.c | 69 +++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index bae4d5fae2b..683ab7d3c66 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -168,10 +168,11 @@ struct AudioMediaStreamImpl; typedef struct { BaseInputPin pin; - struct AudioMediaStreamImpl *parent; + struct audio_stream *parent; } AudioMediaStreamInputPin; -typedef struct AudioMediaStreamImpl { +struct audio_stream +{ IAMMediaStream IAMMediaStream_iface; IAudioMediaStream IAudioMediaStream_iface; LONG ref; @@ -180,18 +181,18 @@ typedef struct AudioMediaStreamImpl { STREAM_TYPE stream_type; AudioMediaStreamInputPin *input_pin; CRITICAL_SECTION critical_section; -} AudioMediaStreamImpl; +}; -static inline AudioMediaStreamImpl *impl_from_AudioMediaStream_IAMMediaStream(IAMMediaStream *iface) +static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { - return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAMMediaStream_iface); + return CONTAINING_RECORD(iface, struct audio_stream, IAMMediaStream_iface); } /*** IUnknown methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMediaStream *iface, REFIID riid, void **ret_iface) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); @@ -228,7 +229,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMedi static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_AddRef(IAMMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); @@ -238,7 +239,7 @@ static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_AddRef(IAMMediaStream *i static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_Release(IAMMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); @@ -257,7 +258,7 @@ static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_Release(IAMMediaStream * static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, IMultiMediaStream** multi_media_stream) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); @@ -273,7 +274,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type); @@ -288,7 +289,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMedi static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetSameFormat(IAMMediaStream *iface, IMediaStream *pStreamThatHasDesiredFormat, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags); @@ -298,7 +299,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetSameFormat(IAMMedia static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_AllocateSample(IAMMediaStream *iface, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, flags, sample); @@ -308,7 +309,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_AllocateSample(IAMMedi static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample(IAMMediaStream *iface, IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, existing_sample, flags, sample); @@ -317,7 +318,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample(IAM static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%x) stub!\n", This, iface, flags); @@ -328,7 +329,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream(IAMMed static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_Initialize(IAMMediaStream *iface, IUnknown *source_object, DWORD flags, REFMSPID purpose_id, const STREAM_TYPE stream_type) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p,%x,%p,%u) stub!\n", This, iface, source_object, flags, purpose_id, stream_type); @@ -337,7 +338,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_Initialize(IAMMediaStr static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); @@ -346,7 +347,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetState(IAMMediaStrea static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *am_multi_media_stream) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, am_multi_media_stream); @@ -355,7 +356,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *media_stream_filter) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%p)\n", This, iface, media_stream_filter); @@ -366,7 +367,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMediaStr static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); @@ -394,30 +395,30 @@ static const struct IAMMediaStreamVtbl AudioMediaStreamImpl_IAMMediaStream_Vtbl AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph }; -static inline AudioMediaStreamImpl *impl_from_IAudioMediaStream(IAudioMediaStream *iface) +static inline struct audio_stream *impl_from_IAudioMediaStream(IAudioMediaStream *iface) { - return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAudioMediaStream_iface); + return CONTAINING_RECORD(iface, struct audio_stream, IAudioMediaStream_iface); } /*** IUnknown methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_QueryInterface(IAudioMediaStream *iface, REFIID riid, void **ret_iface) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_AddRef(IAudioMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)\n", iface, This); return IAMMediaStream_AddRef(&This->IAMMediaStream_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)\n", iface, This); return IAMMediaStream_Release(&This->IAMMediaStream_iface); } @@ -426,7 +427,7 @@ static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaSt static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, IMultiMediaStream **multi_media_stream) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); @@ -442,7 +443,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type); @@ -457,7 +458,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAud static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetSameFormat(IAudioMediaStream *iface, IMediaStream *stream_format, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags); @@ -467,7 +468,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetSameFormat(IAudi static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_AllocateSample(IAudioMediaStream *iface, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample); @@ -477,7 +478,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_AllocateSample(IAud static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSharedSample(IAudioMediaStream *iface, IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample); @@ -487,7 +488,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSharedSample( static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags); @@ -497,7 +498,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SendEndOfStream(IAu /*** IAudioMediaStream methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *wave_format_current) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); @@ -510,7 +511,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetFormat(IAudioMed static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format); @@ -520,7 +521,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetFormat(IAudioMed static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSample(IAudioMediaStream *iface, IAudioData *audio_data, DWORD flags, IAudioStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%p,%u,%p)\n", iface, This, audio_data, flags, sample); @@ -796,7 +797,7 @@ static const BaseInputPinFuncTable AudioMediaStreamInputPin_FuncTable = HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { - AudioMediaStreamImpl *object; + struct audio_stream *object; PIN_INFO pin_info; HRESULT hr; -- 2.22.0

1 4

[PATCH] hhctrl.ocx: Simplify extracting the help filename. (Coverity)
by Alistair Leslie-Hughes 05 Sep '19

05 Sep '19

CID 1453500 CID 1453489 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hhctrl.ocx/hhctrl.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 6a98ae4f2e..bd7dfa4230 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -100,7 +100,6 @@ static const char *command_to_string(UINT command) static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD buflen, WCHAR **index, WCHAR **window) { const WCHAR *extra; - WCHAR chm_file[MAX_PATH]; static const WCHAR helpW[] = {'\\','h','e','l','p','\\',0}; static const WCHAR delimW[] = {':',':',0}; @@ -128,9 +127,7 @@ static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD b extra = wcsstr(filename, delim2W); if (extra) { - memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); - chm_file[extra-filename] = 0; - filename = chm_file; + filename[extra-filename] = 0; if (window) *window = strdupW(extra+1); } @@ -138,10 +135,7 @@ static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD b extra = wcsstr(filename, delimW); if (extra) { - if (filename != chm_file) - memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); - chm_file[extra-filename] = 0; - filename = chm_file; + filename[extra-filename] = 0; if (index) *index = strdupW(extra+2); } -- 2.17.1

1 0

[PATCH] d3dx9_36/tests: Spelling fixes in ok() messages.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dx9_36/tests/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index b67ffb209c4..e6326bc4119 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1491,7 +1491,7 @@ static void test_setting_constants(void) ok(refcnt == 0, "The Direct3D device reference count was %u, should be 0\n", refcnt); refcnt = IDirect3D9_Release(d3d); - ok(refcnt == 0, "The Direct3D object referenct count was %u, should be 0\n", refcnt); + ok(refcnt == 0, "The Direct3D object reference count was %u, should be 0\n", refcnt); if (wnd) DestroyWindow(wnd); } @@ -6170,7 +6170,7 @@ static void test_registerset(void) ok(count == 0, "The Direct3D device reference count was %u, should be 0\n", count); count = IDirect3D9_Release(d3d); - ok(count == 0, "The Direct3D object referenct count was %u, should be 0\n", count); + ok(count == 0, "The Direct3D object reference count was %u, should be 0\n", count); if (wnd) DestroyWindow(wnd); } @@ -6407,7 +6407,7 @@ static void test_registerset_defaults(void) ok(count == 0, "The Direct3D device reference count was %u, should be 0\n", count); count = IDirect3D9_Release(d3d); - ok(count == 0, "The Direct3D object referenct count was %u, should be 0\n", count); + ok(count == 0, "The Direct3D object reference count was %u, should be 0\n", count); if (wnd) DestroyWindow(wnd); } -- 2.20.1

2 1

[PATCH 2/2] ucrtbase: Add strtoumax and _strtoumax_l.
by Akihiro Sagawa 04 Sep '19

04 Sep '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH 1/2] ucrtbase: Add strtoimax and _strtoimax_l.
by Akihiro Sagawa 04 Sep '19

04 Sep '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH] d3d10/tests: Spelling fixes in ok() messages.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d10/tests/device.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index d5ba0c18182..c712d400257 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -90,33 +90,33 @@ static void test_stateblock_mask(void) ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); @@ -124,7 +124,7 @@ static void test_stateblock_mask(void) ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDisableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableAll(&result); @@ -132,28 +132,28 @@ static void test_stateblock_mask(void) ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskEnableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); ok(result.VS == 0xfe, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDisableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); result.VS = 0; hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); ok(result.VS == 0x01, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); @@ -162,7 +162,7 @@ static void test_stateblock_mask(void) ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_disable, 5), - "Got unexpect result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", + "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", result.VSShaderResources[0], result.VSShaderResources[1], result.VSShaderResources[2], result.VSShaderResources[3], result.VSShaderResources[4], i); @@ -173,7 +173,7 @@ static void test_stateblock_mask(void) ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_enable, 5), - "Got unexpect result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", + "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", result.VSShaderResources[0], result.VSShaderResources[1], result.VSShaderResources[2], result.VSShaderResources[3], result.VSShaderResources[4], i); -- 2.20.1

2 1

[PATCH] d3d9/tests: Spelling fixes in ok() messages and a comment.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d9/tests/d3d9ex.c | 8 ++++---- dlls/d3d9/tests/device.c | 8 ++++---- dlls/d3d9/tests/visual.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 354a51d85a1..2639d20332b 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2986,7 +2986,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* In d3d9ex the device and focus windows have to be minimized and restored, @@ -3015,7 +3015,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == d3d_width - && devmode.dmPelsHeight == d3d_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == d3d_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -3039,8 +3039,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f05aded3815..1e8133b0c8e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4015,7 +4015,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* This is needed on native with D3DCREATE_NOWINDOWCHANGES, and it needs to be @@ -4050,7 +4050,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -4074,8 +4074,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 990702883a4..121b50f42af 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14139,7 +14139,7 @@ static void sincos_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present returned %#x.\n", hr); - /* TODO: Find a way to properly validate the lines. Precicion issues make this a kinda nasty task */ + /* TODO: Find a way to properly validate the lines. Precision issues make this a kinda nasty task */ IDirect3DVertexShader9_Release(sin_shader); IDirect3DVertexShader9_Release(cos_shader); -- 2.20.1

3 2