August 2006 - Wine-Commits - list.winehq.org

Mike McCormack : shell32: Fix test compilation with MSVC6.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: 1cc186ba8167c6f7d2c95adf7e50673c35efae60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1cc186ba8167c6f7d2c95ad… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 9 19:31:26 2006 +0900 shell32: Fix test compilation with MSVC6. --- dlls/shell32/tests/shelllink.c | 44 +++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index c774dab..a6cba36 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -24,10 +24,7 @@ #define COBJMACROS -#include <stdarg.h> -#include <stdio.h> -#include "windef.h" -#include "winbase.h" +#include <windows.h> #include "shlguid.h" #include "shobjidl.h" #include "shlobj.h" @@ -35,6 +32,25 @@ #include "wine/test.h" #include "shell32_test.h" +#ifndef _MSC_VER +#define DBH(x) (x).dbh +#else +#define DBH(x) (x) +#endif + +typedef void (WINAPI *fnILFree)(LPITEMIDLIST); +typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); +typedef HRESULT (WINAPI *fnSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); + +static fnILFree pILFree; +static fnILIsEqual pILIsEqual; +static fnSHILCreateFromPath pSHILCreateFromPath; + +static const GUID _IID_IShellLinkDataList = { + 0x45e2b4ae, 0xb1c3, 0x11d0, + { 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1 } +}; + static const WCHAR lnkfile[]= { 'C',':','\\','t','e','s','t','.','l','n','k',0 }; static const WCHAR notafile[]= { 'C',':','\\','n','o','n','e','x','i','s','t','e','n','t','\\','f','i','l','e',0 }; @@ -72,7 +88,7 @@ static LPITEMIDLIST path_to_pidl(const c pathW=HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); - r=SHILCreateFromPath(pathW, &pidl, NULL); + r=pSHILCreateFromPath(pathW, &pidl, NULL); todo_wine { ok(SUCCEEDED(r), "SHILCreateFromPath failed (0x%08lx)\n", r); } @@ -188,11 +204,11 @@ static void test_get_set(void) tmp_pidl=NULL; r = IShellLinkA_GetIDList(sl, &tmp_pidl); ok(SUCCEEDED(r), "GetIDList failed (0x%08lx)\n", r); - ok(tmp_pidl && ILIsEqual(pidl, tmp_pidl), + ok(tmp_pidl && pILIsEqual(pidl, tmp_pidl), "GetIDList returned an incorrect pidl\n"); /* tmp_pidl is owned by IShellLink so we don't free it */ - ILFree(pidl); + pILFree(pidl); strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); @@ -410,7 +426,7 @@ static void check_lnk_(int line, const W LPITEMIDLIST pidl=NULL; r = IShellLinkA_GetIDList(sl, &pidl); lok(SUCCEEDED(r), "GetIDList failed (0x%08lx)\n", r); - lok(ILIsEqual(pidl, desc->pidl), + lok(pILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); } if (desc->showcmd) @@ -468,7 +484,6 @@ static void test_load_save(void) desc.icon=""; check_lnk(lnkfile, &desc); - /* Point a .lnk file to nonexistent files */ desc.description=""; desc.workdir="c:\\Nonexitent\\work\\directory"; @@ -489,7 +504,6 @@ static void test_load_save(void) if (p) *p='\0'; - /* Overwrite the existing lnk file and point it to existing files */ desc.description="test 2"; desc.workdir=mydir; @@ -541,7 +555,7 @@ static void test_datalink(void) if (!sl) return; - r = IShellLinkW_QueryInterface( sl, &IID_IShellLinkDataList, (LPVOID*) &dl ); + r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl ); ok(r == S_OK, "no datalink interface\n"); if (!dl) @@ -575,7 +589,7 @@ static void test_datalink(void) r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); ok( r == S_OK, "CopyDataBlock failed\n"); - ok( dar && dar->dbh.dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n"); + ok( dar && DBH(*dar).dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n"); ok( dar && 0==lstrcmpW(dar->szwDarwinID, comp ), "signature wrong\n"); LocalFree( dar ); @@ -587,6 +601,12 @@ static void test_datalink(void) START_TEST(shelllink) { HRESULT r; + HMODULE hmod; + + hmod = GetModuleHandle("shell32"); + pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155); + pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21); + pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28); r = CoInitialize(NULL); ok(SUCCEEDED(r), "CoInitialize failed (0x%08lx)\n", r);

