wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Zebediah Figura : quartz/videorenderer: Clean up VideoRenderer_GetStaticImage().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: a4e8e4dfd9148a6bf1bb9816349cd331bafeff1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4e8e4dfd9148a6bf1bb9816… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:18 2020 -0600 quartz/videorenderer: Clean up VideoRenderer_GetStaticImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 +-- dlls/quartz/videorenderer.c | 70 +++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f0c84c60e3..dae4d7ed66 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1117,8 +1117,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, size = sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1; hr = IBasicVideo_GetCurrentImage(video, &size, buffer); - todo_wine ok(hr == E_OUTOFMEMORY, "Got hr %#x.\n", hr); - todo_wine ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1, "Got size %d.\n", size); + ok(hr == E_OUTOFMEMORY, "Got hr %#x.\n", hr); + ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1, "Got size %d.\n", size); size = sizeof(BITMAPINFOHEADER) + 32 * 16 * 2; memset(buffer, 0xcc, sizeof(buffer)); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9b671ff370..b75f7bc4e7 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -350,62 +350,54 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT return S_OK; } -static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBufferSize, LONG *pDIBImage) +static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { - VideoRendererImpl *This = impl_from_BaseControlVideo(iface); - AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; - BITMAPINFOHEADER *bmiHeader; - LONG needed_size; - char *ptr; + VideoRendererImpl *filter = impl_from_BaseControlVideo(iface); + const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; + const BITMAPINFOHEADER *bih; + size_t image_size; + BYTE *sample_data; - FIXME("(%p/%p)->(%p, %p): partial stub\n", This, iface, pBufferSize, pDIBImage); + TRACE("filter %p, size %p, image %p.\n", filter, size, image); - EnterCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.csRenderLock); - if (!This->renderer.pMediaSample) - { - LeaveCriticalSection(&This->renderer.filter.csFilter); - return (This->renderer.filter.state == State_Paused ? E_UNEXPECTED : VFW_E_NOT_PAUSED); - } + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else /* if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) */ + bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; - if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo)) + if (!image) { - bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; - } - else if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo2)) - { - bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; + LeaveCriticalSection(&filter->renderer.csRenderLock); + *size = sizeof(BITMAPINFOHEADER) + image_size; + return S_OK; } - else + + if (filter->renderer.filter.state != State_Paused) { - FIXME("Unknown type %s\n", debugstr_guid(&amt->subtype)); - LeaveCriticalSection(&This->renderer.filter.csFilter); - return VFW_E_RUNTIME_ERROR; + LeaveCriticalSection(&filter->renderer.csRenderLock); + return VFW_E_NOT_PAUSED; } - needed_size = bmiHeader->biSize; - needed_size += IMediaSample_GetActualDataLength(This->renderer.pMediaSample); - - if (!pDIBImage) + if (!filter->renderer.pMediaSample) { - *pBufferSize = needed_size; - LeaveCriticalSection(&This->renderer.filter.csFilter); - return S_OK; + LeaveCriticalSection(&filter->renderer.csRenderLock); + return E_UNEXPECTED; } - if (needed_size < *pBufferSize) + if (*size < sizeof(BITMAPINFOHEADER) + image_size) { - ERR("Buffer too small %u/%u\n", needed_size, *pBufferSize); - LeaveCriticalSection(&This->renderer.filter.csFilter); - return E_FAIL; + LeaveCriticalSection(&filter->renderer.csRenderLock); + return E_OUTOFMEMORY; } - *pBufferSize = needed_size; - memcpy(pDIBImage, bmiHeader, bmiHeader->biSize); - IMediaSample_GetPointer(This->renderer.pMediaSample, (BYTE **)&ptr); - memcpy((char *)pDIBImage + bmiHeader->biSize, ptr, IMediaSample_GetActualDataLength(This->renderer.pMediaSample)); + memcpy(image, bih, sizeof(BITMAPINFOHEADER)); + IMediaSample_GetPointer(filter->renderer.pMediaSample, &sample_data); + memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.csRenderLock); return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Reimplement VMR9_GetStaticImage().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 9b1ba3414953fe09cf8b95e781e5d9c0119cacfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1ba3414953fe09cf8b95e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:17 2020 -0600 quartz/vmr9: Reimplement VMR9_GetStaticImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 25 ++++++++------ dlls/quartz/tests/vmr9.c | 25 ++++++++------ dlls/quartz/vmr9.c | 88 +++++++++++++++++++++++------------------------- 3 files changed, 70 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b1ba3414953fe09cf8b…

1 0

Zebediah Figura : quartz/tests: Add some tests for IBasicVideo::GetCurrentImage().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 309f0a0d6c533e003b69e0bf99bd26b71b8582dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=309f0a0d6c533e003b69e0bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:16 2020 -0600 quartz/tests: Add some tests for IBasicVideo::GetCurrentImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 76 ++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 101 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 98 ++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=309f0a0d6c533e003b69…

