December 2021 - Wine-Commits

Ziqing Hui : user32: Add an is_shared member to cursoricon_object.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 9e74b207cfd9d1d866bdfbd61a165456430b70db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e74b207cfd9d1d866bdfbd6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:45 2021 +0800 user32: Add an is_shared member to cursoricon_object. It makes sure that shared icon/cursor created by CreateIconFromResourceEx() won't be destroyed by Destroy{Icon,Cursor}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 13 +++++++++---- dlls/user32/tests/cursoricon.c | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ba5c5d8904c..f107255c8c0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -76,6 +76,7 @@ struct cursoricon_object HMODULE module; /* module for icons loaded from resources */ LPWSTR resname; /* resource name for icons loaded from resources */ HRSRC rsrc; /* resource for shared icons */ + BOOL is_shared; /* whether this object is shared */ BOOL is_icon; /* whether icon or cursor */ BOOL is_ani; /* whether this object is a static cursor or an animated cursor */ UINT delay; /* delay between this frame and the next (in jiffies) */ @@ -1224,10 +1225,14 @@ done: } else info->resname = MAKEINTRESOURCEW( LOWORD(resname) ); - if (module && (cFlag & LR_SHARED)) + if (cFlag & LR_SHARED) { - info->rsrc = rsrc; - list_add_head( &icon_cache, &info->entry ); + info->is_shared = TRUE; + if (module) + { + info->rsrc = rsrc; + list_add_head( &icon_cache, &info->entry ); + } } release_user_handle_ptr( info ); } @@ -1871,7 +1876,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) if (obj) { - BOOL shared = (obj->rsrc != NULL); + BOOL shared = obj->is_shared; release_user_handle_ptr( obj ); ret = (NtUserGetCursor() != hIcon); if (!shared) free_icon_handle( hIcon ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index fac330bd7e9..a4bdc4f13cf 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1709,7 +1709,6 @@ static void test_CreateIconFromResource(void) ret = DestroyIcon(handle); ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "Get info failed, error %u.\n", GetLastError()); /* Test creating a shared icon from heap bits that has been created before. */ @@ -1747,7 +1746,6 @@ static void test_CreateIconFromResource(void) ret = DestroyIcon(handle); ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "Get info failed, error %u.\n", GetLastError()); /* Test creating a shared icon from resource bits that has been created before. */

1 0

Eric Pouech : winedbg: Use dbg_lgint_t as parameter in type_print_hex.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: bbfbd7ac053f14e6d021d70f0793af070298b956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfbd7ac053f14e6d021d70f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:43:44 2021 +0100 winedbg: Use dbg_lgint_t as parameter in type_print_hex. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index db4060d816a..d919922c058 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -360,13 +360,13 @@ static void dbg_print_longlong(LONGLONG sv, BOOL is_signed) dbg_printf("%s", ptr); } -static void dbg_print_hex(DWORD size, ULONGLONG sv) +static void dbg_print_hex(DWORD size, dbg_lgint_t sv) { if (!sv) dbg_printf("0"); else /* clear unneeded high bits, esp. sign extension */ - dbg_printf("%#I64x", sv & (~0LLU >> (64 - 8 * size))); + dbg_printf("%#I64x", sv & (~(dbg_lguint_t)0 >> (8 * (sizeof(dbg_lgint_t) - size)))); } static void print_typed_basic(const struct dbg_lvalue* lvalue) @@ -543,7 +543,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) switch (format) { case 'x': - dbg_print_hex(size, (ULONGLONG)res); + dbg_print_hex(size, res); return; case 'd':

1 0

Nikolay Sivov : dwrite: Switch to unixlib syscall interface.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 275a2d71d69ca3accb83f274be90d3fe76b4ad52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=275a2d71d69ca3accb83f274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:42 2021 +0300 dwrite: Switch to unixlib syscall interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 23 +-- dlls/dwrite/font.c | 149 ++++++++++++------ dlls/dwrite/freetype.c | 362 ++++++++++++++++++++++--------------------- dlls/dwrite/main.c | 8 +- dlls/dwrite/unixlib.h | 113 ++++++++++++++ 6 files changed, 407 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=275a2d71d69ca3accb83…

1 0

Nikolay Sivov : dwrite: Keep corresponding data context for created backend object.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 94d7abce63a65bfe998f3dedf597282cc505b1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94d7abce63a65bfe998f3ded… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:45 2021 +0300 dwrite: Keep corresponding data context for created backend object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 22fb3369bc7..ffe012d3029 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5316,10 +5316,15 @@ static UINT64 dwrite_fontface_get_font_object(struct dwrite_fontface *fontface) return 0; } - if (InterlockedCompareExchange64((LONGLONG *)&fontface->font_object, font_object, 0)) + if (!InterlockedCompareExchange64((LONGLONG *)&fontface->font_object, font_object, 0)) + { + fontface->data_context = data_context; + } + else { release_params.object = font_object; UNIX_CALL(release_font_object, &release_params); + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, data_context); } } }