1 0

Alexandre Julliard : server: Make the message extra info 64 bits on Win64.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: 672bfc2d6299047520eb61f87b08addf225689d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=672bfc2d6299047520eb61f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 9 17:10:14 2006 +0200 server: Make the message extra info 64 bits on Win64. --- dlls/user/user_private.h | 2 +- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 6 +++--- server/queue.c | 4 ++-- server/trace.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h index ffb2796..00e9b45 100644 --- a/dlls/user/user_private.h +++ b/dlls/user/user_private.h @@ -174,7 +174,7 @@ struct user_thread_info struct hook16_queue_info *hook16_info; /* 10 Opaque pointer for 16-bit hook support */ DWORD GetMessageTimeVal; /* 14 Value for GetMessageTime */ DWORD GetMessagePosVal; /* 18 Value for GetMessagePos */ - DWORD GetMessageExtraInfoVal; /* 1c Value for GetMessageExtraInfo */ + ULONG_PTR GetMessageExtraInfoVal; /* 1c Value for GetMessageExtraInfo */ HCURSOR cursor; /* 20 Current cursor */ INT cursor_count; /* 24 Cursor show count */ UINT active_hooks; /* 28 Bitmap of active hooks */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 08c085b..b8c8a7c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2199,7 +2199,7 @@ struct send_message_request unsigned int msg; unsigned long wparam; unsigned long lparam; - unsigned int info; + unsigned long info; int timeout; void* callback; /* VARARG(data,bytes); */ @@ -2243,10 +2243,10 @@ struct send_hardware_message_request unsigned int msg; unsigned long wparam; unsigned long lparam; + unsigned long info; int x; int y; unsigned int time; - unsigned int info; }; struct send_hardware_message_reply { @@ -2272,12 +2272,12 @@ struct get_message_reply unsigned int msg; unsigned long wparam; unsigned long lparam; + unsigned long info; int x; int y; user_handle_t hook; void* hook_proc; unsigned int time; - unsigned int info; unsigned int hw_id; unsigned int active_hooks; data_size_t total; @@ -4405,6 +4405,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 245 +#define SERVER_PROTOCOL_VERSION 246 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 27122ab..0d014dd 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1571,7 +1571,7 @@ #define SNAP_MODULE 0x00000008 unsigned int msg; /* message code */ unsigned long wparam; /* parameters */ unsigned long lparam; /* parameters */ - unsigned int info; /* extra info */ + unsigned long info; /* extra info */ int timeout; /* timeout for reply */ void* callback; /* callback address */ VARARG(data,bytes); /* message data for sent messages */ @@ -1603,10 +1603,10 @@ #define SEND_MSG_ABORT_IF_HUNG 0x01 unsigned int msg; /* message code */ unsigned long wparam; /* parameters */ unsigned long lparam; /* parameters */ + unsigned long info; /* extra info */ int x; /* x position */ int y; /* y position */ unsigned int time; /* message time */ - unsigned int info; /* extra info */ @END @@ -1623,12 +1623,12 @@ #define SEND_MSG_ABORT_IF_HUNG 0x01 unsigned int msg; /* message code */ unsigned long wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */ unsigned long lparam; /* parameters (result for MSG_CALLBACK_RESULT) */ + unsigned long info; /* extra info (callback argument for MSG_CALLBACK_RESULT) */ int x; /* x position */ int y; /* y position */ user_handle_t hook; /* winevent hook handle */ void* hook_proc; /* winevent hook proc address */ unsigned int time; /* message time */ - unsigned int info; /* extra info (callback argument for MSG_CALLBACK_RESULT) */ unsigned int hw_id; /* id if hardware message */ unsigned int active_hooks; /* active hooks bitmap */ data_size_t total; /* total size of extra data */ diff --git a/server/queue.c b/server/queue.c index 7a77bd4..24767b6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -72,10 +72,10 @@ struct message unsigned int msg; /* message code */ unsigned long wparam; /* parameters */ unsigned long lparam; /* parameters */ + unsigned long info; /* extra info */ int x; /* x position */ int y; /* y position */ unsigned int time; /* message time */ - unsigned int info; /* extra info */ user_handle_t hook; /* winevent hook handle */ void *hook_proc; /* winevent hook proc address */ void *data; /* message data for sent messages */ @@ -520,7 +520,7 @@ static void result_timeout( void *privat static struct message_result *alloc_message_result( struct msg_queue *send_queue, struct msg_queue *recv_queue, struct message *msg, int timeout, - void *callback, unsigned int callback_data ) + void *callback, unsigned long callback_data ) { struct message_result *result = mem_alloc( sizeof(*result) ); if (result) diff --git a/server/trace.c b/server/trace.c index d4f8fed..a84752a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2091,7 +2091,7 @@ static void dump_send_message_request( c fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " wparam=%lx,", req->wparam ); fprintf( stderr, " lparam=%lx,", req->lparam ); - fprintf( stderr, " info=%08x,", req->info ); + fprintf( stderr, " info=%lx,", req->info ); fprintf( stderr, " timeout=%d,", req->timeout ); fprintf( stderr, " callback=%p,", req->callback ); fprintf( stderr, " data=" ); @@ -2110,10 +2110,10 @@ static void dump_send_hardware_message_r fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " wparam=%lx,", req->wparam ); fprintf( stderr, " lparam=%lx,", req->lparam ); + fprintf( stderr, " info=%lx,", req->info ); fprintf( stderr, " x=%d,", req->x ); fprintf( stderr, " y=%d,", req->y ); - fprintf( stderr, " time=%08x,", req->time ); - fprintf( stderr, " info=%08x", req->info ); + fprintf( stderr, " time=%08x", req->time ); } static void dump_get_message_request( const struct get_message_request *req ) @@ -2132,12 +2132,12 @@ static void dump_get_message_reply( cons fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " wparam=%lx,", req->wparam ); fprintf( stderr, " lparam=%lx,", req->lparam ); + fprintf( stderr, " info=%lx,", req->info ); fprintf( stderr, " x=%d,", req->x ); fprintf( stderr, " y=%d,", req->y ); fprintf( stderr, " hook=%p,", req->hook ); fprintf( stderr, " hook_proc=%p,", req->hook_proc ); fprintf( stderr, " time=%08x,", req->time ); - fprintf( stderr, " info=%08x,", req->info ); fprintf( stderr, " hw_id=%08x,", req->hw_id ); fprintf( stderr, " active_hooks=%08x,", req->active_hooks ); fprintf( stderr, " total=%u,", req->total );

1 0

Alexandre Julliard : server: Split the queuing of hardware messages into a separate send_hardware_message request .
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: d3b3096756fe99260630c619eb73c9ff1343f0e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3b3096756fe99260630c61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 9 16:45:26 2006 +0200 server: Split the queuing of hardware messages into a separate send_hardware_message request. --- dlls/user/message.c | 2 - dlls/winex11.drv/keyboard.c | 6 +--- dlls/winex11.drv/mouse.c | 6 +--- include/wine/server_protocol.h | 28 +++++++++++++++-- server/protocol.def | 17 +++++++++- server/queue.c | 65 +++++++++++++++++++++++++++++----------- server/request.h | 2 + server/trace.c | 19 ++++++++++-- 8 files changed, 105 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d3b3096756fe9926063…

1 0

Mikołaj Zalewski : shell32: Add recyclebin. c file missing in previous commit.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: 64c5142ae941e46b25f031b87ba1e74b55f3782c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64c5142ae941e46b25f031b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Aug 3 19:11:07 2006 +0200 shell32: Add recyclebin.c file missing in previous commit. --- dlls/shell32/recyclebin.c | 513 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 513 insertions(+), 0 deletions(-) create mode 100644 dlls/shell32/recyclebin.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=64c5142ae941e46b25f…

1 0

Mikołaj Zalewski : shell32: Update Polish translation.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: a0f696bbfc1e12ead7c7865c83c9183c3cf15397 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0f696bbfc1e12ead7c7865… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Aug 3 19:11:07 2006 +0200 shell32: Update Polish translation. --- dlls/shell32/shell32_Pl.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc index 62f4b8e..05dc6c3 100644 --- a/dlls/shell32/shell32_Pl.rc +++ b/dlls/shell32/shell32_Pl.rc @@ -146,10 +146,13 @@ STRINGTABLE DISCARDABLE IDS_SHV_COLUMN9 "Komentarz" IDS_SHV_COLUMN10 "W�a�ciciel" IDS_SHV_COLUMN11 "Grupa" + IDS_SHV_COLUMN_DELFROM "Lokacja oryginalna" + IDS_SHV_COLUMN_DELDATE "Data usuni�cia" /* special folders */ IDS_DESKTOP "Pulpit" IDS_MYCOMPUTER "M�j komputer" + IDS_RECYCLEBIN_FOLDER_NAME "Kosz" /* context menus */ IDS_VIEW_LARGE "&Du�e Ikony"

1 0

Mikołaj Zalewski : shell32: Add a custom icon for the trash folder.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: 4bb595e4c607abe7af5122ce68ece41df7093ded URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4bb595e4c607abe7af5122c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Aug 3 19:09:52 2006 +0200 shell32: Add a custom icon for the trash folder. --- dlls/shell32/regsvr.c | 23 ++++++++++++++++++++++- dlls/shell32/shres.rc | 2 ++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index cb8f69b..9586342 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -73,6 +73,7 @@ struct regsvr_coclass DWORD dwCallForAttributes; LPCSTR clsid_str; /* can be NULL to omit */ LPCSTR progid; /* can be NULL to omit */ + UINT idDefaultIcon; /* can be 0 to omit */ }; /* flags for regsvr_coclass.flags */ @@ -127,6 +128,8 @@ static WCHAR const shellfolder_keyname[1 static WCHAR const mcdm_keyname[21] = { 'M', 'a', 'y', 'C', 'h', 'a', 'n', 'g', 'e', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'M', 'e', 'n', 'u', 0 }; +static WCHAR const defaulticon_keyname[] = { + 'D','e','f','a','u','l','t','I','c','o','n',0}; static char const tmodel_valuename[] = "ThreadingModel"; static char const wfparsing_valuename[] = "WantsFORPARSING"; static char const attributes_valuename[] = "Attributes"; @@ -275,6 +278,21 @@ static HRESULT register_coclasses(struct (CONST BYTE*)(buffer), strlen(buffer)+1); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + + if (list->idDefaultIcon) { + HKEY icon_key; + char buffer[64] = "%SYSTEMROOT%\\system32\\shell32.dll,-"; + + res = RegCreateKeyExW(clsid_key, defaulticon_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &icon_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + sprintf(buffer+strlen(buffer), "%u", list->idDefaultIcon); + res = RegSetValueExA(icon_key, NULL, 0, REG_EXPAND_SZ, + (CONST BYTE*)(buffer), strlen(buffer)+1); + RegCloseKey(icon_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } if (list->ips) { res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); @@ -668,7 +686,10 @@ static struct regsvr_coclass const cocla "Apartment", SHELLFOLDER_ATTRIBUTES, SFGAO_FOLDER|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET, - 0 + 0, + NULL, + NULL, + IDI_SHELL_FULL_RECYCLE_BIN }, { NULL } /* list terminator */ }; diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index c4f982b..c9757dd 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -10531,6 +10531,8 @@ IDI_SHELL_DESKTOP ICON desktop.ico 'FF FF FF FF FF FF' } */ +IDI_SHELL_FULL_RECYCLE_BIN ICON trash_file.ico + /* BINRES trash_file.ico */ IDI_SHELL_TRASH_FILE ICON trash_file.ico /* {

1 0

Mikołaj Zalewski : shell32: Add trash items enumeration.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: 76a20d38f36234c9b2d658050c8407b264dfae9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76a20d38f36234c9b2d6580… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Aug 3 19:07:47 2006 +0200 shell32: Add trash items enumeration. --- dlls/shell32/trash.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index d5d7fc3..c7e4bb8 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -21,14 +21,17 @@ #include <stdarg.h> #include <sys/stat.h> +#include <sys/types.h> #include <stdlib.h> #include <unistd.h> +#include <dirent.h> #include "windef.h" #include "winbase.h" #include "winerror.h" #include "winreg.h" #include "shlwapi.h" +#include "winternl.h" #include <stdio.h> #include <fcntl.h> @@ -377,9 +380,118 @@ void TRASH_DisposeElement(TRASH_ELEMENT SHFree(element->filename); } -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data) { + LPSTR path; + struct stat stats; + int suffix_length = lstrlenA(trashinfo_suffix); + int filename_length = lstrlenA(element->filename); + int path_length = lstrlenA(element->bucket->files_dir); + static const WCHAR fmt[] = {'T','O','D','O','\\','(','%','h','s',')',0}; + + path = SHAlloc(path_length + filename_length + 1); + if (path == NULL) return E_OUTOFMEMORY; + lstrcpyA(path, element->bucket->files_dir); + lstrcpyA(path+path_length, element->filename); + path[path_length + filename_length - suffix_length] = 0; /* remove the '.trashinfo' */ + if (lstat(path, &stats) == -1) + { + ERR("Error accessing data file for trashinfo %s (errno=%d)\n", element->filename, errno); + return S_FALSE; + } + + ZeroMemory(data, sizeof(*data)); + data->nFileSizeHigh = (DWORD)((LONGLONG)stats.st_size>>32); + data->nFileSizeLow = stats.st_size & 0xffffffff; + RtlSecondsSince1970ToTime(stats.st_mtime, (LARGE_INTEGER *)&data->ftLastWriteTime); + wnsprintfW(data->cFileName, MAX_PATH, fmt, element->filename); + return S_OK; +} + +INT CALLBACK free_item_callback(void *item, void *lParam) +{ + SHFree(item); + return TRUE; +} + +static HDPA enum_bucket_trashinfos(TRASH_BUCKET *bucket, int *count) +{ + HDPA ret = DPA_Create(32); + struct dirent *entry; + DIR *dir = NULL; + + errno = ENOMEM; *count = 0; - *pidls = SHAlloc(0); + if (ret == NULL) goto failed; + dir = opendir(bucket->info_dir); + if (dir == NULL) goto failed; + while ((entry = readdir(dir)) != NULL) + { + LPSTR filename; + int namelen = lstrlenA(entry->d_name); + int suffixlen = lstrlenA(trashinfo_suffix); + if (namelen <= suffixlen || + lstrcmpA(entry->d_name+namelen-suffixlen, trashinfo_suffix) != 0) + continue; + + filename = StrDupA(entry->d_name); + if (filename == NULL) + goto failed; + if (DPA_InsertPtr(ret, DPA_APPEND, filename) == -1) + { + SHFree(filename); + goto failed; + } + (*count)++; + } + closedir(dir); + return ret; +failed: + if (dir) closedir(dir); + if (ret) + DPA_DestroyCallback(ret, free_item_callback, NULL); + return NULL; +} + +HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +{ + int ti_count; + int pos=0, i; + HRESULT err = E_OUTOFMEMORY; + HDPA tinfs; + + if (!TRASH_EnsureInitialized()) return E_FAIL; + tinfs = enum_bucket_trashinfos(home_trash, &ti_count); + if (tinfs == NULL) return E_FAIL; + *pidls = SHAlloc(sizeof(LPITEMIDLIST)*ti_count); + if (!*pidls) goto failed; + for (i=0; i<ti_count; i++) + { + WIN32_FIND_DATAW data; + TRASH_ELEMENT elem; + + elem.bucket = home_trash; + elem.filename = DPA_GetPtr(tinfs, i); + if (FAILED(err = TRASH_GetDetails(&elem, &data))) + goto failed; + if (err == S_FALSE) + continue; + if (FAILED(err = TRASH_CreateSimplePIDL(&elem, &data, &(*pidls)[pos]))) + goto failed; + pos++; + } + *count = pos; + DPA_DestroyCallback(tinfs, free_item_callback, NULL); return S_OK; +failed: + if (*pidls != NULL) + { + int j; + for (j=0; j<pos; j++) + SHFree((*pidls)[j]); + SHFree(*pidls); + } + DPA_DestroyCallback(tinfs, free_item_callback, NULL); + + return err; }