1 0

Brendan Shanks : include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: ca2ad6acbf8c6c1bcb899f9ff4137a35c8f79a06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2ad6acbf8c6c1bcb899f9f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Feb 10 14:00:14 2020 -0800 include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index bed2c70798..0a456f8230 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3409,24 +3409,24 @@ typedef enum typedef enum { - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xffffffff + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = (int) -1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = (int) 0, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = (int) 1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = (int) 2, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = (int) 3, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = (int) 4, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = (int) 5, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = (int) 6, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = (int) 8, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = (int) 9, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = (int) 10, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = (int) 11, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = (int) 12, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = (int) 13, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = (int) 14, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = (int) 15, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = (int) 0x80000000, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; typedef struct DISPLAYCONFIG_2DREGION

1 0

Zebediah Figura : winecrt0: Make __wine_(un)register_resources() cdecl.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 5c414922b4ae04a34a90afebaf5177682b6826aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c414922b4ae04a34a90afeb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 15:25:57 2020 -0600 winecrt0: Make __wine_(un)register_resources() cdecl. This fixes a bug where 64-bit winegstreamer.dll would fail to (un)register CLSID_VideoProcessorMFT when run manually with regsvr32. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/register.c | 4 ++-- include/rpcproxy.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 8c15d1be72..cb5e7a50f7 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -94,7 +94,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam return SUCCEEDED(info->result); } -HRESULT __wine_register_resources( HMODULE module ) +HRESULT __cdecl __wine_register_resources( HMODULE module ) { struct reg_info info; @@ -106,7 +106,7 @@ HRESULT __wine_register_resources( HMODULE module ) return info.result; } -HRESULT __wine_unregister_resources( HMODULE module ) +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) { struct reg_info info; diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 4d2c63e62d..5b184329bd 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -203,8 +203,8 @@ RPCRTAPI HRESULT RPC_ENTRY RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); -HRESULT __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; -HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \

1 0

Zebediah Figura : strmbase: Remove no longer necessary call to CoInitialize().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 6a3f4b8ee32997fe4a69e87ca225e38ba2c74968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a3f4b8ee32997fe4a69e87c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:34 2020 -0600 strmbase: Remove no longer necessary call to CoInitialize(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/dllfunc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 842bee6121..ca5557ec24 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -149,8 +149,6 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) if (bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, TRUE ); - CoInitialize(NULL); - TRACE("Getting IFilterMapper2\r\n"); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&pIFM2); @@ -162,10 +160,6 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) if (pIFM2) IFilterMapper2_Release(pIFM2); - /* and clear up */ - CoFreeUnusedLibraries(); - CoUninitialize(); - /* if unregistering, unregister all OLE servers */ if (SUCCEEDED(hr) && !bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, FALSE);

1 0

Zebediah Figura : quartz: Remove no longer necessary call to CoInitialize().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: ae5f9454429461507daba9c1ad95f2b13cc93124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5f9454429461507daba9c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:33 2020 -0600 quartz: Remove no longer necessary call to CoInitialize(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 015862f035..ff5db662f0 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -158,8 +158,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) HRESULT hr; IFilterMapper2* pFM2; - CoInitialize(NULL); - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pFM2); if (SUCCEEDED(hr)) { @@ -168,8 +166,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) IFilterMapper2_Release(pFM2); } - CoUninitialize(); - return hr; }

1 0

Zebediah Figura : devenum: Remove no longer necessary call to CoInitialize().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 73a5417a022690addaf4642fac18c165fdf95c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a5417a022690addaf4642f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:32 2020 -0600 devenum: Remove no longer necessary call to CoInitialize(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index b17bc93291..a694e388ce 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -158,10 +158,6 @@ HRESULT WINAPI DllRegisterServer(void) if (FAILED(res)) return res; -/*** ActiveMovieFilter Categories ***/ - - CoInitialize(NULL); - res = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, &mapvptr); if (SUCCEEDED(res)) @@ -191,8 +187,6 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2_Release(pMapper); } - CoUninitialize(); - return res; }

1 0

