January 2018 - Wine-commits

Henri Verbeet : winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 1246a27730e657f92146bfc4b8f0776ed0ccf2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1246a27730e657f92146bfc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 19 19:25:16 2018 +0100 winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error. In particular, without WGL_WINE_query_renderer, the only way to determine whether a particular context version is supported or not is by attempting to create a context with that version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a7cfcc..e665286 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2143,7 +2143,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg if ((err = X11DRV_check_error()) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ - ERR("Context creation failed (error %x)\n", err); + WARN("Context creation failed (error %#x).\n", err); HeapFree( GetProcessHeap(), 0, ret ); ret = NULL; }

1 0

Jacek Caban : schtasks: Added /delete command implementation.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: c6f66c6b98b6a6d22874f3a59bcbd4f55b5d2e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f66c6b98b6a6d22874f3a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 19 19:16:20 2018 +0100 schtasks: Added /delete command implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 87 +++++++++++++++++++++++++++++++++----- programs/schtasks/tests/schtasks.c | 3 +- 2 files changed, 79 insertions(+), 11 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 24d6876..88a004f 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -26,17 +26,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); -const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; -const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; -const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; +static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; +static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; +static const WCHAR f_optW[] = {'/','f',0}; +static const WCHAR tn_optW[] = {'/','t','n',0}; -static IRegisteredTask *get_registered_task(const WCHAR *name) +static ITaskFolder *get_tasks_root_folder(void) { - IRegisteredTask *registered_task; ITaskService *service; - ITaskFolder *folder; + ITaskFolder *root; VARIANT empty; - BSTR str; HRESULT hres; hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, @@ -51,17 +51,31 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) return NULL; } - hres = ITaskService_GetFolder(service, NULL, &folder); + hres = ITaskService_GetFolder(service, NULL, &root); ITaskService_Release(service); if (FAILED(hres)) { FIXME("GetFolder failed: %08x\n", hres); return NULL; } + return root; +} + +static IRegisteredTask *get_registered_task(const WCHAR *name) +{ + IRegisteredTask *registered_task; + ITaskFolder *root; + BSTR str; + HRESULT hres; + + root = get_tasks_root_folder(); + if (!root) + return NULL; + str = SysAllocString(name); - hres = ITaskFolder_GetTask(folder, str, &registered_task); + hres = ITaskFolder_GetTask(root, str, &registered_task); SysFreeString(str); - ITaskFolder_Release(folder); + ITaskFolder_Release(root); if (FAILED(hres)) { FIXME("GetTask failed: %08x\n", hres); return NULL; @@ -118,6 +132,57 @@ static int change_command(int argc, WCHAR *argv[]) return 0; } +static int delete_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name = NULL; + ITaskFolder *root = NULL; + BSTR str; + HRESULT hres; + + while (argc) { + if (!strcmpiW(argv[0], f_optW)) { + TRACE("force opt\n"); + argc--; + argv++; + }else if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn argument\n"); + return 1; + } + + root = get_tasks_root_folder(); + if (!root) + return 1; + + str = SysAllocString(task_name); + hres = ITaskFolder_DeleteTask(root, str, 0); + SysFreeString(str); + ITaskFolder_Release(root); + if (FAILED(hres)) + return 1; + + return 0; +} + int wmain(int argc, WCHAR *argv[]) { int i, ret = 0; @@ -132,6 +197,8 @@ int wmain(int argc, WCHAR *argv[]) FIXME("Print current tasks state\n"); else if (!strcmpiW(argv[1], change_optW)) ret = change_command(argc - 2, argv + 2); + else if (!strcmpiW(argv[1], delete_optW)) + ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1])); diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 03f4e43..7765038 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -180,7 +180,8 @@ START_TEST(schtasks) r = run_command("schtasks /CHANGE /tn wine\\test\\winetest /enable"); ok(r == 0, "r = %u\n", r); - unregister_task("wine\\test\\winetest"); + r = run_command("schtasks /delete /f /tn wine\\test\\winetest"); + ok(r == 0, "r = %u\n", r); r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r);

1 0

Jacek Caban : schtests: Added /create command implementation.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 74b386d4a25d6823e2c7f5f03d52f299fac1fe7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b386d4a25d6823e2c7f5f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 19 19:16:29 2018 +0100 schtests: Added /create command implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 127 +++++++++++++++++++++++++++++++++++++ programs/schtasks/tests/schtasks.c | 72 ++++++++++++++++----- 2 files changed, 182 insertions(+), 17 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 88a004f..5967e4a 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -27,10 +27,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; +static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; static const WCHAR f_optW[] = {'/','f',0}; static const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR xml_optW[] = {'/','x','m','l',0}; static ITaskFolder *get_tasks_root_folder(void) { @@ -84,6 +86,51 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) return registered_task; } +static BSTR read_file_to_bstr(const WCHAR *file_name) +{ + LARGE_INTEGER file_size; + DWORD read_size, size; + unsigned char *data; + HANDLE file; + BOOL r = FALSE; + BSTR ret; + + file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) { + FIXME("Could not open file\n"); + return NULL; + } + + if (!GetFileSizeEx(file, &file_size) || !file_size.QuadPart) { + FIXME("Empty file\n"); + CloseHandle(file); + return NULL; + } + + data = HeapAlloc(GetProcessHeap(), 0, file_size.QuadPart); + if (data) + r = ReadFile(file, data, file_size.QuadPart, &read_size, NULL); + CloseHandle(file); + if (!r) { + FIXME("Read filed\n"); + HeapFree(GetProcessHeap(), 0, data); + return NULL; + } + + if (read_size > 2 && data[0] == 0xff && data[1] == 0xfe) { /* UTF-16 BOM */ + ret = SysAllocStringLen((const WCHAR *)(data + 2), (read_size - 2) / sizeof(WCHAR)); + }else { + size = MultiByteToWideChar(CP_ACP, 0, (const char *)data, read_size, NULL, 0); + ret = SysAllocStringLen(NULL, size); + if (ret) + MultiByteToWideChar(CP_ACP, 0, (const char *)data, read_size, ret, size); + } + HeapFree(GetProcessHeap(), 0, data); + + return ret; +} + static int change_command(int argc, WCHAR *argv[]) { const WCHAR *task_name; @@ -132,6 +179,84 @@ static int change_command(int argc, WCHAR *argv[]) return 0; } +static int create_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name = NULL, *xml_file = NULL; + ITaskFolder *root = NULL; + IRegisteredTask *task; + VARIANT empty; + BSTR str, xml; + HRESULT hres; + + while (argc) { + if (!strcmpiW(argv[0], xml_optW)) { + if (argc < 2) { + FIXME("Missing /xml value\n"); + return 1; + } + + if (xml_file) { + FIXME("Duplicated /xml argument\n"); + return 1; + } + + xml_file = argv[1]; + argc -= 2; + argv += 2; + }else if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn argument\n"); + return 1; + } + + if (!xml_file) { + FIXME("Missing /xml argument\n"); + return E_FAIL; + } + + xml = read_file_to_bstr(xml_file); + if (!xml) + return 1; + + root = get_tasks_root_folder(); + if (!root) { + SysFreeString(xml); + return 1; + } + + V_VT(&empty) = VT_EMPTY; + str = SysAllocString(task_name); + hres = ITaskFolder_RegisterTask(root, str, xml, TASK_CREATE, empty, empty, + TASK_LOGON_NONE, empty, &task); + SysFreeString(str); + SysFreeString(xml); + ITaskFolder_Release(root); + if (FAILED(hres)) + return 1; + + IRegisteredTask_Release(task); + return 0; +} + static int delete_command(int argc, WCHAR *argv[]) { const WCHAR *task_name = NULL; @@ -197,6 +322,8 @@ int wmain(int argc, WCHAR *argv[]) FIXME("Print current tasks state\n"); else if (!strcmpiW(argv[1], change_optW)) ret = change_command(argc - 2, argv + 2); + else if (!strcmpiW(argv[1], create_optW)) + ret = create_command(argc - 2, argv + 2); else if (!strcmpiW(argv[1], delete_optW)) ret = delete_command(argc - 2, argv + 2); else diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 7765038..9f1b920 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -26,6 +26,23 @@ static ITaskService *service; static ITaskFolder *root; +static const char xml_a[] = + "<?xml version=\"1.0\"?>\n" + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static WCHAR *a2w(const char *str) { WCHAR *ret; @@ -81,23 +98,6 @@ static void _register_task(unsigned line, const char *task_name_a) WCHAR *task_name, *xml; HRESULT hres; - static const char xml_a[] = - "<?xml version=\"1.0\"?>\n" - "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" - " <RegistrationInfo>\n" - " <Description>\"Task1\"</Description>\n" - " </RegistrationInfo>\n" - " <Settings>\n" - " <Enabled>false</Enabled>\n" - " <Hidden>false</Hidden>\n" - " </Settings>\n" - " <Actions>\n" - " <Exec>\n" - " <Command>\"task1.exe\"</Command>\n" - " </Exec>\n" - " </Actions>\n" - "</Task>\n"; - V_VT(&empty) = VT_EMPTY; task_name = a2w(task_name_a); xml = a2w(xml_a); @@ -128,6 +128,23 @@ static void _unregister_task(unsigned line, const char *task_name_a) HeapFree(GetProcessHeap(), 0, task_name); } +static void create_file(const char *file_name, const char *data) +{ + HANDLE file; + DWORD size; + BOOL r; + + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + r = WriteFile(file, data, strlen(data), &size, NULL); + ok(r, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); +} + static BOOL initialize_task_service(void) { VARIANT empty; @@ -186,8 +203,29 @@ START_TEST(schtasks) r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r); + create_file("test.xml", xml_a); + + r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); + ok(r == 0, "r = %u\n", r); + + r = run_command("schtasks /change /tn wine\\winetest /enable"); + ok(r == 0, "r = %u\n", r); + + r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); + ok(r == 1, "r = %u\n", r); /* task already exists */ + + r = run_command("schtasks /create /tn wine\\winetest"); + ok(r == E_FAIL, "r = %x\n", r); /* missing arguments */ + + r = run_command("schtasks /Delete /f /tn wine\\winetest"); + ok(r == 0, "r = %u\n", r); + + r = DeleteFileA("test.xml"); + ok(r, "DeleteFileA failed: %u\n", GetLastError()); + ITaskFolder_DeleteFolder(root, wine_testW, 0); ITaskFolder_DeleteFolder(root, wineW, 0); + ITaskFolder_Release(root); ITaskService_Release(service); CoUninitialize();

