January 2020 - Wine-Commits

Giovanni Mascellani : d2d1: Implement ellipse drawing.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: aec8701399ff0e9a0f368e0392b0aedd2841ca94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec8701399ff0e9a0f368e03… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Jan 28 16:35:45 2020 +0330 d2d1: Implement ellipse drawing. Currently the ellipse is approximated with quadratic Bézier curves. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 14 +++ dlls/d2d1/factory.c | 20 +++- dlls/d2d1/geometry.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 306 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aec8701399ff0e9a0f36…

1 0

Giovanni Mascellani : d2d1: Implement rounded rectangle drawing.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: f04bcb2d1b3ee9abb60ee53ab3b7d85e1f9e0c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f04bcb2d1b3ee9abb60ee53a… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Jan 28 16:35:44 2020 +0330 d2d1: Implement rounded rectangle drawing. Currently rounded parts are approximated with quadratic Bézier curves. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 20 ++- dlls/d2d1/factory.c | 22 +++- dlls/d2d1/geometry.c | 325 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 6 - 4 files changed, 362 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f04bcb2d1b3ee9abb60e…

1 0

Nikolay Sivov : user32: Improve window state handling in SetScrollInfo().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 92d336263cf320241e004d48e22becff387850c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92d336263cf320241e004d48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 12:26:42 2020 +0300 user32: Improve window state handling in SetScrollInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42038 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 6 ++++++ dlls/user32/tests/scroll.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d611cf0060..1d6c048429 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1750,6 +1750,12 @@ static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, LPCSCROLLINFO info, BOOL b action |= SA_SSI_SHOW; } + if (nBar == SB_CTL && bRedraw && IsWindowVisible(hwnd) && + (new_flags == ESB_ENABLE_BOTH || new_flags == ESB_DISABLE_BOTH)) + { + EnableWindow(hwnd, new_flags == ESB_ENABLE_BOTH); + } + if (infoPtr->flags != new_flags) /* check arrow flags */ { infoPtr->flags = new_flags; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 9c892ed484..7181a02874 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -634,7 +634,6 @@ static void test_SetScrollInfo(void) si.nPage = 50; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); -todo_wine ok(ret, "Unexpected enabled state.\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; @@ -657,7 +656,6 @@ todo_wine si.nPage = 100; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); -todo_wine ok(!ret, "Unexpected enabled state.\n"); EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); @@ -671,7 +669,6 @@ todo_wine si.nPage = 41; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); -todo_wine ok(ret, "Unexpected enabled state.\n"); DestroyWindow(hScroll);

1 0

Nikolay Sivov : ole32: Lock item container on BindToStorage().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 0187babcc6d8a27c5d465c89b161b4c70d6b418c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0187babcc6d8a27c5d465c89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:21 2020 +0300 ole32: Lock item container on BindToStorage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 34 ++++++++++++++++------------------ dlls/ole32/tests/moniker.c | 5 ++++- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 111b111a1a..19876aa363 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -462,33 +462,31 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, /****************************************************************************** * ItemMoniker_BindToStorage ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppvResult) +static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, + void **ppvResult) { - ItemMonikerImpl *This = impl_from_IMoniker(iface); - HRESULT res; - IOleItemContainer *poic=0; + ItemMonikerImpl *moniker = impl_from_IMoniker(iface); + IOleItemContainer *container; + HRESULT hr; - TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ppvResult); - *ppvResult=0; + *ppvResult = 0; - if(pmkToLeft==NULL) + if (!pmkToLeft) return E_INVALIDARG; - res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic); - - if (SUCCEEDED(res)){ - - res=IOleItemContainer_GetObjectStorage(poic,This->itemName,pbc,riid,ppvResult); + hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); + if (SUCCEEDED(hr)) + { + if (FAILED(hr = set_container_lock(container, pbc))) + WARN("Failed to lock container, hr %#x.\n", hr); - IOleItemContainer_Release(poic); + hr = IOleItemContainer_GetObjectStorage(container, moniker->itemName, pbc, riid, ppvResult); + IOleItemContainer_Release(container); } - return res; + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7d4c8224ad..231551b244 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -380,7 +380,7 @@ static HRESULT WINAPI test_item_container_GetObject(IOleItemContainer *iface, LP static HRESULT WINAPI test_item_container_GetObjectStorage(IOleItemContainer *iface, LPOLESTR item, IBindCtx *pbc, REFIID riid, void **obj) { - return E_NOTIMPL; + return 0x8bee0001; } static HRESULT WINAPI test_item_container_IsRunning(IOleItemContainer *iface, LPOLESTR item) @@ -2235,6 +2235,9 @@ todo_wine hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_BindToStorage(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); + ok(hr == 0x8bee0001, "Unexpected hr %#x.\n", hr); + /* ParseDisplayName() */ hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, displayname, &eaten, &moniker2); ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : winegstreamer: Allow converting to 16-bit 2-channel PCM within the splitter filter.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 1052d5cfb1b2dc4a2833fc2d66b14a59726433f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1052d5cfb1b2dc4a2833fc2d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 19:06:56 2020 -0600 winegstreamer: Allow converting to 16-bit 2-channel PCM within the splitter filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8e36644030..f9eed906b6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1745,6 +1745,24 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; return S_OK; } + else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Audio) && index == 1) + { + const WAVEFORMATEX *our_format = (WAVEFORMATEX *)pin->mt.pbFormat; + WAVEFORMATEX *format; + + *mt = pin->mt; + mt->subtype = MEDIASUBTYPE_PCM; + mt->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)); + format = (WAVEFORMATEX *)mt->pbFormat; + format->wFormatTag = WAVE_FORMAT_PCM; + format->nChannels = 2; + format->nSamplesPerSec = our_format->nSamplesPerSec; + format->wBitsPerSample = 16; + format->nBlockAlign = 4; + format->nAvgBytesPerSec = format->nSamplesPerSec * 4; + format->cbSize = 0; + return S_OK; + } return VFW_S_NO_MORE_ITEMS; }

