April 2017 - Wine-commits - list.winehq.org

Austin English : kernel32: Add BaseFlushAppcompatCache stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: fcafe0049de366b0f658b3d9bae975a62f37b218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcafe0049de366b0f658b3d9b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 16:38:26 2017 -0600 kernel32: Add BaseFlushAppcompatCache stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0df25df8288ca63d991545029b4ec28b8b512b38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-appcompat-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/process.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec index 92a96af..e37c525 100644 --- a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec @@ -2,7 +2,7 @@ @ stub BaseCheckAppcompatCacheEx @ stub BaseCleanupAppcompatCacheSupport @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() kernel32.BaseFlushAppcompatCache @ stub BaseFreeAppCompatDataForProcess @ stub BaseInitAppcompatCacheSupport @ stub BaseIsAppcompatInfrastructureDisabled diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 224e6ae..06b89de 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -167,11 +167,11 @@ @ stub BaseCheckAppcompatCache # @ stub BaseCheckAppcompatCacheEx # @ stub BaseCheckRunApp -@ stub BaseCleanupAppcompatCache +@ stub BaseCleanupAppcompatCache @ stub BaseCleanupAppcompatCacheSupport # @ stub BaseDllReadWriteIniFile @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() # @ stub BaseFormatObjectAttributes # @ stub BaseFormatTimeOut # @ stub BaseGenerateAppCompatData diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2130240..17cb1db 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4207,3 +4207,13 @@ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *li { return; } + +/********************************************************************** + * BaseFlushAppcompatCache (KERNEL32.@) + */ +BOOL WINAPI BaseFlushAppcompatCache(void) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Austin English : rstrtmgr: Add RmShutdown stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: d5573961d21a63e8872379385b09c3d38bbe6e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5573961d21a63e8872379385… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 28 02:18:13 2016 -0600 rstrtmgr: Add RmShutdown stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f0555c5ebc277d43089769e3568b1315d2fce852) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rstrtmgr/main.c | 9 +++++++++ dlls/rstrtmgr/rstrtmgr.spec | 2 +- include/restartmanager.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 2d45639..5c9a8dc 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -100,3 +100,12 @@ DWORD WINAPI RmEndSession(DWORD handle) FIXME("%u stub!\n", handle); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * RmShutdown (rstrtmgr.@) + */ +DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) +{ + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index 0e1ba79..6c6a9c9 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -8,5 +8,5 @@ @ stub RmRemoveFilter @ stub RmReserveHeap @ stdcall RmRestart(long long ptr) -@ stub RmShutdown +@ stdcall RmShutdown(long long ptr) @ stdcall RmStartSession(ptr long ptr) diff --git a/include/restartmanager.h b/include/restartmanager.h index 27c1a92..9ee066d 100644 --- a/include/restartmanager.h +++ b/include/restartmanager.h @@ -64,6 +64,8 @@ typedef struct { BOOL bRestartable; } RM_PROCESS_INFO, *PRM_PROCESS_INFO; +typedef void (CDECL *RM_WRITE_STATUS_CALLBACK)(UINT); + #ifdef __cplusplus } #endif

1 0

Zebediah Figura : storage.dll16: Fix bad type in IStorage16_fnOpenStorage.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: d816da8a73922eb34e8ab4979c095d68a4b93d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d816da8a73922eb34e8ab4979… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 28 15:48:34 2017 -0600 storage.dll16: Fix bad type in IStorage16_fnOpenStorage. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 289d032e766fca240e02e967224f823a4a4c6fb2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/storage.dll16/storage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index dcaff5c..74aa7f9 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1848,7 +1848,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg) { IStorage16Impl *This = impl_from_IStorage16(iface); - IStream16Impl* lpstg; + IStorage16Impl *lpstg; WCHAR name[33]; int newpps; @@ -1869,12 +1869,12 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstg->str,newpps,&(lpstg->stde))) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } lpstg->ppsent = newpps;

1 0