1 0

Dmitry Timoshkov : kerberos: Add stubs for SpInitialize and SpShutdown.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 5b6920bd8fdb16157d547e3aeb413a31e64d0deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b6920bd8fdb16157d547e3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:51:20 2018 +0800 kerberos: Add stubs for SpInitialize and SpShutdown. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 76a5a07..502b41e 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -144,6 +144,21 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, + LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) +{ + FIXME("%lu,%p,%p: stub\n", package_id, params, lsa_function_table); + + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI kerberos_SpShutdown(void) +{ + TRACE("\n"); + + return STATUS_SUCCESS; +} + static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; @@ -178,8 +193,8 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* CallPackagePassthrough */ NULL, /* LogonUserEx */ NULL, /* LogonUserEx2 */ - NULL, /* Initialize */ - NULL, /* Shutdown */ + kerberos_SpInitialize, + kerberos_SpShutdown, kerberos_SpGetInfo, NULL, /* AcceptCredentials */ NULL, /* SpAcquireCredentialsHandle */

1 0

Nikolay Sivov : oleaut32/tests: Use SafeArraySetIID() directly.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 4cc41fc5ce2839ae6caaede48ba4fb449e8a58c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc41fc5ce2839ae6caaede4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 19 11:53:32 2018 +0300 oleaut32/tests: Use SafeArraySetIID() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 117 ++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 76 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 651a0c3..5ff29b3 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -47,8 +47,6 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pSafeArrayAllocDescriptorEx)(VARTYPE,UINT,SAFEARRAY**); static HRESULT (WINAPI *pSafeArrayCopyData)(SAFEARRAY*,SAFEARRAY*); -static HRESULT (WINAPI *pSafeArrayGetIID)(SAFEARRAY*,GUID*); -static HRESULT (WINAPI *pSafeArraySetIID)(SAFEARRAY*,REFGUID); static HRESULT (WINAPI *pSafeArrayGetVartype)(SAFEARRAY*,VARTYPE*); static HRESULT (WINAPI *pSafeArrayGetRecordInfo)(SAFEARRAY*,IRecordInfo**); static SAFEARRAY* (WINAPI *pSafeArrayCreateEx)(VARTYPE,UINT,SAFEARRAYBOUND*,LPVOID); @@ -686,24 +684,22 @@ static void test_safearray(void) hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD with data in array failed with hres %x\n",hres); - /* IID functions */ - /* init a small stack safearray */ - if (pSafeArraySetIID) { - memset(&b, 0, sizeof(b)); - b.cDims = 1; - memset(&iid, 0x42, sizeof(IID)); - hres = pSafeArraySetIID(&b,&iid); - ok(hres == E_INVALIDARG,"SafeArraySetIID of non IID capable safearray did not return E_INVALIDARG, but %x\n",hres); - - hres = SafeArrayAllocDescriptor(1,&a); - ok(hres == S_OK,"SafeArrayAllocDescriptor should return S_OK, but got %x\n",hres); - ok((a->fFeatures & FADF_HAVEIID) == 0,"newly allocated descriptor with SAAD should not have FADF_HAVEIID\n"); - hres = pSafeArraySetIID(a,&iid); - ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but got %x\n",hres); - - hres = SafeArrayDestroyDescriptor(a); - ok(hres == S_OK,"SADD failed with hres %x\n",hres); - } + /* IID functions */ + /* init a small stack safearray */ + memset(&b, 0, sizeof(b)); + b.cDims = 1; + memset(&iid, 0x42, sizeof(IID)); + hres = SafeArraySetIID(&b, &iid); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); + + hres = SafeArrayAllocDescriptor(1, &a); + ok(hres == S_OK, "Failed to allocate array descriptor, hr %#x.\n", hres); + ok((a->fFeatures & FADF_HAVEIID) == 0, "Unexpected features mask %#x.\n", a->fFeatures); + hres = SafeArraySetIID(a, &iid); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); + + hres = SafeArrayDestroyDescriptor(a); + ok(hres == S_OK,"SADD failed with hres %x\n",hres); if (!pSafeArrayAllocDescriptorEx) return; @@ -714,7 +710,7 @@ static void test_safearray(void) ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags); if (a->fFeatures & FADF_HAVEIID) { - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == S_OK,"SAGIID failed for vt %d with hres %x\n", vttypes[i].vt,hres); switch (vttypes[i].vt) { case VT_UNKNOWN: @@ -730,7 +726,7 @@ static void test_safearray(void) break; } } else { - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == E_INVALIDARG,"SAGIID did not fail for vt %d with hres %x\n", vttypes[i].vt,hres); } if (a->fFeatures & FADF_RECORD) { @@ -751,13 +747,13 @@ static void test_safearray(void) } if (a->fFeatures & FADF_HAVEIID) { - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ + hres = SafeArraySetIID(a, &IID_IStorage); /* random IID */ ok(hres == S_OK,"SASIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == S_OK,"SAGIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); ok(IsEqualGUID(&iid, &IID_IStorage),"returned iid is not IID_IStorage\n"); } else { - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ + hres = SafeArraySetIID(a, &IID_IStorage); /* random IID */ ok(hres == E_INVALIDARG,"SASIID did not failed with !FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); } hres = SafeArrayDestroyDescriptor(a); @@ -885,12 +881,8 @@ static void test_SafeArrayCreateLockDestroy(void) { ok((sa->fFeatures & FADF_HAVEIID) == 0, "Non interface type should not have FADF_HAVEIID\n"); - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == E_INVALIDARG, - "Non interface type allowed SetIID(), hres %x\n", hres); - } + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); if (vt != VT_RECORD) { VARTYPE aVt; @@ -908,12 +900,8 @@ static void test_SafeArrayCreateLockDestroy(void) else { ok(sa->fFeatures & FADF_HAVEIID, "Interface type should have FADF_HAVEIID\n"); - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == S_OK, - "Non interface type disallowed SetIID(), hres %x\n", hres); - } + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == S_OK, "Failed to set array IID, hres %#x.\n", hres); ok((sa->fFeatures & FADF_HAVEVARTYPE) == 0, "Interface type %d should not have FADF_HAVEVARTYPE\n", vt); } @@ -1544,25 +1532,14 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (ITypeInfo) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_ITypeInfo), "CreateEx (ITypeInfo) bad IID\n"); - } - } - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == S_OK, "Failed to set IID, hres = %8x\n", hres); - if (hres == S_OK && pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK && IsEqualGUID(&guid, &IID_IUnknown), "Set bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_ITypeInfo), "CreateEx (ITypeInfo) bad IID\n"); + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == S_OK, "Failed to set IID, hres = %8x\n", hres); + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK && IsEqualGUID(&guid, &IID_IUnknown), "Set bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -1573,15 +1550,10 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (NULL) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_IDispatch), "CreateEx (NULL) bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_IDispatch), "CreateEx (NULL) bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -1592,15 +1564,10 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (NULL-Unk) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_IUnknown), "CreateEx (NULL-Unk) bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_IUnknown), "CreateEx (NULL-Unk) bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -2125,8 +2092,6 @@ START_TEST(safearray) GETPTR(SafeArrayAllocDescriptorEx); GETPTR(SafeArrayCopyData); - GETPTR(SafeArrayGetIID); - GETPTR(SafeArraySetIID); GETPTR(SafeArrayGetVartype); GETPTR(SafeArrayCreateEx); GETPTR(SafeArrayCreateVector);

1 0

Alexandre Julliard : commdlg: Implement custom template support in 16-bit file dialogs.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 0e9cb103400c58480778894cb0e4a3d2dec9a3b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9cb103400c58480778894c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 11:24:00 2018 +0100 commdlg: Implement custom template support in 16-bit file dialogs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 136 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 7e2fda7..1238dc9 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -18,18 +18,120 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" #include "wingdi.h" #include "winuser.h" +#include "winternl.h" #include "commdlg.h" #include "cdlg16.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +static inline WORD get_word( const char **ptr ) +{ + WORD ret = *(WORD *)*ptr; + *ptr += sizeof(WORD); + return ret; +} + +static inline void copy_string( WORD **out, const char **in, DWORD maxlen ) +{ + DWORD len = MultiByteToWideChar( CP_ACP, 0, *in, -1, *out, maxlen ); + *in += strlen(*in) + 1; + *out += len; +} + +static inline void copy_dword( WORD **out, const char **in ) +{ + *(DWORD *)*out = *(DWORD *)*in; + *in += sizeof(DWORD); + *out += sizeof(DWORD) / sizeof(WORD); +} + +static LPDLGTEMPLATEA convert_dialog( const char *p, DWORD size ) +{ + LPDLGTEMPLATEA dlg; + WORD len, count, *out, *end; + + if (!(dlg = HeapAlloc( GetProcessHeap(), 0, size * 2 ))) return NULL; + out = (WORD *)dlg; + end = out + size; + copy_dword( &out, &p ); /* style */ + *out++ = 0; *out++ = 0; /* exstyle */ + *out++ = count = (BYTE)*p++; /* count */ + *out++ = get_word( &p ); /* x */ + *out++ = get_word( &p ); /* y */ + *out++ = get_word( &p ); /* cx */ + *out++ = get_word( &p ); /* cy */ + + if ((BYTE)*p == 0xff) /* menu */ + { + p++; + *out++ = 0xffff; + *out++ = get_word( &p ); + } + else copy_string( &out, &p, end - out ); + + copy_string( &out, &p, end - out ); /* class */ + copy_string( &out, &p, end - out ); /* caption */ + + if (dlg->style & DS_SETFONT) + { + *out++ = get_word( &p ); /* point size */ + copy_string( &out, &p, end - out ); /* face name */ + } + + /* controls */ + while (count--) + { + WORD x = get_word( &p ); + WORD y = get_word( &p ); + WORD cx = get_word( &p ); + WORD cy = get_word( &p ); + WORD id = get_word( &p ); + + out = (WORD *)(((UINT_PTR)out + 3) & ~3); + + copy_dword( &out, &p ); /* style */ + *out++ = 0; *out++ = 0; /* exstyle */ + *out++ = x; + *out++ = y; + *out++ = cx; + *out++ = cy; + *out++ = id; + + if (*p & 0x80) /* class */ + { + *out++ = 0xffff; + *out++ = (BYTE)*p++; + } + else copy_string( &out, &p, end - out ); + + if (*p & 0x80) /* window */ + { + *out++ = 0xffff; + *out++ = get_word( &p ); + } + else copy_string( &out, &p, end - out ); + + len = (BYTE)*p++; /* data */ + *out++ = (len + 1) & ~1; + memcpy( out, p, len ); + p += len; + out += (len + 1) / sizeof(WORD); + } + + assert( out <= end ); + return dlg; +} + static UINT_PTR CALLBACK dummy_hook( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { return FALSE; @@ -68,6 +170,7 @@ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/ { LPOPENFILENAME16 lpofn = MapSL(ofn); + LPDLGTEMPLATEA template = NULL; OPENFILENAMEA ofn32; BOOL ret; @@ -93,7 +196,20 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) - FIXME( "custom templates no longer supported, using default\n" ); + { + HRSRC16 res = FindResource16( lpofn->hInstance, MapSL(lpofn->lpTemplateName), (LPCSTR)RT_DIALOG ); + HGLOBAL16 handle = LoadResource16( lpofn->hInstance, res ); + DWORD size = SizeofResource16( lpofn->hInstance, res ); + void *ptr = LockResource16( handle ); + + if (ptr && (template = convert_dialog( ptr, size ))) + { + ofn32.hInstance = (HINSTANCE)template; + ofn32.Flags |= OFN_ENABLETEMPLATEHANDLE; + } + FreeResource16( handle ); + } + if (lpofn->Flags & OFN_ENABLEHOOK) FIXME( "custom hook %p no longer supported\n", lpofn->lpfnHook ); @@ -103,6 +219,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w lpofn->nFileOffset = ofn32.nFileOffset; lpofn->nFileExtension = ofn32.nFileExtension; } + HeapFree( GetProcessHeap(), 0, template ); return ret; } @@ -121,6 +238,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/ { LPOPENFILENAME16 lpofn = MapSL(ofn); + LPDLGTEMPLATEA template = NULL; OPENFILENAMEA ofn32; BOOL ret; @@ -146,7 +264,20 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) - FIXME( "custom templates no longer supported, using default\n" ); + { + HRSRC16 res = FindResource16( lpofn->hInstance, MapSL(lpofn->lpTemplateName), (LPCSTR)RT_DIALOG ); + HGLOBAL16 handle = LoadResource16( lpofn->hInstance, res ); + DWORD size = SizeofResource16( lpofn->hInstance, res ); + void *ptr = LockResource16( handle ); + + if (ptr && (template = convert_dialog( ptr, size ))) + { + ofn32.hInstance = (HINSTANCE)template; + ofn32.Flags |= OFN_ENABLETEMPLATEHANDLE; + } + FreeResource16( handle ); + } + if (lpofn->Flags & OFN_ENABLEHOOK) FIXME( "custom hook %p no longer supported\n", lpofn->lpfnHook ); @@ -156,6 +287,7 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w lpofn->nFileOffset = ofn32.nFileOffset; lpofn->nFileExtension = ofn32.nFileExtension; } + HeapFree( GetProcessHeap(), 0, template ); return ret; }

