January 2011 - Wine-Commits

Alexandre Julliard : actxprxy: Add proxies for shldisp.idl.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 4a5c687069cd53a11b1537b5951f16121dc08d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5c687069cd53a11b1537b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 17:43:45 2011 +0100 actxprxy: Add proxies for shldisp.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 2 ++ dlls/actxprxy/actxprxy_shldisp.idl | 21 +++++++++++++++++++++ include/shldisp.idl | 3 +++ 4 files changed, 28 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3817eea..d91e568 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,8 @@ dlls/actxprxy/actxprxy_ocmm.h dlls/actxprxy/actxprxy_ocmm_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c +dlls/actxprxy/actxprxy_shldisp.h +dlls/actxprxy/actxprxy_shldisp_p.c dlls/actxprxy/actxprxy_shobjidl.h dlls/actxprxy/actxprxy_shobjidl_p.c dlls/actxprxy/actxprxy_urlhist.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 15f8e3d..b879903 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -16,6 +16,7 @@ IDL_P_SRCS = \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ actxprxy_servprov.idl \ + actxprxy_shldisp.idl \ actxprxy_shobjidl.idl \ actxprxy_urlhist.idl @@ -28,6 +29,7 @@ IDL_R_SRCS = \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ actxprxy_servprov.idl \ + actxprxy_shldisp.idl \ actxprxy_shobjidl.idl \ actxprxy_urlhist.idl diff --git a/dlls/actxprxy/actxprxy_shldisp.idl b/dlls/actxprxy/actxprxy_shldisp.idl new file mode 100644 index 0000000..81222a5 --- /dev/null +++ b/dlls/actxprxy/actxprxy_shldisp.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for shldisp.idl */ + +#include "shldisp.idl" diff --git a/include/shldisp.idl b/include/shldisp.idl index ce6d555..8df56cd 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -31,6 +31,7 @@ import "comcat.idl"; * IAutoComplete interface */ [ + local, object, uuid(00bb2762-6a77-11d0-a535-00c04fd7d062), pointer_default(unique) @@ -51,6 +52,7 @@ interface IAutoComplete : IUnknown * IAutoComplete2 interface */ [ + local, object, uuid(eac04bc0-3791-11d2-bb95-0060977b464c), pointer_default(unique) @@ -87,6 +89,7 @@ importlib("stdole2.tlb"); [ object, + oleautomation, uuid(9ba05970-f6a8-11cf-a442-00a0c90a8f39), pointer_default(unique) ]

1 0