1 0

Zebediah Figura : winegstreamer: Report MEDIASUBTYPE_IEEE_FLOAT for float types.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: ec0d6323d0def305972b8fa1448a7b065636f0c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0d6323d0def305972b8fa1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 19:06:53 2020 -0600 winegstreamer: Report MEDIASUBTYPE_IEEE_FLOAT for float types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8213bfdb43..de508b4167 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -169,6 +169,7 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * wfe->dwChannelMask = 0; } if (GST_AUDIO_INFO_IS_FLOAT(&ainfo)) { + amt->subtype = MEDIASUBTYPE_IEEE_FLOAT; wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; wfx->wBitsPerSample = wfe->Samples.wValidBitsPerSample = 32; } else {

1 0

Jeff Smith : d3drm/tests: Add some viewport projection type tests.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: f4bdc4386ce86143107e5140a0e05300372144eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4bdc4386ce86143107e5140… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jan 28 16:35:41 2020 +0330 d3drm/tests: Add some viewport projection type tests. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0f9f9cd6ed..40237fc7a2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1715,6 +1715,7 @@ static void test_Viewport(void) IDirect3DRMFrame3 *frame3, *d3drm_frame3, *tmp_frame3; IDirect3DRMFrame *frame, *d3drm_frame, *tmp_frame1; float field, left, top, right, bottom, front, back; + D3DRMPROJECTIONTYPE projection; IDirectDrawClipper *clipper; HRESULT hr; IDirect3DRM *d3drm1; @@ -2150,6 +2151,8 @@ static void test_Viewport(void) ok(front == -1.0f, "Got unexpected front %.8e\n", front); back = IDirect3DRMViewport_GetBack(viewport); ok(back == -1.0f, "Got unexpected back %.8e\n", back); + projection = IDirect3DRMViewport_GetProjection(viewport); + todo_wine ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport_SetCamera(viewport, frame); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2161,6 +2164,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_SetBack(viewport, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); @@ -2236,6 +2241,8 @@ static void test_Viewport(void) ok(front == 1.0f, "Got unexpected front %.8e.\n", front); back = IDirect3DRMViewport_GetBack(viewport); ok(back == 100.0f, "Got unexpected back %.8e.\n", back); + projection = IDirect3DRMViewport_GetProjection(viewport); + ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport_SetField(viewport, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2266,6 +2273,10 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); back = IDirect3DRMViewport_GetBack(viewport); ok(back == 200.0f, "Got unexpected back %.8e.\n", back); + hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + projection = IDirect3DRMViewport_GetProjection(viewport); + ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2333,6 +2344,8 @@ static void test_Viewport(void) ok(front == -1.0f, "Got unexpected front %.8e\n", front); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == -1.0f, "Got unexpected back %.8e\n", back); + projection = IDirect3DRMViewport2_GetProjection(viewport2); + todo_wine ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2344,6 +2357,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2412,6 +2427,8 @@ static void test_Viewport(void) ok(front == 1.0f, "Got unexpected front %.8e.\n", front); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == 100.0f, "Got unexpected back %.8e.\n", back); + projection = IDirect3DRMViewport2_GetProjection(viewport2); + ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2442,6 +2459,10 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == 200.0f, "Got unexpected back %.8e.\n", back); + hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + projection = IDirect3DRMViewport2_GetProjection(viewport2); + ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);

1 0