1 0

Zhiyi Zhang : comctl32/propsheet: Fix a typo in a comment.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: f68ac2e4c1360fe032776504d9be6c78a1c082f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68ac2e4c1360fe032776504… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 8 15:09:30 2021 +0800 comctl32/propsheet: Fix a typo in a comment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 9309250f65a..82c0a3cc576 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1289,7 +1289,7 @@ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM /* Using FillRect() to draw background could introduce a tiling effect if the destination * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is * visible on property sheet pages if system DPI is set to 192. However, the same bug also - * exists on XP and explains why vista+ don't use gradient tab body backgound anymore */ + * exists on XP and explains why vista+ don't use gradient tab body background anymore */ hdc = (HDC)wp; GetViewportOrgEx(hdc, &org); SetBrushOrgEx(hdc, org.x, org.y, &old_org);

1 0

Alexandre Julliard : wow64: Add mapping for NtQuerySystemInformation(SystemExtendedProcessInformation).
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 09f2896d95256f07f274769b1a297525b6587c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f2896d95256f07f274769b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 13:20:03 2021 +0100 wow64: Add mapping for NtQuerySystemInformation(SystemExtendedProcessInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 12 +++++ dlls/wow64/system.c | 142 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f2896d95256f07f274…

1 0

Jactry Zeng : msxml3: Add GBK support for builtin character converter.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 2ec519dc64746b6b32589914254e372d88f5d7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec519dc64746b6b32589914… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 7 08:39:28 2021 -0600 msxml3: Add GBK support for builtin character converter. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 11 +++++++ dlls/msxml3/tests/domdoc.c | 80 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 73 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index ba8d3b2e21b..2a97f2637f1 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -202,6 +202,16 @@ done: return len; } +static int gbk_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(936, out, outlen, in, inlen); +} + +static int utf8_to_gbk(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(936, out, outlen, in, inlen); +} + static int win1250_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) { return to_utf8(1250, out, outlen, in, inlen); @@ -300,6 +310,7 @@ static void init_char_encoders(void) xmlCharEncodingOutputFunc output; } encoder[] = { + { "gbk", gbk_to_utf8, utf8_to_gbk }, { "windows-1250", win1250_to_utf8, utf8_to_win1250 }, { "windows-1251", win1251_to_utf8, utf8_to_win1251 }, { "windows-1252", win1252_to_utf8, utf8_to_win1252 }, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 70e2da89a2f..e931c683fb8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -781,6 +781,20 @@ static const char complete7[] = { "</root>" }; +#define DECL_GBK \ +"<?xml version=\"1.0\" encoding=\"gbk\"?>" + +static const char gbkxml[] = +DECL_GBK +"<open></open>"; + +#define DECL_WIN_936 \ +"<?xml version=\"1.0\" encoding=\"Windows-936\"?>" + +static const char win936xml[] = +DECL_WIN_936 +"<open></open>"; + #define DECL_WIN_1252 \ "<?xml version=\"1.0\" encoding=\"Windows-1252\"?>" @@ -10506,7 +10520,10 @@ static void write_to_file(const char *name, const char *data) CloseHandle(hfile); } -static void test_doc_load_from_path(IXMLDOMDocument *doc, const char *path) +#define TEST_DOC_LOAD_FROM_PATH(doc,path,expected_hr, expected_ret) \ + _test_doc_load_from_path(doc, path, expected_hr, expected_ret, __LINE__) +static void _test_doc_load_from_path(IXMLDOMDocument *doc, const char *path, + HRESULT expected_hr, VARIANT_BOOL expected_ret, int line) { IXMLDOMDocument *doc2; IXMLDOMElement *elem; @@ -10520,29 +10537,32 @@ static void test_doc_load_from_path(IXMLDOMDocument *doc, const char *path) V_VT(&src) = VT_BSTR; V_BSTR(&src) = url; hr = IXMLDOMDocument_load(doc, src, &b); - ok(hr == S_OK, "Failed to load document, %#x.\n", hr); - ok(b == VARIANT_TRUE, "got %d\n", b); + ok_(__FILE__, line)(hr == expected_hr, "Failed to load document, %#x.\n", hr); + ok_(__FILE__, line)(b == expected_ret, "got %d\n", b); V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = &url; hr = IXMLDOMDocument_load(doc, src, &b); - ok(hr == S_OK, "Failed to load document, %#x.\n", hr); - ok(b == VARIANT_TRUE, "got %d\n", b); + ok_(__FILE__, line)(hr == expected_hr, "Failed to load document, %#x.\n", hr); + ok_(__FILE__, line)(b == expected_ret, "got %d\n", b); + + if (expected_hr != S_OK) + return; url = NULL; hr = IXMLDOMDocument_get_url(doc, &url); - ok(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); hr = IXMLDOMDocument_get_documentElement(doc, &elem); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "got 0x%08x\n", hr); /* Create another instance for the same document, check url */ hr = IXMLDOMElement_get_ownerDocument(elem, &doc2); - ok(hr == S_OK, "Failed to get owner document, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get owner document, hr %#x.\n", hr); hr = IXMLDOMDocument_get_url(doc2, &url2); - ok(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); - ok(!lstrcmpW(url, url2), "Unexpected url %s.\n", wine_dbgstr_w(url2)); + ok_(__FILE__, line)(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); + ok_(__FILE__, line)(!lstrcmpW(url, url2), "Unexpected url %s.\n", wine_dbgstr_w(url2)); IXMLDOMDocument_Release(doc2); IXMLDOMElement_Release(elem); @@ -10574,6 +10594,18 @@ static void test_load(void) HRESULT hr; void* ptr; int n; + struct encoding_test + { + const char *xml; + HRESULT expected_hr; + VARIANT_BOOL expected_ret; + } encoding_tests[] = + { + { gbkxml, S_OK, VARIANT_TRUE }, + { win1252xml, S_OK, VARIANT_TRUE }, + { win936xml, S_FALSE, VARIANT_FALSE }, + }; + GetTempPathA(MAX_PATH, path); strcat(path, "winetest.xml"); @@ -10593,23 +10625,23 @@ static void test_load(void) /* "file://" url */ strcpy(path2, "file://"); strcat(path2, path); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* file:// url, forward slashes */ url_forward_slash(path2); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* "file:/" url */ strcpy(path2, "file:/"); strcat(path2, path); - test_doc_load_from_path(doc, path); + TEST_DOC_LOAD_FROM_PATH(doc, path, S_OK, VARIANT_TRUE); /* file:/ with forward slashes. */ url_forward_slash(path2); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* Regular local path. */ - test_doc_load_from_path(doc, path); + TEST_DOC_LOAD_FROM_PATH(doc, path, S_OK, VARIANT_TRUE); /* load from a path: VT_BSTR|VT_BYREF, null ptr */ V_VT(&src) = VT_BSTR | VT_BYREF; @@ -10627,16 +10659,16 @@ static void test_load(void) strcpy(path2, path); n = strlen(path2); strcpy(&path2[n-1], "%6C"); /* C:\path\to\winetest.xm%6C */ - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* Both spaces and %20s work. */ GetTempPathA(MAX_PATH, path2); strcat(path2, "wine test.xml"); write_to_file(path2, win1252xml); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); GetTempPathA(MAX_PATH, path2); strcat(path2, "wine%20test.xml"); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); DeleteFileA(path2); DeleteFileA(path); @@ -10771,6 +10803,18 @@ static void test_load(void) IXMLDOMDocument_Release(doc); + /* Encoding tests. */ + for (n = 0; n < ARRAY_SIZE(encoding_tests); n++) + { + GetTempPathA(MAX_PATH, path); + strcat(path, "codepage_test.xml"); + write_to_file(path, encoding_tests[n].xml); + doc = create_document(&IID_IXMLDOMDocument); + TEST_DOC_LOAD_FROM_PATH(doc, path, encoding_tests[n].expected_hr, encoding_tests[n].expected_ret); + DeleteFileA(path); + IXMLDOMDocument_Release(doc); + } + free_bstrs(); }

1 0

Louis Lenders : wsdapi: Add stub for WSDCreateDiscoveryProvider.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 03f06598052e716178c41ef9203a8506122873f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f06598052e716178c41ef9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Dec 7 19:22:03 2021 +0100 wsdapi: Add stub for WSDCreateDiscoveryProvider. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52173 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 7 ++++++ dlls/wsdapi/wsdapi.spec | 2 +- include/wsddisco.idl | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index fcbdfef2ab2..708cb803d03 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -470,3 +470,10 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover return S_OK; } + +HRESULT WINAPI WSDCreateDiscoveryProvider(IWSDXMLContext *context, IWSDiscoveryProvider **provider) +{ + FIXME("(%p, %p) stub\n", context, provider); + + return E_NOTIMPL; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 95ee072a1cf..d7465458dd5 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -15,7 +15,7 @@ @ stub WSDCreateDeviceProxy @ stub WSDCreateDeviceProxyAdvanced @ stub WSDCreateDiscoveryProvider2 -@ stub WSDCreateDiscoveryProvider +@ stdcall WSDCreateDiscoveryProvider(ptr ptr) @ stub WSDCreateDiscoveryPublisher2 @ stdcall WSDCreateDiscoveryPublisher(ptr ptr) @ stub WSDCreateHttpAddress diff --git a/include/wsddisco.idl b/include/wsddisco.idl index 50d2198cea7..bbeff522a85 100644 --- a/include/wsddisco.idl +++ b/include/wsddisco.idl @@ -24,6 +24,9 @@ interface IWSDScopeMatchingRule; interface IWSDiscoveryPublisherNotify; interface IWSDiscoveryPublisher; interface IWSDXMLContext; +interface IWSDiscoveryProvider; +interface IWSDiscoveryProviderNotify; +interface IWSDiscoveredService; [ uuid(fcafe424-fef5-481a-bd9f-33ce0574256f), @@ -38,6 +41,62 @@ interface IWSDScopeMatchingRule : IUnknown HRESULT MatchScopes([in] LPCWSTR pszScope1, [in] LPCWSTR pszScope2, [out] BOOL *pfMatch); } +[ +uuid(73ee3ced-b6e6-4329-a546-3e8ad46563d2), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryProviderNotify : IUnknown +{ + HRESULT Add([in] IWSDiscoveredService *service); + HRESULT Remove([in] IWSDiscoveredService *service); + HRESULT SearchFailed([in] HRESULT hr,[in, optional] LPCWSTR tag); + HRESULT SearchComplete([in, optional] LPCWSTR tag); +} + +[ +uuid(4bad8a3b-b374-4420-9632-aac945b374aa), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveredService : IUnknown +{ + HRESULT GetEndpointReference([out] WSD_ENDPOINT_REFERENCE **endpoint_reference); + HRESULT GetTypes([out] WSD_NAME_LIST **types_list); + HRESULT GetScopes([out] WSD_URI_LIST **scopes_list); + HRESULT GetXAddrs([out] WSD_URI_LIST **x_addrs_list); + HRESULT GetMetadataVersion([out] ULONGLONG *metadata_version); + HRESULT GetExtendedDiscoXML([out] WSDXML_ELEMENT **header_any,[out] WSDXML_ELEMENT **body_any); + HRESULT GetProbeResolveTag([out] LPCWSTR *tag); + HRESULT GetRemoteTransportAddress([out] LPCWSTR *remote_transport_address); + HRESULT GetLocalTransportAddress([out] LPCWSTR *local_transport_address); + HRESULT GetLocalInterfaceGUID([out] GUID *guid); + HRESULT GetInstanceId([out] ULONGLONG *instance_id); +} + +[ +uuid (8ffc8e55-f0eb-480f-88b7-b435dd281d45), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryProvider : IUnknown +{ + HRESULT SetAddressFamily([in] DWORD address_family); + HRESULT Attach([in] IWSDiscoveryProviderNotify *sink); + HRESULT Detach(void); + HRESULT SearchById([in] LPCWSTR id,[in, optional] LPCWSTR tag); + HRESULT SearchByAddress([in] LPCWSTR address,[in, optional] LPCWSTR tag); + HRESULT SearchByType([in, optional] const WSD_NAME_LIST *types_list, \ + [in, optional] const WSD_URI_LIST *scopes_list,[in, optional] LPCWSTR match_by,[in, optional] LPCWSTR tag); + HRESULT GetXMLContext([out] IWSDXMLContext **context); +} + [ uuid(e67651b0-337a-4b3c-9758-733388568251), object, @@ -104,4 +163,5 @@ interface IWSDiscoveryPublisher : IUnknown HRESULT GetXMLContext([out] IWSDXMLContext **ppContext); } +cpp_quote("HRESULT WINAPI WSDCreateDiscoveryProvider(IWSDXMLContext *context, IWSDiscoveryProvider **provider);") cpp_quote("HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext* pContext, IWSDiscoveryPublisher **ppPublisher);")

1 0

Eric Pouech : winedbg: Renamed extract_longlong() into extract_lgint() for clarity.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 9b8d043cc846a826046216ae2990c766214fe853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b8d043cc846a826046216ae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:51 2021 +0100 winedbg: Renamed extract_longlong() into extract_lgint() for clarity. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- programs/winedbg/memory.c | 4 ++-- programs/winedbg/types.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c3bc3c76fbe..5da569574f7 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -465,7 +465,7 @@ extern void print_value(const struct dbg_lvalue* addr, char format, extern BOOL types_print_type(const struct dbg_type*, BOOL details); extern BOOL print_types(void); extern dbg_lgint_t types_extract_as_integer(const struct dbg_lvalue*); -extern dbg_lgint_t types_extract_as_longlong(const struct dbg_lvalue*, unsigned* psize, BOOL *pissigned); +extern dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue*, unsigned* psize, BOOL *pissigned); extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS64*); extern BOOL types_store_value(struct dbg_lvalue* lvalue_to, const struct dbg_lvalue* lvalue_from); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, ULONG *tmpbuf); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 4fb62e9e9d5..db4060d816a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -537,7 +537,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) if (format != 0) { unsigned size; - dbg_lgint_t res = types_extract_as_longlong(lvalue, &size, NULL); + dbg_lgint_t res = types_extract_as_lgint(lvalue, &size, NULL); WCHAR wch; switch (format) @@ -570,7 +570,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) } if (lvalue->type.id == dbg_itype_segptr) { - dbg_print_longlong(types_extract_as_longlong(lvalue, NULL, NULL), TRUE); + dbg_print_longlong(types_extract_as_lgint(lvalue, NULL, NULL), TRUE); } else print_typed_basic(lvalue); } diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5c8969d8e23..74ba06cc31c 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -47,13 +47,13 @@ BOOL types_get_real_type(struct dbg_type* type, DWORD* tag) } /****************************************************************** - * types_extract_as_longlong + * types_extract_as_lgint * * Given a lvalue, try to get an integral (or pointer/address) value * out of it */ -dbg_lgint_t types_extract_as_longlong(const struct dbg_lvalue* lvalue, - unsigned* psize, BOOL *issigned) +dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue* lvalue, + unsigned* psize, BOOL *issigned) { dbg_lgint_t rtn = 0; DWORD tag, bt; @@ -138,7 +138,7 @@ dbg_lgint_t types_extract_as_longlong(const struct dbg_lvalue* lvalue, */ dbg_lgint_t types_extract_as_integer(const struct dbg_lvalue* lvalue) { - return types_extract_as_longlong(lvalue, NULL, NULL); + return types_extract_as_lgint(lvalue, NULL, NULL); } /****************************************************************** @@ -155,7 +155,7 @@ void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS64* addr) else { addr->Mode = AddrModeFlat; - addr->Offset = types_extract_as_longlong(lvalue, NULL, NULL); + addr->Offset = types_extract_as_lgint(lvalue, NULL, NULL); } }

1 0

Eric Pouech : winedbg: Introduce dbg_lg(u)int_t and migrate all integral computations on this type.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 53ae7824b6459e09f95721d0e82566f719a6ad45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ae7824b6459e09f95721d0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:39 2021 +0100 winedbg: Introduce dbg_lg(u)int_t and migrate all integral computations on this type. As a side effect, the internal 'long int' type is now always 8 byte wide. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 6 +++--- programs/winedbg/debug.l | 8 ++++---- programs/winedbg/debugger.h | 21 +++++++++++++++++---- programs/winedbg/expr.c | 40 ++++++++++++++++++++-------------------- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 28 +++++++++++++++++++++++----- 6 files changed, 68 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ae7824b6459e09f957…

1 0