1 0

Yong Chi : ddraw: Fix for incorrect return value from wined3d.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: f0d6cba3a5ac87ed9dab23cd13045e860f2553ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0d6cba3a5ac87ed9dab23c… Author: Yong Chi <yong28chi(a)yahoo.com> Date: Sun Aug 6 13:05:02 2006 -0700 ddraw: Fix for incorrect return value from wined3d. --- dlls/ddraw/direct3d.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 832786f..fe56729 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -992,7 +992,10 @@ IDirect3DImpl_7_CreateVertexBuffer(IDire { ERR("(%p) IWineD3DDevice::CreateVertexBuffer failed with hr=%08lx\n", This, hr); HeapFree(GetProcessHeap(), 0, object); - return hr; + if (hr == WINED3DERR_INVALIDCALL) + return DDERR_INVALIDPARAMS; + else + return hr; } /* Return the interface */

1 0

Mikołaj Zalewski : shell32: Add a Trash virtual folder .
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: 289e469e7c7e624bc70f0b43e8b971743926d90c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=289e469e7c7e624bc70f0b4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Aug 3 19:04:11 2006 +0200 shell32: Add a Trash virtual folder. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/regsvr.c | 16 +++++++++ dlls/shell32/shell32_En.rc | 3 ++ dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shresdef.h | 5 +++ dlls/shell32/trash.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/xdg.h | 6 +++ 8 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 58376e9..54b2936 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -27,6 +27,7 @@ C_SRCS = \ folders.c \ iconcache.c \ pidl.c \ + recyclebin.c \ regsvr.c \ shell32_main.c \ shelllink.c \ diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 6efb192..cb8f69b 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -660,6 +660,16 @@ static struct regsvr_coclass const cocla SFGAO_FILESYSANCESTOR|SFGAO_FOLDER|SFGAO_HASSUBFOLDER, SFGAO_FILESYSTEM }, + { &CLSID_RecycleBin, + "Trash", + IDS_RECYCLEBIN_FOLDER_NAME, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES, + SFGAO_FOLDER|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET, + 0 + }, { NULL } /* list terminator */ }; @@ -677,6 +687,7 @@ static struct regsvr_interface const int static const WCHAR wszDesktop[] = { 'D','e','s','k','t','o','p',0 }; static const WCHAR wszSlash[] = { '/', 0 }; static const WCHAR wszMyDocuments[] = { 'M','y',' ','D','o','c','u','m','e','n','t','s', 0 }; +static const WCHAR wszRecycleBin[] = { 'T','r','a','s','h', 0 }; static struct regsvr_namespace const namespace_extensions_list[] = { { @@ -689,6 +700,11 @@ static struct regsvr_namespace const nam wszDesktop, wszMyDocuments }, + { + &CLSID_RecycleBin, + wszDesktop, + wszRecycleBin + }, { NULL } }; diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 03b31f6..7c7caaa 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -145,10 +145,13 @@ STRINGTABLE DISCARDABLE IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN_DELFROM "Original location" + IDS_SHV_COLUMN_DELDATE "Date deleted" /* special folders */ IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "My Computer" + IDS_RECYCLEBIN_FOLDER_NAME "Trash" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 5bc8e64..4463da5 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -97,6 +97,7 @@ HRESULT WINAPI UnixFolder_Constructor(IU HRESULT WINAPI UnixDosFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI FolderShortcut_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); +HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID *ppv); HRESULT WINAPI ShellFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); extern HRESULT CPanel_GetIconLocationW(LPITEMIDLIST, LPWSTR, UINT, int*); HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index d154cbe..b16be1b 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -74,6 +74,7 @@ static const struct { {&CLSID_UnixDosFolder, &UnixDosFolder_Constructor}, {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, {&CLSID_MyDocuments, &MyDocuments_Constructor}, + {&CLSID_RecycleBin, &RecycleBin_Constructor}, {NULL,NULL} }; diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3f0e1d7..ab475eb 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -33,6 +33,8 @@ #define IDS_SHV_COLUMN8 14 #define IDS_SHV_COLUMN9 15 #define IDS_SHV_COLUMN10 16 #define IDS_SHV_COLUMN11 17 +#define IDS_SHV_COLUMN_DELFROM 18 +#define IDS_SHV_COLUMN_DELDATE 19 #define IDS_DESKTOP 20 #define IDS_MYCOMPUTER 21 @@ -91,6 +93,9 @@ #define IDS_TRASHITEM_TEXT 138 #define IDS_TRASHMULTIPLE_TEXT 139 #define IDS_CANTTRASH_TEXT 140 +/* Note: this string is referenced from the registry*/ +#define IDS_RECYCLEBIN_FOLDER_NAME 8964 + /* browse for folder dialog box */ #define IDD_STATUS 0x3743 #define IDD_TITLE 0x3742 diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 0432694..d5d7fc3 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -306,3 +306,80 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) HeapFree(GetProcessHeap(), 0, unix_path); return result; } + +/* + * The item ID of a trashed element is built as follows: + * NUL byte - in most PIDLs the first byte is the type so we keep it constant + * WIN32_FIND_DATAW structure - with data about original file attributes + * bucket name - currently only an empty string meaning the home bucket is supported + * trash file name - a NUL-terminated string + */ +struct tagTRASH_ELEMENT +{ + TRASH_BUCKET *bucket; + LPSTR filename; +}; + +static HRESULT TRASH_CreateSimplePIDL(const TRASH_ELEMENT *element, const WIN32_FIND_DATAW *data, LPITEMIDLIST *pidlOut) +{ + LPITEMIDLIST pidl = SHAlloc(2+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(element->filename)+1+2); + *pidlOut = NULL; + if (pidl == NULL) + return E_OUTOFMEMORY; + pidl->mkid.cb = (USHORT)(2+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(element->filename)+1); + pidl->mkid.abID[0] = 0; + memcpy(pidl->mkid.abID+1, data, sizeof(WIN32_FIND_DATAW)); + pidl->mkid.abID[1+sizeof(WIN32_FIND_DATAW)] = 0; + lstrcpyA((LPSTR)(pidl->mkid.abID+1+sizeof(WIN32_FIND_DATAW)+1), element->filename); + *(USHORT *)(pidl->mkid.abID+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(element->filename)+1) = 0; + *pidlOut = pidl; + return S_OK; +} + +/*********************************************************************** + * TRASH_UnpackItemID [Internal] + * + * DESCRITION: + * Extract the information stored in an Item ID. The TRASH_ELEMENT + * identifies the element in the Trash. The WIN32_FIND_DATA contains the + * information about the original file. The data->ftLastAccessTime contains + * the deletion time + * + * PARAMETER(S): + * [I] id : the ID of the item + * [O] element : the trash element this item id contains. Can be NULL if not needed + * [O] data : the WIN32_FIND_DATA of the original file. Can be NULL is not needed + */ +HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DATAW *data) +{ + if (id->cb < 2+1+sizeof(WIN32_FIND_DATAW)+2) + return E_INVALIDARG; + if (id->abID[0] != 0 || id->abID[1+sizeof(WIN32_FIND_DATAW)] != 0) + return E_INVALIDARG; + if (memchr(id->abID+1+sizeof(WIN32_FIND_DATAW)+1, 0, id->cb-(2+1+sizeof(WIN32_FIND_DATAW)+1)) == NULL) + return E_INVALIDARG; + + if (data != NULL) + *data = *(WIN32_FIND_DATAW *)(id->abID+1); + if (element != NULL) + { + element->bucket = home_trash; + element->filename = StrDupA((LPCSTR)(id->abID+1+sizeof(WIN32_FIND_DATAW)+1)); + if (element->filename == NULL) + return E_OUTOFMEMORY; + } + return S_OK; +} + +void TRASH_DisposeElement(TRASH_ELEMENT *element) +{ + if (element) + SHFree(element->filename); +} + +HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +{ + *count = 0; + *pidls = SHAlloc(0); + return S_OK; +} diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index 46a8618..90f10f7 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -33,7 +33,13 @@ #define XDG_URLENCODE 0x1 BOOL XDG_WriteDesktopStringEntry(int fd, const char *keyName, DWORD dwFlags, const char *value); /* implemented in trash.c */ +typedef struct tagTRASH_ELEMENT TRASH_ELEMENT; + BOOL TRASH_CanTrashFile(LPCWSTR wszPath); BOOL TRASH_TrashFile(LPCWSTR wszPath); +HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DATAW *data); +HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count); +void TRASH_DisposeElement(TRASH_ELEMENT *element); + #endif /* ndef __XDG_H__ */

1 0

Alexandre Julliard : Make.rules: Added rules for client/proxy/ server generation from IDL files.
by Alexandre Julliard Aug. 9, 2006

Aug. 9, 2006

Module: wine Branch: refs/heads/master Commit: 4e67a4558ce74f8e71da7128efa73767a8daad64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e67a4558ce74f8e71da712… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 9 12:38:15 2006 +0200 Make.rules: Added rules for client/proxy/server generation from IDL files. --- .gitignore | 1 + Make.rules.in | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cbdb7b7..2bbaa52 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.so *.tab.[ch] *.tlb +*_[cips].c *~ /Make.rules /TAGS diff --git a/Make.rules.in b/Make.rules.in index dd38cfa..18cfd5c 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -108,7 +108,7 @@ prog_manext = 1 api_manext = 3w conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.tab.c *.tab.h @LEX_OUTPUT_ROOT(a).c core + *.flc *.res *.mc.rc *.tab.[ch] @LEX_OUTPUT_ROOT(a).c core OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) @@ -117,7 +117,7 @@ LINTS = $(C_SRCS:.c=.ln) # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .ok .sfd .ttf .man.in .man +.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -140,6 +140,18 @@ # Implicit rules .idl.h: $(WIDL) $(IDLFLAGS) -h -H $@ $< +.idl_c.c: + $(WIDL) $(IDLFLAGS) -c -C $@ $< + +.idl_i.c: + $(WIDL) $(IDLFLAGS) -u -U $@ $< + +.idl_p.c: + $(WIDL) $(IDLFLAGS) -p -P $@ $< + +.idl_s.c: + $(WIDL) $(IDLFLAGS) -s -S $@ $< + .idl.tlb: $(WIDL) $(IDLFLAGS) -t -T $@ $< @@ -221,7 +233,7 @@ # Rules for cleaning testclean:: $(SUBDIRS:%=%/__testclean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) + $(RM) $(CLEAN_FILES) $(IDL_SRCS:.idl=.h) $(IDL_SRCS:.idl=_c.c) $(IDL_SRCS:.idl=_i.c) $(IDL_SRCS:.idl=_p.c) $(IDL_SRCS:.idl=_s.c) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) .PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__) @@ -273,6 +285,11 @@ # Misc. rules $(IDL_SRCS:.idl=.h): $(WIDL) +$(IDL_SRCS:.idl=_c.c): $(WIDL) +$(IDL_SRCS:.idl=_i.c): $(WIDL) +$(IDL_SRCS:.idl=_p.c): $(WIDL) +$(IDL_SRCS:.idl=_s.c): $(WIDL) + $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) $(SUBDIRS): dummy

1 0