1 0

Andrey Gusev : winmm/tests: Fix memory leak.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 941d74a20ae941a5625983c57ad3c2c9e563721f URL: https://source.winehq.org/git/wine.git/?a=commit;h=941d74a20ae941a5625983c5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 19 13:11:04 2018 +0200 winmm/tests: Fix memory leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a8a5e8d..2a12752 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -977,7 +977,10 @@ static void wave_out_test_device(UINT_PTR device) "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n", dev_name(device),wave_out_error(rc)); if (rc!=MMSYSERR_NOERROR) + { + HeapFree(GetProcessHeap(), 0, nameA); return; + } trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname, (nameA?nameA:"failed"),capsA.vDriverVersion >> 8,

1 0

Vijay Kiran Kamuju : shdocvw: Add stub DoOrganizeFavDlg.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: b8901bfc76509f40173aa4fcb57dacddc5d447dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8901bfc76509f40173aa4fc… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jan 14 21:53:06 2018 +0100 shdocvw: Add stub DoOrganizeFavDlg. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw.spec | 4 ++-- dlls/shdocvw/shdocvw_main.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 0d581b2..485d160 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -113,8 +113,8 @@ @ stub DoAddToFavDlgW @ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW +@ stdcall DoOrganizeFavDlg(long str) +@ stdcall DoOrganizeFavDlgW(long wstr) @ stub DoPrivacyDlg @ stub HlinkFrameNavigate @ stub HlinkFrameNavigateNHL diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5d89f77..52c622c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -560,3 +560,32 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND hwnd, LPCWSTR initDir) +{ + FIXME("(%p %s) stub\n", hwnd, debugstr_w(initDir)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND hwnd, LPCSTR initDir) +{ + LPWSTR initDirW = NULL; + BOOL res; + + TRACE("(%p %s)\n", hwnd, debugstr_a(initDir)); + + if (initDir) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, initDir, -1, NULL, 0); + initDirW = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, initDir, -1, initDirW, len); + } + res = DoOrganizeFavDlgW(hwnd, initDirW); + heap_free(initDirW); + return res; +}

