wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Sebastian Lackner : oleaut32: Pass a HREFTYPE to get_iface_guid.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: ab6d4a9d3dcd8fa6e2f275ae748d015fbeb8e52b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6d4a9d3dcd8fa6e2f275ae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 14 08:48:00 2018 -0600 oleaut32: Pass a HREFTYPE to get_iface_guid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b4d7f7c..6474b51 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6567,13 +6567,13 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, return hr; } -static HRESULT get_iface_guid(ITypeInfo *tinfo, const TYPEDESC *tdesc, GUID *guid) +static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) { ITypeInfo *tinfo2; TYPEATTR *tattr; HRESULT hres; - hres = ITypeInfo_GetRefTypeInfo(tinfo, tdesc->u.hreftype, &tinfo2); + hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); if(FAILED(hres)) return hres; @@ -6585,7 +6585,7 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, const TYPEDESC *tdesc, GUID *gui switch(tattr->typekind) { case TKIND_ALIAS: - hres = get_iface_guid(tinfo2, &tattr->tdescAlias, guid); + hres = get_iface_guid(tinfo2, tattr->tdescAlias.u.hreftype, guid); break; case TKIND_INTERFACE: @@ -7299,7 +7299,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( IUnknown *userdefined_iface; GUID guid; - hres = get_iface_guid((ITypeInfo*)iface, tdesc->vt == VT_PTR ? tdesc->u.lptdesc : tdesc, &guid); + if (tdesc->vt == VT_PTR) + tdesc = tdesc->u.lptdesc; + + hres = get_iface_guid((ITypeInfo*)iface, tdesc->u.hreftype, &guid); if(FAILED(hres)) break;

1 0

Zebediah Figura : rpcrt4: Write type format strings for coclasses.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 5d44b1d4bd21b6f36bc50bdef1e7afaa0f6d4b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d44b1d4bd21b6f36bc50bde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:47:59 2018 -0600 rpcrt4: Write type format strings for coclasses. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 215ea7d..8a08ad9 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -324,6 +324,32 @@ static size_t write_ip_tfs(unsigned char *str, size_t *len, const GUID *iid) return off; } +static void get_default_iface(ITypeInfo *typeinfo, WORD count, GUID *iid) +{ + ITypeInfo *refinfo; + HREFTYPE reftype; + TYPEATTR *attr; + int flags, i; + + for (i = 0; i < count; ++i) + { + ITypeInfo_GetImplTypeFlags(typeinfo, i, &flags); + if (flags & IMPLTYPEFLAG_FDEFAULT) + break; + } + + /* If no interface was explicitly marked default, choose the first one. */ + if (i == count) + i = 0; + + ITypeInfo_GetRefTypeOfImplType(typeinfo, i, &reftype); + ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + *iid = attr->guid; + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); +} + static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, TYPEDESC *desc, BOOL toplevel, BOOL onstack) { @@ -331,6 +357,7 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t ref, off = *len; ITypeInfo *refinfo; TYPEATTR *attr; + GUID guid; if (desc->vt == VT_USERDEFINED) { @@ -358,6 +385,10 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, case TKIND_DISPATCH: write_ip_tfs(str, len, &attr->guid); break; + case TKIND_COCLASS: + get_default_iface(refinfo, attr->cImplTypes, &guid); + write_ip_tfs(str, len, &guid); + break; case TKIND_ALIAS: off = write_pointer_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); break;

1 0

Alistair Leslie-Hughes : advapi32: Add DECL_HOTPATCH to registry functions.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: cb8353b6e8d54ddab8ba0a54e9c9d411b7f2d09c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8353b6e8d54ddab8ba0a54… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 13 22:56:29 2018 +0000 advapi32: Add DECL_HOTPATCH to registry functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46135 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b537f69..3018372 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -363,7 +363,7 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) * * See RegCreateKeyExA. */ -LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -410,7 +410,7 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR * FIXME * MAXIMUM_ALLOWED in access mask not supported by server */ -LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -516,7 +516,7 @@ LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, * * See RegOpenKeyExA. */ -LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) +LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; @@ -1333,7 +1333,7 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) * Success: ERROR_SUCCESS * Failure: Error code */ -LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { UNICODE_STRING nameW; @@ -1365,7 +1365,7 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, * win95 does not care about count for REG_SZ and finds out the len by itself (js) * NT does definitely care (aj) */ -LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { ANSI_STRING nameA; @@ -1759,7 +1759,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD * * See RegQueryValueExA. */ -LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count ) { NTSTATUS status;

1 0

Sven Baars : mf: Add a trace to MFCreateTopology.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: d1a37bfa5725d64eeee5cc23f6921862eef559f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1a37bfa5725d64eeee5cc23… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Nov 13 23:20:44 2018 +0100 mf: Add a trace to MFCreateTopology. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 924d386..e8389cf 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -507,6 +507,8 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) { mftopology *object; + TRACE("(%p)\n", topology); + if (!topology) return E_POINTER;

1 0

Gabriel Ivăncescu : comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 0b7dbc9e19cf8def22e3817e51afc46f87168331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7dbc9e19cf8def22e3817e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:20 2018 +0200 comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 ++ dlls/comctl32/tests/listbox.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 479f6a6..dbc7b4a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -880,6 +880,8 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa INT i; LB_ITEMDATA *item; + if (descr->style & LBS_NODATA) return LB_ERR; + if (start >= descr->nb_items) start = -1; item = descr->items + start + 1; if (HAS_STRINGS(descr)) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 271cbca..43da3ca 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2309,10 +2309,16 @@ static void test_LBS_NODATA(void) } /* More messages that don't work with LBS_NODATA. */ + ret = SendMessageA(listbox, LB_FINDSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret);

1 0

Gabriel Ivăncescu : comctl32/listbox: Don' t set any data for LBS_NODATA listboxes.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 19f26c35d5cabae15fc9b5311da776c02db6488e URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f26c35d5cabae15fc9b531… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:19 2018 +0200 comctl32/listbox: Don't set any data for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 03afc5e..479f6a6 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2638,7 +2638,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - descr->items[wParam].data = lParam; + if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index e507688..271cbca 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2310,13 +2310,10 @@ static void test_LBS_NODATA(void) /* More messages that don't work with LBS_NODATA. */ ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox);

