December 2023 - Wine-commits

Gabriel Ivăncescu : mshtml/tests: Fix XHR leak in test_window_refs.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 47eec813a3640521b989ea8709ace0964dd57806 URL: https://gitlab.winehq.org/wine/wine/-/commit/47eec813a3640521b989ea8709ace0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 4 17:27:58 2023 +0200 mshtml/tests: Fix XHR leak in test_window_refs. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4b775ceb8b8..4732236c52c 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3320,6 +3320,7 @@ static void test_window_refs(IHTMLDocument2 *doc) hres = IHTMLXMLHttpRequestFactory_create(xhr_factory, &xhr); ok(hres == S_OK, "create failed: %08lx\n", hres); IHTMLXMLHttpRequestFactory_Release(xhr_factory); + IHTMLXMLHttpRequest_Release(xhr); hres = IHTMLImageElementFactory_create(image_factory, vempty, vempty, &img_elem); ok(hres == S_OK, "create failed: %08lx\n", hres);

1 0

Zhiyi Zhang : gdiplus: Fix a memory leak (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 41d923a49f9e092aafd0771e80d47ea63ac5dec7 URL: https://gitlab.winehq.org/wine/wine/-/commit/41d923a49f9e092aafd0771e80d47e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Dec 3 00:14:48 2023 +0800 gdiplus: Fix a memory leak (Coverity). --- dlls/gdiplus/graphicspath.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 1804efdba54..24c2888cfe8 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2236,6 +2236,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, widen_closed_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, last_point); else widen_open_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, custom->strokeEndCap, NULL, custom->strokeStartCap, NULL, last_point); + free(tmp_points); } else {

1 0

Piotr Caban : wineps.drv: Add paper source selection support in printer properties.
by Alexandre Julliard 04 Dec '23

04 Dec '23

1 0

Nikolay Sivov : oleaut32/tests: Remove some of the function availability checks.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 14a04ecd1b4ef956babe1a74c1c5a1b471b4ffca URL: https://gitlab.winehq.org/wine/wine/-/commit/14a04ecd1b4ef956babe1a74c1c5a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 3 02:19:28 2023 +0100 oleaut32/tests: Remove some of the function availability checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 162 ++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 108 deletions(-)

1 0

Nikolay Sivov : oleaut32/tests: Use wide string literals in some tests.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: f83b41eed6aac3522f67f9ea8e5fa8fb64bb563e URL: https://gitlab.winehq.org/wine/wine/-/commit/f83b41eed6aac3522f67f9ea8e5fa8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 3 02:33:41 2023 +0100 oleaut32/tests: Use wide string literals in some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 119 ++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 73 deletions(-)

1 0

Nikolay Sivov : oleaut32/tests: Use existing helpers to trace variant values.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 406750714b4e84eeacb5ad3d658b081cdfa8b0db URL: https://gitlab.winehq.org/wine/wine/-/commit/406750714b4e84eeacb5ad3d658b08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 3 02:45:13 2023 +0100 oleaut32/tests: Use existing helpers to trace variant values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 240 ++++++++++++------------------------------ 1 file changed, 67 insertions(+), 173 deletions(-)

1 0

Nikolay Sivov : oleaut32/tests: Do not use VarCmp() to check results of other functions.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: bed12d8499ceebe03482596ad6c94cdf0fda9632 URL: https://gitlab.winehq.org/wine/wine/-/commit/bed12d8499ceebe03482596ad6c94c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 3 02:58:48 2023 +0100 oleaut32/tests: Do not use VarCmp() to check results of other functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 72 ++++++++++++------------------------------- 1 file changed, 20 insertions(+), 52 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bf52d4b1363..05872739c9e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6383,7 +6383,7 @@ static void test_VarAdd(void) static void test_VarCat(void) { LCID lcid; - VARIANT left, right, result, expected, expected_broken; + VARIANT left, right, result; CHAR orig_date_format[128]; VARTYPE leftvt, rightvt, resultvt; HRESULT hres; @@ -6399,7 +6399,6 @@ static void test_VarCat(void) VariantInit(&left); VariantInit(&right); VariantInit(&result); - VariantInit(&expected); /* Check expected types for all combinations */ for (leftvt = 0; leftvt <= VT_BSTR_BLOB; leftvt++) @@ -6530,14 +6529,12 @@ static void test_VarCat(void) /* Test concat strings */ V_VT(&left) = VT_BSTR; V_VT(&right) = VT_BSTR; - V_VT(&expected) = VT_BSTR; V_BSTR(&left) = SysAllocString(L"12"); V_BSTR(&right) = SysAllocString(L"34"); - V_BSTR(&expected) = SysAllocString(L"1234"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with VT_BSTR failed to return correct result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6567,54 +6564,43 @@ static void test_VarCat(void) VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Test combining boolean with number */ V_VT(&left) = VT_INT; V_VT(&right) = VT_BOOL; - V_VT(&expected) = VT_BSTR; V_INT(&left) = 12; V_BOOL(&right) = TRUE; - V_BSTR(&expected) = SysAllocString(sz12_true); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - hres = VarCmp(&result, &expected, lcid, 0); - ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08lx for %s, %s\n", - hres, wine_dbgstr_variant(&result), wine_dbgstr_variant(&expected)); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), sz12_true), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); V_VT(&left) = VT_INT; V_VT(&right) = VT_BOOL; - V_VT(&expected) = VT_BSTR; V_INT(&left) = 12; V_BOOL(&right) = FALSE; - V_BSTR(&expected) = SysAllocString(sz12_false); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - hres = VarCmp(&result, &expected, lcid, 0); - ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08lx for %s, %s\n", - hres, wine_dbgstr_variant(&result), wine_dbgstr_variant(&expected)); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), sz12_false), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Test when both expressions are numeric */ V_VT(&left) = VT_INT; V_VT(&right) = VT_INT; - V_VT(&expected) = VT_BSTR; V_INT(&left) = 12; V_INT(&right) = 34; - V_BSTR(&expected) = SysAllocString(L"1234"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result, &expected, lcid, 0) == VARCMP_EQ, - "VarCat: NUMBER concat with NUMBER returned incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6627,8 +6613,8 @@ static void test_VarCat(void) V_BSTR(&right) = SysAllocString(L"34"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: NUMBER concat with VT_BSTR, incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6640,66 +6626,49 @@ static void test_VarCat(void) V_INT(&right) = 34; hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with NUMBER, incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Test concat dates with strings */ V_VT(&left) = VT_BSTR; V_VT(&right) = VT_DATE; - V_VT(&expected) = VT_BSTR; - V_VT(&expected_broken) = VT_BSTR; V_BSTR(&left) = SysAllocString(L"12"); V_DATE(&right) = 29494.0; - V_BSTR(&expected)= SysAllocString(L"129/30/1980"); - V_BSTR(&expected_broken)= SysAllocString(L"129/30/80"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || - broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ - "VarCat: VT_BSTR concat with VT_DATE returned incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"129/30/1980"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); - VariantClear(&expected_broken); V_VT(&left) = VT_DATE; V_VT(&right) = VT_BSTR; - V_VT(&expected) = VT_BSTR; - V_VT(&expected_broken) = VT_BSTR; V_DATE(&left) = 29494.0; V_BSTR(&right) = SysAllocString(L"12"); - V_BSTR(&expected) = SysAllocString(L"9/30/198012"); - V_BSTR(&expected_broken) = SysAllocString(L"9/30/8012"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || - broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ - "VarCat: VT_DATE concat with VT_BSTR returned incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"9/30/198012"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); - VariantClear(&expected_broken); /* Test of both expressions are empty */ V_VT(&left) = VT_BSTR; V_VT(&right) = VT_BSTR; - V_VT(&expected) = VT_BSTR; V_BSTR(&left) = SysAllocString(L""); V_BSTR(&right) = SysAllocString(L""); - V_BSTR(&expected)= SysAllocString(L""); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&left,lcid,0) == VARCMP_EQ, - "VarCat: EMPTY concat with EMPTY did not return empty VT_BSTR\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L""), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); /* Restore original date format settings */ SetLocaleInfoA(lcid,LOCALE_SSHORTDATE,orig_date_format); @@ -6707,7 +6676,6 @@ static void test_VarCat(void) VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Dispatch conversion */ init_test_dispatch(VT_NULL, &dispatch); @@ -9808,7 +9776,7 @@ START_TEST(vartest) test_VarEqv(); test_VarMul(); test_VarAdd(); - test_VarCmp(); /* Before test_VarCat() which needs VarCmp() */ + test_VarCmp(); test_VarCat(); test_VarAnd(); test_VarDiv();

1 0

Daniel Lehman : msxml3: Handle default namespace in get_baseName.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 3b3a65ad377c545cc7dc8330b61ac5cb0d3d0c92 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b3a65ad377c545cc7dc8330b61ac5… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 28 21:51:28 2023 -0800 msxml3: Handle default namespace in get_baseName. --- dlls/msxml3/node.c | 6 +++++- dlls/msxml3/tests/domdoc.c | 2 +- dlls/msxml4/tests/domdoc.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4e4a9cfd1ef..f557aeaa2bf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1609,7 +1609,11 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) { if (!name) return E_INVALIDARG; - *name = bstr_from_xmlChar(This->node->name); + if (xmldoc_version(This->node->doc) != MSXML6 && + xmlStrEqual(This->node->name, BAD_CAST "xmlns")) + *name = SysAllocString(L""); + else + *name = bstr_from_xmlChar(This->node->name); if (!*name) return E_OUTOFMEMORY; TRACE("returning %s\n", debugstr_w(*name)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 23a114db713..1eceeda65de 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13778,6 +13778,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -13797,7 +13798,6 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine_if(test->todo) ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 67f37b6966b..70bd4de58c3 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -261,6 +261,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -283,7 +284,6 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_baseName(item, &str); /* MSXML4 can report different results with different service packs */ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine_if(test->todo) ok(!lstrcmpW(str, test->basenames[i]) || broken(!lstrcmpW(str, L"xmlns")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str);

1 0

Alex Henrie : d3dx9: Use CRT allocation functions.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 17da2665e2705e3ce73dd72c94e0b2236643e570 URL: https://gitlab.winehq.org/wine/wine/-/commit/17da2665e2705e3ce73dd72c94e0b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 4 01:04:32 2023 -0700 d3dx9: Use CRT allocation functions. --- dlls/d3dx9_36/animation.c | 17 ++- dlls/d3dx9_36/core.c | 10 +- dlls/d3dx9_36/d3dx9_private.h | 1 - dlls/d3dx9_36/effect.c | 268 +++++++++++++++++++----------------------- dlls/d3dx9_36/font.c | 68 +++++------ dlls/d3dx9_36/line.c | 4 +- dlls/d3dx9_36/math.c | 14 +-- dlls/d3dx9_36/mesh.c | 231 +++++++++++++++++------------------- dlls/d3dx9_36/preshader.c | 30 +++-- dlls/d3dx9_36/render.c | 17 ++- dlls/d3dx9_36/shader.c | 73 ++++++------ dlls/d3dx9_36/skin.c | 35 +++--- dlls/d3dx9_36/sprite.c | 24 ++-- dlls/d3dx9_36/surface.c | 49 ++++---- dlls/d3dx9_36/texture.c | 28 ++--- dlls/d3dx9_36/volume.c | 4 +- dlls/d3dx9_36/xfile.c | 56 +++------ 17 files changed, 423 insertions(+), 506 deletions(-)

1 0

Etaash Mathamsetty : cfgmgr32: Add CM_Register_Notification stub.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 73a1c134ad0c28c9e447d8cfeff46f1271a89283 URL: https://gitlab.winehq.org/wine/wine/-/commit/73a1c134ad0c28c9e447d8cfeff46f… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Fri Nov 17 17:48:10 2023 -0500 cfgmgr32: Add CM_Register_Notification stub. --- dlls/cfgmgr32/cfgmgr32.spec | 1 + dlls/cfgmgr32/main.c | 11 +++++++ include/cfgmgr32.h | 75 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 5c9b8f613db..e4cd845e2a4 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -154,6 +154,7 @@ @ stub CM_Register_Device_InterfaceW @ stub CM_Register_Device_Interface_ExA @ stub CM_Register_Device_Interface_ExW +@ stdcall CM_Register_Notification(ptr ptr ptr ptr) @ stub CM_Remove_SubTree @ stub CM_Remove_SubTree_Ex @ stub CM_Remove_Unmarked_Children diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index fee3c42a5c4..f40068af0df 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -56,3 +56,14 @@ DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error ) return default_error; } + +/*********************************************************************** + * CM_Register_Notification (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Register_Notification( CM_NOTIFY_FILTER *filter, void *context, + PCM_NOTIFY_CALLBACK callback, HCMNOTIFICATION *notify_context ) +{ + FIXME("%p %p %p %p stub!\n", filter, context, callback, notify_context); + + return CR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 04f1f80b174..a0bb89a2a67 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -187,6 +187,7 @@ typedef DWORD CONFIGRET; typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE; +typedef HANDLE HCMNOTIFICATION, *PHCMNOTIFICATION; typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; typedef ULONG REGDISPOSITION; @@ -208,6 +209,79 @@ typedef enum _PNP_VETO_TYPE PNP_VetoInsufficientRights } PNP_VETO_TYPE, *PPNP_VETO_TYPE; +typedef enum _CM_NOTIFY_FILTER_TYPE +{ + CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE, + CM_NOTIFY_FILTER_TYPE_DEVICEHANDLE, + CM_NOTIFY_FILTER_TYPE_DEVICEINSTANCE, + CM_NOTIFY_FILTER_TYPE_MAX +} CM_NOTIFY_FILTER_TYPE, *PCM_NOTIFY_FILTER_TYPE; + +typedef enum _CM_NOTIFY_ACTION +{ + CM_NOTIFY_ACTION_DEVICEINTERFACEARRIVAL, + CM_NOTIFY_ACTION_DEVICEINTERFACEREMOVAL, + CM_NOTIFY_ACTION_DEVICEQUERYREMOVE, + CM_NOTIFY_ACTION_DEVICEQUERYREMOVEFAILED, + CM_NOTIFY_ACTION_DEVICEREMOVEPENDING, + CM_NOTIFY_ACTION_DEVICEREMOVECOMPLETE, + CM_NOTIFY_ACTION_DEVICECUSTOMEVENT, + CM_NOTIFY_ACTION_DEVICEINSTANCEENUMERATED, + CM_NOTIFY_ACTION_DEVICEINSTANCESTARTED, + CM_NOTIFY_ACTION_DEVICEINSTANCEREMOVED, + CM_NOTIFY_ACTION_MAX +} CM_NOTIFY_ACTION, *PCM_NOTIFY_ACTION; + +typedef struct _CM_NOTIFY_FILTER +{ + DWORD cbSize; + DWORD Flags; + CM_NOTIFY_FILTER_TYPE FilterType; + DWORD Reserved; + union + { + struct + { + GUID ClassGuid; + } DeviceInterface; + struct + { + HANDLE hTarget; + } DeviceHandle; + struct + { + WCHAR InstanceId[MAX_DEVICE_ID_LEN]; + } DeviceInstance; + } u; +} CM_NOTIFY_FILTER, *PCM_NOTIFY_FILTER; + +typedef struct _CM_NOTIFY_EVENT_DATA +{ + CM_NOTIFY_FILTER_TYPE FilterType; + DWORD Reserved; + union + { + struct + { + GUID ClassGuid; + WCHAR SymbolicLink[ANYSIZE_ARRAY]; + } DeviceInterface; + struct + { + GUID EventGuid; + LONG NameOffset; + DWORD DataSize; + BYTE Data[ANYSIZE_ARRAY]; + } DeviceHandle; + struct + { + WCHAR InstanceId[ANYSIZE_ARRAY]; + } DeviceInstance; + } u; +} CM_NOTIFY_EVENT_DATA, *PCM_NOTIFY_EVENT_DATA; + +typedef DWORD (WINAPI *PCM_NOTIFY_CALLBACK)(HCMNOTIFICATION,void*,CM_NOTIFY_ACTION,CM_NOTIFY_EVENT_DATA*,DWORD); + DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) @@ -249,6 +323,7 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); CMAPI DWORD WINAPI CM_MapCrToWin32Err(CONFIGRET,DWORD); CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Register_Notification(PCM_NOTIFY_FILTER,PVOID,PCM_NOTIFY_CALLBACK,PHCMNOTIFICATION); CMAPI CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags); CMAPI CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags); #define CM_Request_Device_Eject WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex)

1 0