Zebediah Figura : setupapi: Initialize COM if necessary when registering DLLs.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: e75d5b8dc7e4751ddce84a379306a5deb89ca29b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e75d5b8dc7e4751ddce84a37… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:31 2020 -0600 setupapi: Initialize COM if necessary when registering DLLs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 14 ++++++++++++++ dlls/setupapi/tests/install.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e166754168..86390b5a41 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1125,6 +1125,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, if (flags & SPINST_REGSVR) { struct register_dll_info info; + HRESULT hr; info.unregister = FALSE; info.modules_size = 0; @@ -1142,14 +1143,21 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, else return FALSE; + hr = CoInitialize(NULL); + ret = iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info ); for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] ); + + if (SUCCEEDED(hr)) + CoUninitialize(); + HeapFree( GetProcessHeap(), 0, info.modules ); if (!ret) return FALSE; } if (flags & SPINST_UNREGSVR) { struct register_dll_info info; + HRESULT hr; info.unregister = TRUE; info.modules_size = 0; @@ -1162,8 +1170,14 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } else info.callback = NULL; + hr = CoInitialize(NULL); + ret = iterate_section_fields( hinf, section, UnregisterDlls, register_dlls_callback, &info ); for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] ); + + if (SUCCEEDED(hr)) + CoUninitialize(); + HeapFree( GetProcessHeap(), 0, info.modules ); if (!ret) return FALSE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index b918bb21f6..8a2f9eec35 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2092,7 +2092,7 @@ static void test_register_dlls(void) ok(ret, "Failed to install, error %#x.\n", GetLastError()); l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); - todo_wine ok(!l, "Got error %u.\n", l); + ok(!l, "Got error %u.\n", l); RegCloseKey(key); ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR,

1 0

Zebediah Figura : setupapi/tests: Add some tests for COM self-registration.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: e0b5da7b34e9f38990939bd20cf4b2fa749c3f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b5da7b34e9f38990939bd2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 10 14:41:30 2020 -0600 setupapi/tests: Add some tests for COM self-registration. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 6 ++- dlls/setupapi/tests/install.c | 90 ++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/tests/selfreg.c | 50 ++++++++++++++++++++++ dlls/setupapi/tests/selfreg.spec | 2 + 4 files changed, 147 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 83f751c7db..df7c668787 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = setupapi.dll -IMPORTS = advapi32 cabinet setupapi shell32 uuid user32 +IMPORTS = advapi32 cabinet ole32 setupapi shell32 uuid user32 + +selfreg_IMPORTS = uuid advapi32 ole32 SOURCES = \ coinst.c \ @@ -11,6 +13,8 @@ SOURCES = \ misc.c \ parser.c \ query.c \ + selfreg.c \ + selfreg.spec \ setupapi.rc \ setupcab.c \ stringtable.c diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index fd10fd9133..b918bb21f6 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -54,6 +54,24 @@ static char CURR_DIR[MAX_PATH]; * Helpers */ +static void load_resource(const char *name, const char *filename) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", filename, GetLastError()); + + res = FindResourceA(NULL, name, "TESTDLL"); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; @@ -2040,6 +2058,77 @@ static void test_start_copy(void) delete_file("dst/"); } +static void test_register_dlls(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "RegisterDlls=register_section\n" + "UnregisterDlls=register_section\n" + "[register_section]\n" + "40000,,winetest_selfreg.dll,1\n"; + + void *context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, 0); + char path[MAX_PATH]; + HRESULT hr; + HINF hinf; + BOOL ret; + HKEY key; + LONG l; + + create_inf_file("test.inf", inf_data); + sprintf(path, "%s\\test.inf", CURR_DIR); + hinf = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#x.\n", GetLastError()); + + load_resource("selfreg.dll", "winetest_selfreg.dll"); + ret = SetupSetDirectoryIdA(hinf, 40000, CURR_DIR); + ok(ret, "Failed to set directory ID, error %u.\n", GetLastError()); + + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + todo_wine ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + CoUninitialize(); + + SetupCloseInfFile(hinf); + ret = DeleteFileA("test.inf"); + ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); + ret = DeleteFileA("winetest_selfreg.dll"); + ok(ret, "Failed to delete test DLL, error %u.\n", GetLastError()); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -2069,6 +2158,7 @@ START_TEST(install) test_close_queue(); test_install_file(); test_start_copy(); + test_register_dlls(); UnhookWindowsHookEx(hhook); diff --git a/dlls/setupapi/tests/selfreg.c b/dlls/setupapi/tests/selfreg.c new file mode 100644 index 0000000000..f687990f3b --- /dev/null +++ b/dlls/setupapi/tests/selfreg.c @@ -0,0 +1,50 @@ +/* + * DLL for testing COM self-registration + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * 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 + */ + +#define COBJMACROS +#include "msxml.h" + +HRESULT WINAPI DllRegisterServer(void) +{ + IUnknown *unk; + HKEY key; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegCreateKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + RegCloseKey(key); + IUnknown_Release(unk); + } + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + IUnknown *unk; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + IUnknown_Release(unk); + } + return S_OK; +} diff --git a/dlls/setupapi/tests/selfreg.spec b/dlls/setupapi/tests/selfreg.spec new file mode 100644 index 0000000000..0f9b07355f --- /dev/null +++ b/dlls/setupapi/tests/selfreg.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
88
Older →

Jump to page:

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-commits February 2020