1 0

Gabriel Ivăncescu : comctl32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 1b17d8c09a2c6e3827951a4c8d88e8f52e9f8975 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b17d8c09a2c6e3827951a4c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:18 2018 +0200 comctl32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index aa42c3a..03afc5e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2630,7 +2630,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[wParam].data; + return (descr->style & LBS_NODATA) ? 0 : descr->items[wParam].data; case LB_SETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 8620ca3..e507688 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2305,7 +2305,6 @@ static void test_LBS_NODATA(void) ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0); - todo_wine ok(ret == 0, "Unexpected return value %d.\n", ret); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: ebe99b92d48c86a358ac2143ac45a2b3f7197872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe99b92d48c86a358ac2143… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:17 2018 +0200 comctl32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 3 ++- dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 76b09aa..aa42c3a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -762,7 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } else { if (buffer) - *((ULONG_PTR *)buffer) = descr->items[index].data; + *((ULONG_PTR *)buffer) = (descr->style & LBS_NODATA) + ? 0 : descr->items[index].data; len = sizeof(ULONG_PTR); } return len; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 802dd98..8620ca3 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2302,7 +2302,6 @@ static void test_LBS_NODATA(void) memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); - todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0);

1 0

Gabriel Ivăncescu : comctl32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: ac174f4cf433176b0f582e83b6103adbf9537af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac174f4cf433176b0f582e83… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:16 2018 +0200 comctl32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 6 +++--- dlls/comctl32/tests/listbox.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 4a2df52..76b09aa 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -762,8 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } else { if (buffer) - *((DWORD *)buffer) = *(DWORD *)&descr->items[index].data; - len = sizeof(DWORD); + *((ULONG_PTR *)buffer) = descr->items[index].data; + len = sizeof(ULONG_PTR); } return len; } @@ -2653,7 +2653,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!HAS_STRINGS(descr)) return sizeof(DWORD); + if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR); return strlenW( descr->items[wParam].str ); case LB_GETCURSEL: diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 6ac3c73..802dd98 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2296,12 +2296,11 @@ static void test_LBS_NODATA(void) ret = SendMessageA(listbox, LB_SETITEMDATA, valid_idx[i], 42); ok(ret == TRUE, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_GETTEXTLEN, valid_idx[i], 0); - todo_wine_if(text_len == 8) + todo_wine_if(is_wow64) ok(ret == text_len, "Unexpected return value %d.\n", ret); memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); - todo_wine_if(sizeof(void *) == 8) ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");

1 0

Andrey Gusev : pdh: Add PdhVbAddCounter stub.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: fe8ed8af8dcb6210ea9a98cc54de604c1af898a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe8ed8af8dcb6210ea9a98cc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Nov 13 18:41:49 2018 +0200 pdh: Add PdhVbAddCounter stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44109 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 72e6fa3..5f61a8a 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -141,7 +141,7 @@ @ stdcall PdhValidatePathExA(ptr str) @ stdcall PdhValidatePathExW(ptr wstr) @ stdcall PdhValidatePathW(wstr) -@ stub PdhVbAddCounter +@ stdcall PdhVbAddCounter(ptr str ptr) @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index b648d8b..bc3674a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1084,6 +1084,18 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) } /*********************************************************************** + * PdhVbAddCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER *counter ) +{ + FIXME("%p, %s, %p: stub!\n", query, debugstr_a(path), counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** * PdhValidatePathExA (PDH.@) */ PDH_STATUS WINAPI PdhValidatePathExA( PDH_HLOG source, LPCSTR path )

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
96
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 November 2018