Greg Geldorp : urlmon/tests: Fix tests when connecting via proxy.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 3f153007ba7c19fdb8b30c19143ad26e146c5eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f153007ba7c19fdb8b30c191… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Jan 19 12:44:07 2011 +0100 urlmon/tests: Fix tests when connecting via proxy. --- dlls/urlmon/tests/protocol.c | 24 +++++++++++++++++++++++- dlls/urlmon/tests/url.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index dd8cbf9..dcfe20c 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -221,6 +221,25 @@ static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) return lstrcmpA(stra1, stra2); } +static BOOL proxy_active(void) +{ + HKEY internet_settings; + DWORD proxy_enable; + DWORD size; + + if (RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", + 0, KEY_QUERY_VALUE, &internet_settings) != ERROR_SUCCESS) + return FALSE; + + size = sizeof(DWORD); + if (RegQueryValueExA(internet_settings, "ProxyEnable", NULL, NULL, (LPBYTE) &proxy_enable, &size) != ERROR_SUCCESS) + proxy_enable = 0; + + RegCloseKey(internet_settings); + + return proxy_enable != 0; +} + static HRESULT WINAPI HttpSecurity_QueryInterface(IHttpSecurity *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) @@ -581,7 +600,10 @@ static void call_continue(PROTOCOLDATA *protocol_data) CLEAR_CALLED(ReportProgress_CONNECTING); CLEAR_CALLED(ReportProgress_PROXYDETECTING); }else if(test_redirect) { - CHECK_CALLED(ReportProgress_FINDINGRESOURCE); + if (! proxy_active()) + CHECK_CALLED(ReportProgress_FINDINGRESOURCE); + else + CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); }else todo_wine { CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); /* IE7 does call this */ diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 47b2e79..21d5fd6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -246,6 +246,25 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static BOOL proxy_active(void) +{ + HKEY internet_settings; + DWORD proxy_enable; + DWORD size; + + if (RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", + 0, KEY_QUERY_VALUE, &internet_settings) != ERROR_SUCCESS) + return FALSE; + + size = sizeof(DWORD); + if (RegQueryValueExA(internet_settings, "ProxyEnable", NULL, NULL, (LPBYTE) &proxy_enable, &size) != ERROR_SUCCESS) + proxy_enable = 0; + + RegCloseKey(internet_settings); + + return proxy_enable != 0; +} + static BOOL is_urlmon_protocol(int prot) { return prot == FILE_TEST || prot == HTTP_TEST || prot == HTTPS_TEST || prot == FTP_TEST || prot == MK_TEST; @@ -2799,8 +2818,16 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CHECK_CALLED(GetRootSecurityId); } if(http_is_first || (test_protocol == HTTPS_TEST && !(flags & BINDTEST_INVALID_CN))) { - CHECK_CALLED(OnProgress_FINDINGRESOURCE); - CHECK_CALLED(OnProgress_CONNECTING); + if (! proxy_active()) + { + CHECK_CALLED(OnProgress_FINDINGRESOURCE); + CHECK_CALLED(OnProgress_CONNECTING); + } + else + { + CLEAR_CALLED(OnProgress_FINDINGRESOURCE); + CLEAR_CALLED(OnProgress_CONNECTING); + } }else todo_wine { CHECK_NOT_CALLED(OnProgress_FINDINGRESOURCE); /* IE7 does call this */

1 0

Alexander Morozov : shell32: Added typelib.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 535f0bce59ed55dc4e0511259c7452bf7a9a59a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535f0bce59ed55dc4e0511259… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jan 18 21:36:08 2011 +0300 shell32: Added typelib. --- .gitignore | 1 + dlls/shell32/Makefile.in | 2 ++ dlls/shell32/regsvr.c | 13 +++++++++++++ dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shell32_tlb.idl | 19 +++++++++++++++++++ 5 files changed, 38 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index cbc189d..3817eea 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/shdocvw/shdocvw_v1.tlb dlls/shell32/AUTHORS +dlls/shell32/shell32_tlb.tlb dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/sti/sti_wia.h diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7755111..15cb9d5 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -89,6 +89,8 @@ RC_SRCS = \ PO_SRCS = shell32.rc +IDL_TLB_SRCS = shell32_tlb.idl + SVG_SRCS = \ cdrom.svg \ control.svg \ diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index f09d72b..9d3ca65 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -22,6 +22,8 @@ #include <string.h> #include <stdio.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -837,6 +839,8 @@ static struct regsvr_namespace const namespace_extensions_list[] = { HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; + ITypeLib *tl; + static const WCHAR wszShell32[] = { 's','h','e','l','l','3','2','.','d','l','l', 0 }; TRACE("\n"); @@ -847,6 +851,12 @@ HRESULT WINAPI DllRegisterServer(void) hr = SHELL_RegisterShellFolders(); if (SUCCEEDED(hr)) hr = register_namespace_extensions(namespace_extensions_list); + if (SUCCEEDED(hr)) + { + hr = LoadTypeLibEx(wszShell32, REGKIND_REGISTER, &tl); + if(SUCCEEDED(hr)) + ITypeLib_Release(tl); + } return hr; } @@ -864,5 +874,8 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_interfaces(interface_list); if (SUCCEEDED(hr)) hr = unregister_namespace_extensions(namespace_extensions_list); + if (SUCCEEDED(hr)) + hr = UnRegisterTypeLib(&LIBID_Shell32, 1, 0, LOCALE_SYSTEM_DEFAULT, + SYS_WIN32); return hr; } diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index bc8e8df..4459be0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -260,6 +260,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: shell32_tlb.tlb */ +1 TYPELIB shell32_tlb.tlb + shv_accel ACCELERATORS BEGIN VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY diff --git a/dlls/shell32/shell32_tlb.idl b/dlls/shell32/shell32_tlb.idl new file mode 100644 index 0000000..2b6c719 --- /dev/null +++ b/dlls/shell32/shell32_tlb.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2010 Alexander Morozov for Etersoft + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 "shldisp.idl"

1 0

Alexander Morozov : shell32: Register CLSID_Shell.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 1adbaadc892b0318a80b5e9db7913222217d56a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adbaadc892b0318a80b5e9db… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jan 18 21:35:57 2011 +0300 shell32: Register CLSID_Shell. --- dlls/shell32/regsvr.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 9759b00..f09d72b 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -75,6 +75,8 @@ struct regsvr_coclass DWORD dwCallForAttributes; LPCSTR clsid_str; /* can be NULL to omit */ LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ UINT idDefaultIcon; /* can be 0 to omit */ }; @@ -117,6 +119,8 @@ static WCHAR const ps_clsid32_keyname[17] = { 'i', 'd', '3', '2', 0 }; static WCHAR const clsid_keyname[6] = { 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; static WCHAR const ips_keyname[13] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; @@ -125,6 +129,10 @@ static WCHAR const ips32_keyname[15] = { '3', '2', 0 }; static WCHAR const progid_keyname[7] = { 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; static WCHAR const shellex_keyname[8] = { 's', 'h', 'e', 'l', 'l', 'e', 'x', 0 }; static WCHAR const shellfolder_keyname[12] = { @@ -150,6 +158,9 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); /*********************************************************************** * register_interfaces @@ -385,6 +396,16 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + error_close_clsid_key: RegCloseKey(clsid_key); } @@ -421,6 +442,12 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } + + if (list->viprogid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } } error_close_coclass_key: @@ -541,6 +568,55 @@ static LONG register_key_defvalueA( } /*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) { + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** * coclass list */ static GUID const CLSID_Desktop = { @@ -642,6 +718,8 @@ static struct regsvr_coclass const coclass_list[] = { 0, NULL, NULL, + NULL, + NULL, IDI_SHELL_FULL_RECYCLE_BIN }, { &CLSID_ShellFSFolder, @@ -695,6 +773,19 @@ static struct regsvr_coclass const coclass_list[] = { "shell32.dll", "Apartment" }, + { &CLSID_Shell, + "Shell Automation Service", + 0, + NULL, + "shell32.dll", + "Apartment", + 0, + 0, + 0, + NULL, + "Shell.Application.1", + "Shell.Application" + }, { NULL } /* list terminator */ };

1 0

Piotr Caban : kernel32/tests: Added file move/ rename ReadDirectoryChangesW tests.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 9dbdd8c83c9dfcf1f9a510b2bdf0075c56c3862d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbdd8c83c9dfcf1f9a510b2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 18 11:24:58 2011 +0100 kernel32/tests: Added file move/rename ReadDirectoryChangesW tests. --- dlls/kernel32/tests/change.c | 81 ++++++++++++++++++++++++++++++++---------- 1 files changed, 62 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 0e8804f..8e22dd7 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -795,8 +795,9 @@ static void test_readdirectorychanges_cr(void) static const WCHAR szBoo[] = { '\\','b','o','o','\\',0 }; static const WCHAR szDir[] = { 'd','i','r',0 }; static const WCHAR szFile[] = { 'f','i','l','e',0 }; + static const WCHAR szBackslash[] = { '\\',0 }; - WCHAR path[MAX_PATH], file[MAX_PATH], dir[MAX_PATH]; + WCHAR path[MAX_PATH], file[MAX_PATH], dir[MAX_PATH], sub_file[MAX_PATH]; FILE_NOTIFY_INFORMATION fni[1024], *fni_next; OVERLAPPED ov; HANDLE hdir, hfile; @@ -824,6 +825,9 @@ static void test_readdirectorychanges_cr(void) lstrcatW(dir, szDir); lstrcpyW(file, path); lstrcatW(file, szFile); + lstrcpyW(sub_file, dir); + lstrcatW(sub_file, szBackslash); + lstrcatW(sub_file, szFile); DeleteFileW(file); RemoveDirectoryW(dir); @@ -864,6 +868,38 @@ static void test_readdirectorychanges_cr(void) r = CreateDirectoryW(dir, NULL); ok(r == TRUE, "failed to create directory\n"); + r = MoveFileW(file, sub_file); + ok(r == TRUE, "failed to move file\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive file move event\n"); + ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); + ok(fni->Action == FILE_ACTION_REMOVED, "Action = %d\n", fni->Action); + ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), + "FileNameLength = %d\n", fni->FileNameLength); + ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + r = MoveFileW(sub_file, file); + ok(r == TRUE, "failed to move file\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive file move event\n"); + ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); + ok(fni->Action == FILE_ACTION_ADDED, "Action = %d\n", fni->Action); + ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), + "FileNameLength = %d\n", fni->FileNameLength); + ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + r = DeleteFileW(file); ok(r == TRUE, "failed to delete file\n"); @@ -892,29 +928,36 @@ static void test_readdirectorychanges_cr(void) r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory move event\n"); - ok(fni->Action == FILE_ACTION_RENAMED_OLD_NAME, "Action = %d\n", fni->Action); - ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), - "FileNameLength = %d\n", fni->FileNameLength); - ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); - if (fni->NextEntryOffset) + if (fni->Action == FILE_ACTION_RENAMED_OLD_NAME) + { + ok(fni->Action == FILE_ACTION_RENAMED_OLD_NAME, "Action = %d\n", fni->Action); + ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), + "FileNameLength = %d\n", fni->FileNameLength); + ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + ok(fni->NextEntryOffset != 0, "no next entry in movement event\n"); fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); + ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); + ok(fni_next->Action == FILE_ACTION_RENAMED_NEW_NAME, "Action = %d\n", fni_next->Action); + ok(fni_next->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), + "FileNameLength = %d\n", fni_next->FileNameLength); + ok(!memcmp(fni_next->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); + } else { - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, - FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + todo_wine ok(0, "Expected rename event\n"); - r = SleepEx(1000, TRUE); - ok(r != 0, "failed to receive directory move event\n"); - fni_next = fni; + if (fni->NextEntryOffset == 0) + { + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive directory move event\n"); + } } - ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); - ok(fni_next->Action == FILE_ACTION_RENAMED_NEW_NAME, "Action = %d\n", fni_next->Action); - ok(fni_next->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), - "FileNameLength = %d\n", fni_next->FileNameLength); - ok(!memcmp(fni_next->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); r = CreateDirectoryW(dir, NULL); ok(r == TRUE, "failed to create directory\n");

1 0

Alexander Morozov : shell32: Add stub implementation of IShellDispatch.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 8b30849824a6a7bdf454574191729e1ed6f65cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b30849824a6a7bdf45457419… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jan 18 21:35:41 2011 +0300 shell32: Add stub implementation of IShellDispatch. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 356 ++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shellole.c | 2 + 4 files changed, 360 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b30849824a6a7bdf4545…

1 0

Alexandre Julliard : server: Add symbolic names in filesystem change actions traces.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: b3882bb33937c802b4ee1a5832e10908a72f20bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3882bb33937c802b4ee1a583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 14:20:40 2011 +0100 server: Add symbolic names in filesystem change actions traces. --- server/trace.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/server/trace.c b/server/trace.c index d083d2d..e01a3f1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -993,6 +993,18 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size static void dump_varargs_filesystem_event( const char *prefix, data_size_t size ) { + static const char * const actions[] = { + NULL, + "ADDED", + "REMOVED", + "MODIFIED", + "RENAMED_OLD_NAME", + "RENAMED_NEW_NAME", + "ADDED_STREAM", + "REMOVED_STREAM", + "MODIFIED_STREAM" + }; + fprintf( stderr,"%s{", prefix ); while (size) { @@ -1000,8 +1012,11 @@ static void dump_varargs_filesystem_event( const char *prefix, data_size_t size data_size_t len = (offsetof( struct filesystem_event, name[event->len] ) + sizeof(int)-1) / sizeof(int) * sizeof(int); if (size < len) break; - fprintf( stderr, "{action=%x,len=%u,name=\"%.*s\"}", - event->action, event->len, event->len, event->name ); + if (event->action < sizeof(actions)/sizeof(actions[0]) && actions[event->action]) + fprintf( stderr, "{action=%s", actions[event->action] ); + else + fprintf( stderr, "{action=%u", event->action ); + fprintf( stderr, ",name=\"%.*s\"}", event->len, event->name ); size -= len; remove_data( len ); if (size)fputc( ',', stderr );

1 0

Piotr Caban : server: Don' t report rename events when file is moved between directories.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: be5a757c7acaa83cd651e5e043819d074832d369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a757c7acaa83cd651e5e04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 18 11:24:49 2011 +0100 server: Don't report rename events when file is moved between directories. --- server/change.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/server/change.c b/server/change.c index e448c13..6461e95 100644 --- a/server/change.c +++ b/server/change.c @@ -123,6 +123,7 @@ static struct fd *inotify_fd; struct change_record { struct list entry; + unsigned int cookie; struct filesystem_event event; }; @@ -605,7 +606,7 @@ static int inotify_get_poll_events( struct fd *fd ) } static void inotify_do_change_notify( struct dir *dir, unsigned int action, - const char *relpath ) + unsigned int cookie, const char *relpath ) { struct change_record *record; @@ -618,6 +619,7 @@ static void inotify_do_change_notify( struct dir *dir, unsigned int action, if (!record) return; + record->cookie = cookie; record->event.action = action; memcpy( record->event.name, relpath, len ); record->event.len = len; @@ -809,7 +811,7 @@ static void inotify_notify_all( struct inotify_event *ie ) { LIST_FOR_EACH_ENTRY( dir, &i->dirs, struct dir, in_entry ) if ((filter & dir->filter) && (i==inode || dir->subtree)) - inotify_do_change_notify( dir, action, path ); + inotify_do_change_notify( dir, action, ie->cookie, path ); if (!i->name || !prepend( &path, i->name )) break; @@ -1177,6 +1179,22 @@ DECL_HANDLER(read_change) LIST_FOR_EACH_ENTRY( record, &events, struct change_record, entry ) { data_size_t len = offsetof( struct filesystem_event, name[record->event.len] ); + + /* FIXME: rename events are sometimes reported as delete/create */ + if (record->event.action == FILE_ACTION_RENAMED_OLD_NAME) + { + struct list *elem = list_next( &events, &record->entry ); + if (elem) + next = LIST_ENTRY(elem, struct change_record, entry); + + if (elem && next->cookie == record->cookie) + next->cookie = 0; + else + record->event.action = FILE_ACTION_REMOVED; + } + else if (record->event.action == FILE_ACTION_RENAMED_NEW_NAME && record->cookie) + record->event.action = FILE_ACTION_ADDED; + memcpy( event, &record->event, len ); event += len; if (len % sizeof(int))

1 0

Piotr Caban : server: Return multiple events in read_changes.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: b614a15328b05d962c31b54b7e078580be23be8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b614a15328b05d962c31b54b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 18 11:24:33 2011 +0100 server: Return multiple events in read_changes. --- dlls/ntdll/directory.c | 69 ++++++++++++++++++++++++++------------- include/wine/server_protocol.h | 14 ++++++-- server/change.c | 61 ++++++++++++++++++++++++++--------- server/protocol.def | 11 +++++- server/request.h | 3 +- server/trace.c | 21 +++++++++++- 6 files changed, 131 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b614a15328b05d962c31b…

1 0

Vitaliy Margolen : dinput: Combine ASCII and Unicode Direct Input Device QueryInterface.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 92ac7861f5c9d8ff0d02dbc6f9ec514289826162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ac7861f5c9d8ff0d02dbc6f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 18 21:06:48 2011 -0700 dinput: Combine ASCII and Unicode Direct Input Device QueryInterface. --- dlls/dinput/device.c | 89 ++++++++++++++----------------------------------- 1 files changed, 26 insertions(+), 63 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c54a756..44c99dd 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -774,76 +774,39 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) return IDirectInputDevice2WImpl_Release(IDirectInputDevice8W_from_impl(This)); } -HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( - LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj -) +HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W iface, REFIID riid, LPVOID *ppobj) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - - TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(&IID_IUnknown,riid)) { - IDirectInputDevice2_AddRef(iface); - *ppobj = This; - return DI_OK; - } - if (IsEqualGUID(&IID_IDirectInputDeviceA,riid)) { - IDirectInputDevice2_AddRef(iface); - *ppobj = This; - return DI_OK; - } - if (IsEqualGUID(&IID_IDirectInputDevice2A,riid)) { - IDirectInputDevice2_AddRef(iface); - *ppobj = This; - return DI_OK; - } - if (IsEqualGUID(&IID_IDirectInputDevice7A,riid)) { - IDirectInputDevice7_AddRef(iface); - *ppobj = This; - return DI_OK; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("(%p this=%p,%s,%p)\n", iface, This, debugstr_guid(riid), ppobj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectInputDeviceA, riid) || + IsEqualGUID(&IID_IDirectInputDevice2A, riid) || + IsEqualGUID(&IID_IDirectInputDevice7A, riid) || + IsEqualGUID(&IID_IDirectInputDevice8A, riid)) + { + IDirectInputDevice2_AddRef(iface); + *ppobj = IDirectInputDevice8A_from_impl(This); + return DI_OK; } - if (IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - IDirectInputDevice8_AddRef(iface); - *ppobj = This; - return DI_OK; + if (IsEqualGUID(&IID_IDirectInputDeviceW, riid) || + IsEqualGUID(&IID_IDirectInputDevice2W, riid) || + IsEqualGUID(&IID_IDirectInputDevice7W, riid) || + IsEqualGUID(&IID_IDirectInputDevice8W, riid)) + { + IDirectInputDevice2_AddRef(iface); + *ppobj = IDirectInputDevice8W_from_impl(This); + return DI_OK; } - TRACE("Unsupported interface !\n"); + + WARN("Unsupported interface!\n"); return E_FAIL; } -HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface( - LPDIRECTINPUTDEVICE8W iface,REFIID riid,LPVOID *ppobj -) +HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface, REFIID riid, LPVOID *ppobj) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - - TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(&IID_IUnknown,riid)) { - IDirectInputDevice2_AddRef(iface); - *ppobj = This; - return DI_OK; - } - if (IsEqualGUID(&IID_IDirectInputDeviceW,riid)) { - IDirectInputDevice2_AddRef(iface); - *ppobj = This; - return DI_OK; - } - if (IsEqualGUID(&IID_IDirectInputDevice2W,riid)) { - IDirectInputDevice2_AddRef(iface); - *ppobj = This; - return DI_OK; - } - if (IsEqualGUID(&IID_IDirectInputDevice7W,riid)) { - IDirectInputDevice7_AddRef(iface); - *ppobj = This; - return DI_OK; - } - if (IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - IDirectInputDevice8_AddRef(iface); - *ppobj = This; - return DI_OK; - } - TRACE("Unsupported interface !\n"); - return E_FAIL; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_QueryInterface(IDirectInputDevice8W_from_impl(This), riid, ppobj); } ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface)

1 0