November 2018 - Wine-commits

Nikolay Sivov : wincodecs: Trace WICRect arguments.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 5976988b1ed09d1127b0945e29460b2322c0c42b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5976988b1ed09d1127b0945e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 9 14:26:45 2018 +0300 wincodecs: Trace WICRect arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bitmap.c | 4 ++-- dlls/windowscodecs/bmpdecode.c | 2 +- dlls/windowscodecs/bmpencode.c | 2 +- dlls/windowscodecs/clipper.c | 4 ++-- dlls/windowscodecs/colortransform.c | 2 +- dlls/windowscodecs/converter.c | 2 +- dlls/windowscodecs/fliprotate.c | 2 +- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/icnsformat.c | 2 +- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 4 ++-- dlls/windowscodecs/pngformat.c | 4 ++-- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tgaformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 4 ++-- dlls/windowscodecs/wincodecs_private.h | 8 ++++++++ 16 files changed, 28 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5976988b1ed09d1127b0…

1 0

Nikolay Sivov : wincodecs: Fix scaler return pixel format for uninitialized case.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 85d6be3e9ee358ae99ac5328f9f400d1a8573579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d6be3e9ee358ae99ac5328… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 9 14:26:46 2018 +0300 wincodecs: Fix scaler return pixel format for uninitialized case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 5 ++++- dlls/windowscodecs/tests/bitmap.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index b02f192..564b4ad 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -130,7 +130,10 @@ static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface, return E_INVALIDARG; if (!This->source) - return WINCODEC_ERR_WRONGSTATE; + { + memcpy(pPixelFormat, &GUID_WICPixelFormatDontCare, sizeof(*pPixelFormat)); + return S_OK; + } return IWICBitmapSource_GetPixelFormat(This->source, pPixelFormat); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index e4cb863..4865332 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1082,6 +1082,7 @@ static void test_WICCreateBitmapFromSectionEx(void) static void test_bitmap_scaler(void) { + WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; IWICBitmap *bitmap; UINT width, height; @@ -1112,6 +1113,15 @@ static void test_bitmap_scaler(void) hr = IWICBitmapScaler_GetSize(scaler, &width, NULL); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_GetPixelFormat(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&pixel_format, 0, sizeof(pixel_format)); + hr = IWICBitmapScaler_GetPixelFormat(scaler, &pixel_format); + ok(hr == S_OK, "Failed to get pixel format, hr %#x.\n", hr); + ok(IsEqualGUID(&pixel_format, &GUID_WICPixelFormatDontCare), "Unexpected pixel format %s.\n", + wine_dbgstr_guid(&pixel_format)); + width = 123; height = 321; hr = IWICBitmapScaler_GetSize(scaler, &width, &height); @@ -1170,6 +1180,15 @@ static void test_bitmap_scaler(void) hr = IWICBitmapScaler_GetSize(scaler, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_GetPixelFormat(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&pixel_format, 0, sizeof(pixel_format)); + hr = IWICBitmapScaler_GetPixelFormat(scaler, &pixel_format); + ok(hr == S_OK, "Failed to get pixel format, hr %#x.\n", hr); + ok(IsEqualGUID(&pixel_format, &GUID_WICPixelFormat24bppBGR), "Unexpected pixel format %s.\n", + wine_dbgstr_guid(&pixel_format)); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap);

1 0

Nikolay Sivov : wincodecs: Fix return value for scaler GetResolution().
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: f92cfb31d23fa21b5616616b66955df808d13144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f92cfb31d23fa21b5616616b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 9 14:26:47 2018 +0300 wincodecs: Fix return value for scaler GetResolution(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 6 +++--- dlls/windowscodecs/tests/bitmap.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 564b4ad..3789831 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -144,12 +144,12 @@ static HRESULT WINAPI BitmapScaler_GetResolution(IWICBitmapScaler *iface, BitmapScaler *This = impl_from_IWICBitmapScaler(iface); TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + if (!pDpiX || !pDpiY) return E_INVALIDARG; - if (!This->source) - return WINCODEC_ERR_WRONGSTATE; - return IWICBitmapSource_GetResolution(This->source, pDpiX, pDpiY); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 4865332..2b5c373 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1084,6 +1084,7 @@ static void test_bitmap_scaler(void) { WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; + double res_x, res_y; IWICBitmap *bitmap; UINT width, height; HRESULT hr; @@ -1096,6 +1097,10 @@ static void test_bitmap_scaler(void) ok(width == 4, "Unexpected width %u.\n", width); ok(height == 2, "Unexpected height %u.\n", height); + hr = IWICBitmap_GetResolution(bitmap, &res_x, &res_y); + ok(hr == S_OK, "Failed to get bitmap resolution, hr %#x.\n", hr); + ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + hr = IWICImagingFactory_CreateBitmapScaler(factory, &scaler); ok(hr == S_OK, "Failed to create bitmap scaler, hr %#x.\n", hr); @@ -1113,6 +1118,20 @@ static void test_bitmap_scaler(void) hr = IWICBitmapScaler_GetSize(scaler, &width, NULL); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_GetResolution(scaler, NULL, NULL); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + res_x = 0.1; + hr = IWICBitmapScaler_GetResolution(scaler, &res_x, NULL); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(res_x == 0.1, "Unexpected resolution %f.\n", res_x); + + hr = IWICBitmapScaler_GetResolution(scaler, NULL, &res_y); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetResolution(scaler, &res_x, &res_y); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_GetPixelFormat(scaler, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1189,6 +1208,22 @@ static void test_bitmap_scaler(void) ok(IsEqualGUID(&pixel_format, &GUID_WICPixelFormat24bppBGR), "Unexpected pixel format %s.\n", wine_dbgstr_guid(&pixel_format)); + hr = IWICBitmapScaler_GetResolution(scaler, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + res_x = 0.1; + hr = IWICBitmapScaler_GetResolution(scaler, &res_x, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(res_x == 0.1, "Unexpected resolution %f.\n", res_x); + + hr = IWICBitmapScaler_GetResolution(scaler, NULL, &res_y); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + res_x = res_y = 1.0; + hr = IWICBitmapScaler_GetResolution(scaler, &res_x, &res_y); + ok(hr == S_OK, "Failed to get scaler resolution, hr %#x.\n", hr); + ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap);

1 0

Michael Stefaniuc : avifil32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 143ce73c7afc825a198ba365559a8d1559a47951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=143ce73c7afc825a198ba365… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:37 2018 +0100 avifil32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 63a3530..37fa941 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1119,10 +1119,10 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) HeapFree(GetProcessHeap(), 0, lp); /* add "All files" "*.*" filter if enough space left */ - size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, - szAllFiles, (sizeof(szAllFiles) - sizeof(all_files))/sizeof(WCHAR)) + 1; + size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, szAllFiles, + ARRAY_SIZE(szAllFiles) - ARRAY_SIZE(all_files)) + 1; memcpy( szAllFiles + size, all_files, sizeof(all_files) ); - size += sizeof(all_files) / sizeof(WCHAR); + size += ARRAY_SIZE(all_files); if (cbFilter > size) { memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0])); @@ -2109,8 +2109,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, return AVIERR_BADSIZE; memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName)); - MultiByteToWideChar(CP_ACP, 0, asi->szName, -1, - asiw.szName, sizeof(asiw.szName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, asi->szName, -1, asiw.szName, ARRAY_SIZE(asiw.szName)); return EditStreamSetInfoW(pstream, &asiw, sizeof(asiw)); }