1 0

Alex Henrie : include: Add WIDL attributes to dhtmled.idl.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 8828a3c44ec2c4fb4158ee40dc10d5a2c6cb4a98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8828a3c44ec2c4fb4158ee40… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 18 10:24:20 2018 -0700 include: Add WIDL attributes to dhtmled.idl. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dhtmled.idl | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/dhtmled.idl b/include/dhtmled.idl index 25f3ea9..28064f2 100644 --- a/include/dhtmled.idl +++ b/include/dhtmled.idl @@ -23,6 +23,12 @@ import "mshtml.idl"; #include "dhtmldid.h" +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(683364a1-b37d-11d1-adc5-006008a5848c), version(1.0) @@ -557,7 +563,10 @@ library DHTMLEDLib }; [ - uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a) + uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a), + threading(apartment), + progid("DHTMLSafe.DHTMLSafe.1"), + vi_progid("DHTMLSafe.DHTMLSafe") ] coclass DHTMLSafe { @@ -706,7 +715,10 @@ library DHTMLEDLib }; [ - uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a) + uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a), + threading(apartment), + progid("DHTMLEdit.DHTMLEdit.1"), + vi_progid("DHTMLEdit.DHTMLEdit") ] coclass DHTMLEdit {

1 0

Thomas Faber : comctl32/tests: Fix broken ok() messages.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 0b8219da5ca27a35b4587b93c644d023bf5b7522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b8219da5ca27a35b4587b93… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jan 19 11:43:18 2018 +0100 comctl32/tests: Fix broken ok() messages. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index e2c29f4..1dfd4b2 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -871,7 +871,7 @@ static void test_hotitem(void) ok(ret == 3, "Hot item: %lx, expected 3\n", ret); g_fBlockHotItemChange = TRUE; ret = SendMessageA(hToolbar, TB_SETHOTITEM, 2, 0); - ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 2\n", ret); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); ok(ret == 3, "Hot item: %lx, expected 3\n", ret); g_fBlockHotItemChange = FALSE; @@ -902,7 +902,7 @@ static void test_hotitem(void) /* enabling the button won't change that */ SendMessageA(hToolbar, TB_ENABLEBUTTON, 9, TRUE); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); - ok(ret == -1, "TB_SETHOTITEM returned %ld, expected -1\n", ret); + ok(ret == -1, "TB_GETHOTITEM returned %ld, expected -1\n", ret); /* disabling a hot button works */ ret = SendMessageA(hToolbar, TB_SETHOTITEM, 3, 0); @@ -910,7 +910,7 @@ static void test_hotitem(void) g_fReceivedHotItemChange = FALSE; SendMessageA(hToolbar, TB_ENABLEBUTTON, 7, FALSE); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); - ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(ret == 3, "TB_GETHOTITEM returned %ld, expected 3\n", ret); ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); SendMessageA(hToolbar, TB_SETHOTITEM, 1, 0); @@ -920,7 +920,7 @@ static void test_hotitem(void) g_fReceivedHotItemChange = FALSE; ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 1, (LPARAM)&tbinfo) == TRUE, "TB_SETBUTTONINFOA failed\n"); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); - ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret); + ok(ret == 1, "TB_GETHOTITEM returned %ld, expected 1\n", ret); ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); DestroyWindow(hToolbar);

1 0