Nikolay Sivov : ucrtbase: Add _query_new_handler() and _query_new_mode().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 5b9323400d4d710af3ab21f445c13f99a6c228ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b9323400d4d710af3ab21f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 11:02:40 2020 +0300 ucrtbase: Add _query_new_handler() and _query_new_mode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 0a99e870be..0885d5813e 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -16,8 +16,8 @@ @ cdecl _heapwalk(ptr) ucrtbase._heapwalk @ cdecl _malloc_base(long) ucrtbase._malloc_base @ cdecl _msize(ptr) ucrtbase._msize -@ stub _query_new_handler -@ stub _query_new_mode +@ cdecl _query_new_handler() ucrtbase._query_new_handler +@ cdecl _query_new_mode() ucrtbase._query_new_mode @ cdecl _realloc_base(ptr long) ucrtbase._realloc_base @ cdecl _recalloc(ptr long long) ucrtbase._recalloc @ cdecl _set_new_mode(long) ucrtbase._set_new_mode diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3d8dd5807a..568019da51 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1856,8 +1856,8 @@ @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws @ stub _query_app_type -@ stub _query_new_handler -@ stub _query_new_mode +@ cdecl _query_new_handler() MSVCRT__query_new_handler +@ cdecl _query_new_mode() MSVCRT__query_new_mode @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_base(ptr long) @ cdecl _recalloc(ptr long long)

1 0

Nikolay Sivov : ole32/tests: Test default item moniker instance.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 7e5a764d8b4a8867b26e64233a63282952e6c490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e5a764d8b4a8867b26e6423… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:18 2020 +0300 ole32/tests: Test default item moniker instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index bec5c76caa..8b150738b2 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1311,6 +1311,13 @@ static const BYTE expected_item_moniker_comparison_data5[] = 'S',0x00, 'T',0x00,0x00,0x00, }; +static const BYTE expected_item_moniker_comparison_data6[] = +{ + 0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00, +}; + static const BYTE expected_item_moniker_saved_data[] = { 0x02,0x00,0x00,0x00, '!',0x00,0x05,0x00, @@ -1341,6 +1348,12 @@ static const BYTE expected_item_moniker_saved_data5[] = 0x00,0x00,0x00, 'T', 'e', 's', 't',0x00, }; +static const BYTE expected_item_moniker_saved_data6[] = +{ + 0x01,0x00,0x00,0x00,0x00,0x01,0x00,0x00, + 0x00,0x00, +}; + static const BYTE expected_item_moniker_marshal_data[] = { 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, @@ -1401,6 +1414,18 @@ static const BYTE expected_item_moniker_marshal_data5[] = 0x00,0x00,0x00, 'T', 'e', 's', 't',0x00, }; +static const BYTE expected_item_moniker_marshal_data6[] = +{ + 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00, + 0x01,0x00,0x00,0x00,0x00,0x01,0x00,0x00, + 0x00,0x00, +}; + static const BYTE expected_anti_moniker_marshal_data[] = { 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, @@ -2239,6 +2264,18 @@ todo_wine IMoniker_Release(moniker); IMoniker_Release(moniker2); } + + /* Default instance. */ + hr = CoCreateInstance(&CLSID_ItemMoniker, NULL, CLSCTX_SERVER, &IID_IMoniker, (void **)&moniker); + ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); + + test_moniker("item moniker 6", moniker, + expected_item_moniker_marshal_data6, sizeof(expected_item_moniker_marshal_data6), + expected_item_moniker_saved_data6, sizeof(expected_item_moniker_saved_data6), + expected_item_moniker_comparison_data6, sizeof(expected_item_moniker_comparison_data6), + 34, L""); + + IMoniker_Release(moniker); } static void stream_write_dword(IStream *stream, DWORD value)

1 0

Jeff Smith : d3drm: Return ~0u from d3drm_viewport2_GetProjection() for uninitialised viewports.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 5f9ceed14f960b75d3cde57d95d55e85c5de16d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9ceed14f960b75d3cde57d… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jan 28 16:35:43 2020 +0330 d3drm: Return ~0u from d3drm_viewport2_GetProjection() for uninitialised viewports. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++-- dlls/d3drm/viewport.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 62194977d4..6821bca50f 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2152,7 +2152,7 @@ static void test_Viewport(void) back = IDirect3DRMViewport_GetBack(viewport); ok(back == -1.0f, "Got unexpected back %.8e\n", back); projection = IDirect3DRMViewport_GetProjection(viewport); - todo_wine ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); + ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport_SetCamera(viewport, frame); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2345,7 +2345,7 @@ static void test_Viewport(void) back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == -1.0f, "Got unexpected back %.8e\n", back); projection = IDirect3DRMViewport2_GetProjection(viewport2); - todo_wine ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); + ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection); hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 17b6f1df53..8d9c4fde82 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -978,6 +978,9 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport2_GetProjection(IDirect3DRMViewp TRACE("iface %p.\n", iface); + if (!viewport->d3d_viewport) + return ~0u; + return viewport->projection; }

1 0