1 0

Michael Stefaniuc : combase/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: c090aab111089eb3a6975a3d366b68c02c7399d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c090aab111089eb3a6975a3d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:38 2018 +0100 combase/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/roapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index 3d46772..05581f8 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -74,10 +74,10 @@ static void test_ActivationFactories(void) return; } - hr = pWindowsCreateString(xmldocumentW, sizeof(xmldocumentW)/sizeof(WCHAR) - 1, &str); + hr = pWindowsCreateString(xmldocumentW, ARRAY_SIZE(xmldocumentW) - 1, &str); ok(hr == S_OK, "got %08x\n", hr); - hr = pWindowsCreateString(nonexistW, sizeof(nonexistW)/sizeof(WCHAR) - 1, &str2); + hr = pWindowsCreateString(nonexistW, ARRAY_SIZE(nonexistW) - 1, &str2); ok(hr == S_OK, "got %08x\n", hr); hr = pRoInitialize(RO_INIT_MULTITHREADED);

1 0

Michael Stefaniuc : hlink: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 5da2f4674a187ff472b659a85d73795f5d0f6cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da2f4674a187ff472b659a8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:40 2018 +0100 hlink: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index b0a20b1..4af5961 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -389,9 +389,9 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo if(fNoForceAbs) FIXME("Unsupported fNoForceAbs\n"); - if(!strncmpiW(pwzDisplayName, file_colonW, sizeof(file_colonW)/sizeof(WCHAR))) { - pwzDisplayName += sizeof(file_colonW)/sizeof(WCHAR); - eaten += sizeof(file_colonW)/sizeof(WCHAR); + if(!strncmpiW(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { + pwzDisplayName += ARRAY_SIZE(file_colonW); + eaten += ARRAY_SIZE(file_colonW); while(*pwzDisplayName == '/') { pwzDisplayName++;

1 0

Michael Stefaniuc : iccvid: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: ea7dd3f94252039b4ec85fe2d5d638c4a501ea73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7dd3f94252039b4ec85fe2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:41 2018 +0100 iccvid: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 89d282b..78c53b3 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -953,8 +953,8 @@ static LRESULT ICCVID_GetInfo( ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize ) icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; - LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); - LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); + LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, ARRAY_SIZE(icinfo->szName)); + LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, ARRAY_SIZE(icinfo->szDescription)); /* msvfw32 will fill icinfo->szDriver for us */ return sizeof(ICINFO);

1 0

Louis Lenders : vssapi: Add a few win64 spec entries.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: ead7e637c0d18760acd446d686ad18526e76e0f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead7e637c0d18760acd446d6… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Nov 12 10:40:06 2018 -0500 vssapi: Add a few win64 spec entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46129 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vssapi/vssapi.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 77599ab..146feb4 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -3,8 +3,10 @@ @ stub ShouldBlockRevert @ stub ??0CVssJetWriter@@QAE(a)XZ @ thiscall -arch=i386 ??0CVssWriter@@QAE(a)XZ(ptr) VSSAPI_CVssWriter_default_ctor +@ cdecl -arch=win64 ??0CVssWriter@@QEAA(a)XZ(ptr) VSSAPI_CVssWriter_default_ctor @ stub ??1CVssJetWriter@@UAE(a)XZ @ thiscall -arch=i386 ??1CVssWriter@@UAE(a)XZ(ptr) VSSAPI_CVssWriter_dtor +@ cdecl -arch=win64 ??1CVssWriter@@UEAA(a)XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected(a)CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected(a)CVssWriter@@IBG_NXZ @ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z @@ -28,6 +30,7 @@ @ stub ?GetSnapshotDeviceName(a)CVssWriter@@IBGJPBGPAPBG(a)Z @ stub ?Initialize(a)CVssJetWriter@@QAGJU_GUID@@PBG_N211K(a)Z @ thiscall -arch=i386 ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize +@ cdecl -arch=win64 ?Initialize(a)CVssWriter@@QEAAJU_GUID@@PEBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N1(a)Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize @ stub ?InstallAlternateWriter(a)CVssWriter@@QAGJU_GUID@@0(a)Z @ stub ?IsBootableSystemStateBackedUp(a)CVssJetWriter@@IBG_NXZ @ stub ?IsBootableSystemStateBackedUp(a)CVssWriter@@IBG_NXZ @@ -68,8 +71,10 @@ @ stub ?SetWriterFailure(a)CVssJetWriter@@IAGJJ(a)Z @ stub ?SetWriterFailure(a)CVssWriter@@IAGJJ(a)Z @ thiscall -arch=i386 ?Subscribe(a)CVssWriter@@QAGJK(a)Z(ptr long) VSSAPI_CVssWriter_Subscribe +@ cdecl -arch=win64 ?Subscribe(a)CVssWriter@@QEAAJK(a)Z(ptr long) VSSAPI_CVssWriter_Subscribe @ stub ?Uninitialize(a)CVssJetWriter@@QAGXXZ @ thiscall -arch=i386 ?Unsubscribe(a)CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe +@ cdecl -arch=win64 ?Unsubscribe(a)CVssWriter@@QEAAJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe @ stub CreateVssBackupComponentsInternal @ stub CreateVssExamineWriterMetadataInternal @ stub CreateVssExpressWriterInternal

1 0

Aric Stewart : ntoskrnl.exe: Implement IoRegisterDeviceInterface.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 9faf36789dd752344e08b0c95aef9cf0324752c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9faf36789dd752344e08b0c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 2 08:45:27 2018 -0500 ntoskrnl.exe: Implement IoRegisterDeviceInterface. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 110 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 5b03c59..afb22fe 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 -DELAYIMPORTS = user32 +DELAYIMPORTS = setupapi user32 C_SRCS = \ instr.c \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e9e3afa..e52cb16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -40,6 +40,7 @@ #include "winuser.h" #include "dbt.h" #include "winreg.h" +#include "setupapi.h" #include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" @@ -1665,6 +1666,115 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE itype, PULONG bus, PCON } +static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) +{ + WCHAR *id, *ptr; + NTSTATUS status; + + status = get_device_id( device, BusQueryInstanceID, &id ); + if (status != STATUS_SUCCESS) return status; + + struprW( id ); + for (ptr = id; *ptr; ptr++)if (*ptr == '\\') *ptr = '#'; + + *instance_id = id; + return STATUS_SUCCESS; +} + + +/***************************************************** + * IoRegisterDeviceInterface(NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) +{ + WCHAR *instance_id; + NTSTATUS status = STATUS_SUCCESS; + HDEVINFO infoset; + WCHAR *referenceW = NULL; + SP_DEVINFO_DATA devInfo; + SP_DEVICE_INTERFACE_DATA infoData; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; + DWORD required; + BOOL rc; + + TRACE( "(%p, %s, %s, %p)\n", device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link ); + + if (reference_string != NULL) + referenceW = reference_string->Buffer; + + infoset = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + if (infoset == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; + + status = get_instance_id( device, &instance_id ); + if (status != STATUS_SUCCESS) return status; + + devInfo.cbSize = sizeof( devInfo ); + rc = SetupDiCreateDeviceInfoW( infoset, instance_id, class_guid, NULL, NULL, 0, &devInfo ); + if (rc == 0) + { + if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) + { + DWORD index = 0; + DWORD size = strlenW(instance_id) + 2; + WCHAR *id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); + do + { + rc = SetupDiEnumDeviceInfo( infoset, index, &devInfo ); + if (rc && IsEqualGUID( &devInfo.ClassGuid, class_guid )) + { + BOOL check; + check = SetupDiGetDeviceInstanceIdW( infoset, &devInfo, id, size, &required ); + if (check && strcmpW( id, instance_id ) == 0) + break; + } + index++; + } while (rc); + + HeapFree( GetProcessHeap(), 0, id ); + if (!rc) + { + HeapFree( GetProcessHeap(), 0, instance_id ); + return STATUS_UNSUCCESSFUL; + } + } + else + { + HeapFree( GetProcessHeap(), 0, instance_id ); + return STATUS_UNSUCCESSFUL; + } + } + HeapFree( GetProcessHeap(), 0, instance_id ); + + infoData.cbSize = sizeof( infoData ); + rc = SetupDiCreateDeviceInterfaceW( infoset, &devInfo, class_guid, NULL, 0, &infoData ); + if (!rc) return STATUS_UNSUCCESSFUL; + + required = 0; + SetupDiGetDeviceInterfaceDetailW( infoset, &infoData, NULL, 0, &required, NULL ); + if (required == 0) return STATUS_UNSUCCESSFUL; + + data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY , required ); + data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + + rc = SetupDiGetDeviceInterfaceDetailW( infoset, &infoData, data, required, NULL, NULL ); + if (!rc) + { + HeapFree( GetProcessHeap(), 0, data ); + return STATUS_UNSUCCESSFUL; + } + + data->DevicePath[1] = '?'; + TRACE( "Device path %s\n",debugstr_w(data->DevicePath) ); + + if (symbolic_link) + RtlCreateUnicodeString( symbolic_link, data->DevicePath); + + HeapFree( GetProcessHeap(), 0, data ); + + return status; +} + + /*********************************************************************** * IoRegisterDriverReinitialization (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5987c52..d127a25 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -428,7 +428,7 @@ @ stub IoReadPartitionTableEx @ stub IoReadTransferCount @ stub IoRegisterBootDriverReinitialization -@ stub IoRegisterDeviceInterface +@ stdcall IoRegisterDeviceInterface(ptr ptr ptr ptr) @ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) @ stdcall IoRegisterFileSystem(ptr) @ stub IoRegisterFsRegistrationChange diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0cd1673..cd057d5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1405,6 +1405,7 @@ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

Aric Stewart : hidclass.sys: Use IoRegisterDeviceInterface.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: ec2234102acba5d027a2aa4dcba068957bbff815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2234102acba5d027a2aa4d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 2 08:45:42 2018 -0500 hidclass.sys: Use IoRegisterDeviceInterface. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 3364eb3..1591390 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -42,12 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(hid_report); static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', '\\','H','I','D','#','%','p','&','%','p',0}; -static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','%','s','#','%','s',0}; -/* GUID_DEVINTERFACE_HID */ -static const WCHAR class_guid[] = {'{','4','D','1','E','5','5','B','2', - '-','F','1','6','F','-','1','1','C','F','-','8','8','C','B','-','0','0', - '1','1','1','1','0','0','0','0','3','0','}',0}; - NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) { @@ -75,7 +69,7 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT ext->deviceExtension.NextDeviceObject = native_device; ext->device_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(dev_name) + 1) * sizeof(WCHAR)); lstrcpyW(ext->device_name, dev_name); - ext->link_name = NULL; + ext->link_name.Buffer = NULL; IoAttachDeviceToDeviceStack(*device, native_device); @@ -84,10 +78,8 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { - WCHAR dev_link[255]; - WCHAR *ptr; SP_DEVINFO_DATA Data; - UNICODE_STRING nameW, linkW; + UNICODE_STRING nameW; NTSTATUS status; HDEVINFO devinfo; GUID hidGuid; @@ -96,25 +88,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) HidD_GetHidGuid(&hidGuid); ext = device->DeviceExtension; - sprintfW(dev_link, device_link_fmtW, ext->instance_id, class_guid); - ptr = dev_link + 4; - do { if (*ptr == '\\') *ptr = '#'; } while (*ptr++); - struprW(dev_link); - RtlInitUnicodeString( &nameW, ext->device_name); - RtlInitUnicodeString( &linkW, dev_link ); - - TRACE("Create link %s\n", debugstr_w(dev_link)); - - ext->link_name = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(dev_link) + 1)); - lstrcpyW(ext->link_name, dev_link); - - status = IoCreateSymbolicLink( &linkW, &nameW ); - if (status) - { - FIXME( "failed to create link error %x\n", status ); - return status; - } devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo) @@ -138,13 +112,22 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) FIXME( "failed to Register Device Info %x\n", GetLastError()); goto error; } - if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL)) + SetupDiDestroyDeviceInfoList(devinfo); + + status = IoRegisterDeviceInterface(device, &hidGuid, NULL, &ext->link_name); + if (status != STATUS_SUCCESS) { - FIXME( "failed to Create Device Interface %x\n", GetLastError()); - goto error; + FIXME( "failed to register device interface %x\n", status ); + return status; + } + + status = IoCreateSymbolicLink( &ext->link_name, &nameW ); + if (status != STATUS_SUCCESS) + { + FIXME( "failed to create link error %x\n", status ); + return status; } - SetupDiDestroyDeviceInfoList(devinfo); return STATUS_SUCCESS; error: @@ -156,20 +139,17 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device { NTSTATUS status; BASE_DEVICE_EXTENSION *ext; - UNICODE_STRING linkW; LIST_ENTRY *entry; IRP *irp; ext = device->DeviceExtension; - if (ext->link_name) + if (ext->link_name.Buffer) { - TRACE("Delete link %s\n", debugstr_w(ext->link_name)); - RtlInitUnicodeString(&linkW, ext->link_name); - - IoSetDeviceInterfaceState(&linkW, FALSE); + TRACE("Delete link %s\n", debugstr_w(ext->link_name.Buffer)); - status = IoDeleteSymbolicLink(&linkW); + IoSetDeviceInterfaceState(&ext->link_name, FALSE); + status = IoDeleteSymbolicLink(&ext->link_name); if (status != STATUS_SUCCESS) ERR("Delete Symbolic Link failed (%x)\n",status); } @@ -196,7 +176,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device TRACE("Delete device(%p) %s\n", device, debugstr_w(ext->device_name)); HeapFree(GetProcessHeap(), 0, ext->device_name); - HeapFree(GetProcessHeap(), 0, ext->link_name); + RtlFreeUnicodeString(&ext->link_name); IoDeleteDevice(device); } diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 4e8ba3c..769b715 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -47,7 +47,7 @@ typedef struct _BASE_DEVICE_EXTENSION { ULONG poll_interval; WCHAR *device_name; - WCHAR *link_name; + UNICODE_STRING link_name; WCHAR device_id[MAX_DEVICE_ID_LEN]; WCHAR instance_id[MAX_DEVICE_ID_LEN]; struct ReportRingBuffer *ring_buffer; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 34bd944..47bd443 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -286,12 +286,10 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_START_DEVICE: { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - UNICODE_STRING linkU; rc = minidriver->PNPDispatch(device, irp); - RtlInitUnicodeString(&linkU, ext->link_name); - IoSetDeviceInterfaceState(&linkU, TRUE); + IoSetDeviceInterfaceState(&ext->link_name, TRUE); return rc; } case IRP_MN_REMOVE_DEVICE:

1 0