Michael Müller : msvideo.dll16: Implement DrawDibProfileDisplay.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 776c16e16edde6169b0a656a743c7398acb76751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776c16e16edde6169b0a656a7… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jan 26 22:24:42 2017 -0200 msvideo.dll16: Implement DrawDibProfileDisplay. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 03435a55770927afcae84d3ee170b5fbe670c763) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvideo.dll16/msvideo.dll16.spec | 2 +- dlls/msvideo.dll16/msvideo16.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/msvideo.dll16.spec b/dlls/msvideo.dll16/msvideo.dll16.spec index f45f644..02e2c95 100644 --- a/dlls/msvideo.dll16/msvideo.dll16.spec +++ b/dlls/msvideo.dll16/msvideo.dll16.spec @@ -35,7 +35,7 @@ 111 stub DRAWDIBCHANGEPALETTE 112 pascal -ret16 DrawDibRealize(word word word) DrawDibRealize16 113 stub DRAWDIBTIME -114 stub DRAWDIBPROFILEDISPLAY +114 pascal -ret16 DrawDibProfileDisplay(ptr) DrawDibProfileDisplay16 115 stub STRETCHDIB 118 pascal -ret16 DrawDibStart(word long) DrawDibStart16 119 pascal -ret16 DrawDibStop(word) DrawDibStop16 diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 8f02cc1..28f126c 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -121,6 +121,15 @@ UINT16 VFWAPI DrawDibRealize16(HDRAWDIB16 hdd, HDC16 hdc, } /************************************************************************* + * DrawDibProfileDisplay [MSVIDEO.114] + */ +BOOL16 VFWAPI DrawDibProfileDisplay16(LPBITMAPINFOHEADER lpbi) +{ + TRACE("(%p)\n", lpbi); + return DrawDibProfileDisplay(lpbi); +} + +/************************************************************************* * DrawDibStart [MSVIDEO.118] */ BOOL16 VFWAPI DrawDibStart16(HDRAWDIB16 hdd, DWORD rate)

1 0

Bruno Jesus : dinput: DISFFC_RESET will not release the effects.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 2b3c631b2e8ac0d843e31198836aa32a443b5bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3c631b2e8ac0d843e311988… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:03 2017 -0200 dinput: DISFFC_RESET will not release the effects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 27f456844b8195dac09bfce0c4cc906236462a60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 911700b..9b99b36 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1331,9 +1331,9 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE { case DISFFC_STOPALL: { - /* Stop all effects */ effect_list_item *itr; + /* Stop all effects */ LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) IDirectInputEffect_Stop(itr->ref); break; @@ -1341,12 +1341,14 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE case DISFFC_RESET: { - effect_list_item *itr, *ptr; + effect_list_item *itr; - /* Stop, unload, release and free all effects */ - /* This returns the device to its "bare" state */ - LIST_FOR_EACH_ENTRY_SAFE(itr, ptr, &This->ff_effects, effect_list_item, entry) - IDirectInputEffect_Release(itr->ref); + /* Stop and unload all effects. It is not true that effects are released */ + LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) + { + IDirectInputEffect_Stop(itr->ref); + IDirectInputEffect_Unload(itr->ref); + } break; } case DISFFC_PAUSE:

1 0

Dmitry Timoshkov : avifil32: AVIFileGetStream should set stream to NULL in case of an error.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 3b787da6286e12d6ee26393390b630d9e53115c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b787da6286e12d6ee2639339… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 26 17:32:53 2017 +0100 avifil32: AVIFileGetStream should set stream to NULL in case of an error. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7ee4021694630d7ed1d0cd4d87c2ec79911609ba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/avifil32/avifile.c | 1 + dlls/avifil32/tests/api.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f649d05..7a4caaa 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -316,6 +316,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D } /* Sorry, but the specified stream doesn't exist */ + *avis = NULL; return AVIERR_NODATA; } diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index b3d822d..66ba205 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -373,6 +373,11 @@ static void test_default_data(void) res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); + pStream0 = (void *)0xdeadbeef; + res = AVIFileGetStream(pFile, &pStream0, ~0U, 0); + ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %u\n", res); + ok(pStream0 == NULL, "AVIFileGetStream should set stream to NULL\n"); + res = AVIFileGetStream(pFile, &pStream0, 0, 0); ok(res == 0, "Unable to open video stream: error=%u\n", res);

1 0

Józef Kucia : d3d11/tests: Add tests showing that views do not keep resource reference.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: a82bd1f59dcf13471449bbacf6cbe0c377025dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82bd1f59dcf13471449bbacf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:35 2017 +0100 d3d11/tests: Add tests showing that views do not keep resource reference. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ce7d71c4657d7537b9e571d89eb1122d953448d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 52619ab..a524f58 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2727,8 +2727,11 @@ static void test_create_depthstencil_view(void) get_dsv_desc(current_desc, &tests[i].dsv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3088,8 +3091,11 @@ static void test_create_rendertarget_view(void) get_rtv_desc(current_desc, &tests[i].rtv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3444,8 +3450,11 @@ static void test_create_shader_resource_view(void) get_srv_desc(current_desc, &tests[i].srv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -8111,6 +8120,7 @@ static void test_swapchain_views(void) ID3D11DeviceContext *context; ID3D11RenderTargetView *rtv; ID3D11Device *device; + ULONG refcount; HRESULT hr; static const struct vec4 color = {0.2f, 0.3f, 0.5f, 1.0f}; @@ -8121,6 +8131,9 @@ static void test_swapchain_views(void) device = test_context.device; context = test_context.immediate_context; + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); @@ -8131,6 +8144,9 @@ static void test_swapchain_views(void) ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); @@ -10345,8 +10361,11 @@ static void test_create_unordered_access_view(void) get_uav_desc(current_desc, &tests[i].uav_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateUnorderedAccessView(device, texture, current_desc, &uav); ok(SUCCEEDED(hr), "Test %u: Failed to create unordered access view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc);

1 0

Józef Kucia : d3d11: Do not keep reference to resources.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: efe09a40695dec714c74ef4e72de18d5fcc7c65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe09a40695dec714c74ef4e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:36 2017 +0100 d3d11: Do not keep reference to resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57fac9b02e1c113c28c5c07a3f41676153120bd0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 12 ++++++------ dlls/d3d11/view.c | 9 +-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a524f58..e76bb3d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2731,7 +2731,7 @@ static void test_create_depthstencil_view(void) hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3095,7 +3095,7 @@ static void test_create_rendertarget_view(void) hr = ID3D11Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3454,7 +3454,7 @@ static void test_create_shader_resource_view(void) hr = ID3D11Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -8132,7 +8132,7 @@ static void test_swapchain_views(void) context = test_context.immediate_context; refcount = get_refcount((IUnknown *)test_context.backbuffer); - todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); @@ -8145,7 +8145,7 @@ static void test_swapchain_views(void) ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); refcount = get_refcount((IUnknown *)test_context.backbuffer); - todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); @@ -10365,7 +10365,7 @@ static void test_create_unordered_access_view(void) hr = ID3D11Device_CreateUnorderedAccessView(device, texture, current_desc, &uav); ok(SUCCEEDED(hr), "Test %u: Failed to create unordered access view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 06f4011..92fc37c 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -996,7 +996,6 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci { wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1312,7 +1311,6 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -1419,7 +1417,6 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge { wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1740,7 +1737,6 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -1848,7 +1844,6 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe { wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -2221,7 +2216,6 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -2314,7 +2308,6 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder { wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -2510,7 +2503,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); - ID3D11Resource_AddRef(view->resource = resource); + view->resource = resource; ID3D11Device_AddRef(view->device = &device->ID3D11Device_iface); return S_OK;

1 0

Jacek Caban : mshtml: Initialize nsAString in IHTMLDocument3::get_dir.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 7b452a600c2461743f7a1e2bcab81efbdfa17f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b452a600c2461743f7a1e2bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 13:26:25 2017 +0100 mshtml: Initialize nsAString in IHTMLDocument3::get_dir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4823119a79152f7cf3808b9744e2143776970edb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 47e087d..cf9344f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2207,6 +2207,7 @@ static HRESULT WINAPI HTMLDocument3_get_dir(IHTMLDocument3 *iface, BSTR *p) return E_UNEXPECTED; } + nsAString_Init(&dir_str, NULL); nsres = nsIDOMHTMLDocument_GetDir(This->doc_node->nsdoc, &dir_str); return return_nsstr(nsres, &dir_str, p); }

1 0

Andrey Gusev : d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: b123472b25d1fe89ad07b3b70de52d028c6cc016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b123472b25d1fe89ad07b3b70… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 30 14:00:56 2017 +0200 d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 943ed2c3eba5e72a080417683b9a6ca6d7b7be65) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/texture.c | 10 ++++++++++ include/d3dx11tex.h | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index f97ec24..815c162 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 217cad1..452e513 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 65598a6..fe291d9 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -25,6 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, view %p, hresult %p stub!\n", + device, data, data_size, load_info, pump, view, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index bd22f32..16b280a 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -86,6 +86,10 @@ typedef struct D3DX11_IMAGE_LOAD_INFO extern "C" { #endif +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);

1 0