Wine-20050111 vendor drop Added: vendor/wine/dlls/shell32/Wine-20050111/ Modified: vendor/wine/dlls/shell32/Wine-20050111/autocomplete.c Modified: vendor/wine/dlls/shell32/Wine-20050111/brsfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050111/changenotify.c Modified: vendor/wine/dlls/shell32/Wine-20050111/cpanelfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050111/enumidlist.c Modified: vendor/wine/dlls/shell32/Wine-20050111/folders.c Modified: vendor/wine/dlls/shell32/Wine-20050111/iconcache.c Modified: vendor/wine/dlls/shell32/Wine-20050111/pidl.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32.spec Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ca.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cn.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cs.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Da.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_De.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_En.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Eo.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Es.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fi.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fr.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Hu.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_It.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ja.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ko.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Nl.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_No.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pl.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pt.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ru.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Si.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sk.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sv.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Uk.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Wa.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Zh.rc Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_main.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shelllink.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shellole.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shellord.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shellreg.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shfldr_mycomp.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlexec.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlfileop.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlfsbind.c Modified: vendor/wine/dlls/shell32/Wine-20050111/shlview.c Modified: vendor/wine/dlls/shell32/Wine-20050111/systray.c Modified: vendor/wine/dlls/shell32/Wine-20050111/undocshell.h Modified: vendor/wine/dlls/shell32/Wine-20050111/version.h Modified: vendor/wine/dlls/shell32/current/autocomplete.c Modified: vendor/wine/dlls/shell32/current/brsfolder.c Modified: vendor/wine/dlls/shell32/current/changenotify.c Modified: vendor/wine/dlls/shell32/current/cpanelfolder.c Modified: vendor/wine/dlls/shell32/current/enumidlist.c Modified: vendor/wine/dlls/shell32/current/folders.c Modified: vendor/wine/dlls/shell32/current/iconcache.c Modified: vendor/wine/dlls/shell32/current/pidl.c Modified: vendor/wine/dlls/shell32/current/shell32.spec Modified: vendor/wine/dlls/shell32/current/shell32_Ca.rc Modified: vendor/wine/dlls/shell32/current/shell32_Cn.rc Modified: vendor/wine/dlls/shell32/current/shell32_Cs.rc Modified: vendor/wine/dlls/shell32/current/shell32_Da.rc Modified: vendor/wine/dlls/shell32/current/shell32_De.rc Modified: vendor/wine/dlls/shell32/current/shell32_En.rc Modified: vendor/wine/dlls/shell32/current/shell32_Eo.rc Modified: vendor/wine/dlls/shell32/current/shell32_Es.rc Modified: vendor/wine/dlls/shell32/current/shell32_Fi.rc Modified: vendor/wine/dlls/shell32/current/shell32_Fr.rc Modified: vendor/wine/dlls/shell32/current/shell32_Hu.rc Modified: vendor/wine/dlls/shell32/current/shell32_It.rc Modified: vendor/wine/dlls/shell32/current/shell32_Ja.rc Modified: vendor/wine/dlls/shell32/current/shell32_Ko.rc Modified: vendor/wine/dlls/shell32/current/shell32_Nl.rc Modified: vendor/wine/dlls/shell32/current/shell32_No.rc Modified: vendor/wine/dlls/shell32/current/shell32_Pl.rc Modified: vendor/wine/dlls/shell32/current/shell32_Pt.rc Modified: vendor/wine/dlls/shell32/current/shell32_Ru.rc Modified: vendor/wine/dlls/shell32/current/shell32_Si.rc Modified: vendor/wine/dlls/shell32/current/shell32_Sk.rc Modified: vendor/wine/dlls/shell32/current/shell32_Sv.rc Modified: vendor/wine/dlls/shell32/current/shell32_Uk.rc Modified: vendor/wine/dlls/shell32/current/shell32_Wa.rc Modified: vendor/wine/dlls/shell32/current/shell32_Zh.rc Modified: vendor/wine/dlls/shell32/current/shell32_main.c Modified: vendor/wine/dlls/shell32/current/shelllink.c Modified: vendor/wine/dlls/shell32/current/shellole.c Modified: vendor/wine/dlls/shell32/current/shellord.c Modified: vendor/wine/dlls/shell32/current/shellreg.c Modified: vendor/wine/dlls/shell32/current/shfldr_mycomp.c Modified: vendor/wine/dlls/shell32/current/shlexec.c Modified: vendor/wine/dlls/shell32/current/shlfileop.c Modified: vendor/wine/dlls/shell32/current/shlfolder.c Modified: vendor/wine/dlls/shell32/current/shlfsbind.c Modified: vendor/wine/dlls/shell32/current/shlview.c Modified: vendor/wine/dlls/shell32/current/systray.c Modified: vendor/wine/dlls/shell32/current/undocshell.h Modified: vendor/wine/dlls/shell32/current/version.h _____
Copied: vendor/wine/dlls/shell32/Wine-20050111 (from rev 12927, vendor/wine/dlls/shell32/current) _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/autocomplete.c --- vendor/wine/dlls/shell32/current/autocomplete.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/autocomplete.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -187,10 +187,8 @@
if (!--(This->ref)) { TRACE(" destroying IAutoComplete(%p)\n",This); - if (This->quickComplete) - HeapFree(GetProcessHeap(), 0, This->quickComplete); - if (This->txtbackup) - HeapFree(GetProcessHeap(), 0, This->txtbackup); + HeapFree(GetProcessHeap(), 0, This->quickComplete); + HeapFree(GetProcessHeap(), 0, This->txtbackup); if (This->hwndListBox) DestroyWindow(This->hwndListBox); if (This->enumstr) _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/brsfolder.c --- vendor/wine/dlls/shell32/current/brsfolder.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/brsfolder.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -330,7 +330,10 @@
if (SUCCEEDED(IShellFolder_BindToObject(lptvid->lpsfParent, lptvid->lpi,0,(REFIID)&IID_IShellFolder,(LPVOID *)&lpsf2))) { FillTreeView( lpsf2, lptvid->lpifq, pnmtv->itemNew.hItem, lptvid->pEnumIL); } - TreeView_SortChildren(hwndTreeView, pnmtv->itemNew.hItem, FALSE); + /* My Computer is already sorted and trying to do a simple text + * sort will only mess things up */ + if (!_ILIsMyComputer(lptvid->lpi)) + TreeView_SortChildren(hwndTreeView, pnmtv->itemNew.hItem, FALSE); } break; case TVN_SELCHANGEDA: @@ -491,10 +494,7 @@ WideCharToMultiByte(CP_ACP, 0, bi.pszDisplayName, -1, lpbi->pszDisplayName, MAX_PATH, 0, NULL); HeapFree(GetProcessHeap(), 0, bi.pszDisplayName); } - if (bi.lpszTitle) - { - HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); - } + HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); lpbi->iImage = bi.iImage; return lpid; } _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/changenotify.c --- vendor/wine/dlls/shell32/current/changenotify.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/changenotify.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -27,9 +27,7 @@
#include "winbase.h" #include "wine/debug.h" #include "wingdi.h" -#include "pidl.h" #include "shell32_main.h" -#include "undocshell.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/cpanelfolder.c --- vendor/wine/dlls/shell32/current/cpanelfolder.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/cpanelfolder.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -47,7 +47,6 @@
#include "shell32_main.h" #include "shresdef.h" #include "shlwapi.h" -#include "shellfolder.h" #include "wine/debug.h" #include "debughlp.h" #include "shfldr.h" _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/enumidlist.c --- vendor/wine/dlls/shell32/current/enumidlist.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/enumidlist.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -28,13 +28,9 @@
#include "windef.h" #include "winbase.h" #include "winreg.h" -#include "undocshell.h" #include "shlwapi.h" -#include "winerror.h" -#include "objbase.h"
#include "pidl.h" -#include "shlguid.h" #include "enumidlist.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/folders.c --- vendor/wine/dlls/shell32/current/folders.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/folders.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -34,10 +34,8 @@
#include "undocshell.h" #include "shlguid.h" #include "winreg.h" -#include "shlwapi.h"
#include "wine/debug.h" -#include "wine/unicode.h"
#include "pidl.h" #include "shell32_main.h" _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/iconcache.c --- vendor/wine/dlls/shell32/current/iconcache.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/iconcache.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -43,7 +43,6 @@
#include "pidl.h" #include "shell32_main.h" #include "undocshell.h" -#include "shlwapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
@@ -403,15 +402,6 @@ }
/*********************************************************************** ** - * ExtractIconEx [SHELL32.@] - */ -UINT WINAPI ExtractIconExAW(LPCVOID lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons) -{ if (SHELL_OsIsUnicode()) - return ExtractIconExW ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); - return ExtractIconExA ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); -} - -/********************************************************************** *** * ExtractIconExW [SHELL32.@] * RETURNS * 0 no icon found @@ -430,15 +420,18 @@ */ UINT WINAPI ExtractIconExA(LPCSTR lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons) { - UINT ret; + UINT ret = 0; INT len = MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
TRACE("%s %i %p %p %i\n", lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
- MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); - ret = ExtractIconExW (lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIcons); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + if (lpwstrFile) + { + MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); + ret = ExtractIconExW(lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIcons); + HeapFree(GetProcessHeap(), 0, lpwstrFile); + } return ret; }
@@ -450,43 +443,55 @@ */ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lpiIcon) { - HICON hIcon; - WORD wDummyIcon = 0; - - TRACE("\n"); + HICON hIcon = NULL; + INT len = MultiByteToWideChar(CP_ACP, 0, lpIconPath, -1, NULL, 0); + LPWSTR lpIconPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
- if(lpiIcon == NULL) - lpiIcon = &wDummyIcon; + TRACE("%p %s %p\n", hInst, debugstr_a(lpIconPath), lpiIcon);
- hIcon = ExtractIconA(hInst, lpIconPath, *lpiIcon); + if (lpIconPathW) + { + MultiByteToWideChar(CP_ACP, 0, lpIconPath, -1, lpIconPathW, len); + hIcon = ExtractAssociatedIconW(hInst, lpIconPathW, lpiIcon); + HeapFree(GetProcessHeap(), 0, lpIconPathW); + } + return hIcon; +}
- if( hIcon < (HICON)2 ) - { if( hIcon == (HICON)1 ) /* no icons found in given file */ - { char tempPath[0x80]; - HINSTANCE uRet = FindExecutableA(lpIconPath,NULL,tempPath); +HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD lpiIcon) +{ + HICON hIcon = NULL; + WORD wDummyIcon = 0;
- if( uRet > (HINSTANCE)32 && tempPath[0] ) - { strcpy(lpIconPath,tempPath); - hIcon = ExtractIconA(hInst, lpIconPath, *lpiIcon); - if( hIcon > (HICON)2 ) - return hIcon; - } - else hIcon = 0; - } + TRACE("%p %s %p\n", hInst, debugstr_w(lpIconPath), lpiIcon);
- if( hIcon == (HICON)1 ) - *lpiIcon = 2; /* MSDOS icon - we found .exe but no icons in it */ - else - *lpiIcon = 6; /* generic icon - found nothing */ + if(lpiIcon == NULL) + lpiIcon = &wDummyIcon;
- if (GetModuleFileNameA(hInst, lpIconPath, 0x80)) - { - /* terminate string (GetModuleFileName doesn't do if buffer is too small) */ - lpIconPath[0x80 - 1] = '\0'; - hIcon = LoadIconA( hInst, MAKEINTRESOURCEA(*lpiIcon)); - } - } - return hIcon; + hIcon = ExtractIconW(hInst, lpIconPath, *lpiIcon); + + if( hIcon < (HICON)2 ) + { if( hIcon == (HICON)1 ) /* no icons found in given file */ + { WCHAR tempPath[MAX_PATH]; + HINSTANCE uRet = FindExecutableW(lpIconPath,NULL,tempPath); + + if( uRet > (HINSTANCE)32 && tempPath[0] ) + { lstrcpyW(lpIconPath,tempPath); + hIcon = ExtractIconW(hInst, lpIconPath, *lpiIcon); + if( hIcon > (HICON)2 ) + return hIcon; + } + } + + if( hIcon == (HICON)1 ) + *lpiIcon = 2; /* MSDOS icon - we found .exe but no icons in it */ + else + *lpiIcon = 6; /* generic icon - found nothing */ + + if (GetModuleFileNameW(hInst, lpIconPath, MAX_PATH)) + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(*lpiIcon)); + } + return hIcon; }
/*********************************************************************** ** _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/pidl.c --- vendor/wine/dlls/shell32/current/pidl.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/pidl.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -47,7 +47,6 @@
#include "shlwapi.h"
#include "pidl.h" -#include "debughlp.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(pidl); @@ -1058,7 +1057,7 @@
_ILParsePathW(wPath, NULL, TRUE, &pidl, NULL);
- if (wPath) HeapFree(GetProcessHeap(), 0, wPath); + HeapFree(GetProcessHeap(), 0, wPath); TRACE("%s %p\n", debugstr_a(lpszPath), pidl); return pidl; } @@ -1366,18 +1365,6 @@ }
/*********************************************************************** ** - * SHGetPathFromIDList [SHELL32.@][NT 4.0: SHELL32.219] - */ -BOOL WINAPI SHGetPathFromIDListAW(LPCITEMIDLIST pidl,LPVOID pszPath) -{ - TRACE_(shell)("(pidl=%p,%p)\n",pidl,pszPath); - - if (SHELL_OsIsUnicode()) - return SHGetPathFromIDListW(pidl,pszPath); - return SHGetPathFromIDListA(pidl,pszPath); -} - -/********************************************************************** *** * SHBindToParent [shell version 5.0] */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32.spec --- vendor/wine/dlls/shell32/current/shell32.spec 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32.spec 2005-01-12 19:26:53 UTC (rev 12979) @@ -169,9 +169,9 @@
175 stdcall SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW 176 stdcall SHSetInstanceExplorer (long) 177 stub DAD_SetDragImageFromListView - 178 stub SHObjectProperties - 179 stub SHGetNewLinkInfoA - 180 stub SHGetNewLinkInfoW + 178 stdcall SHObjectProperties(long long wstr wstr) + 179 stdcall SHGetNewLinkInfoA(str str ptr long long) + 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall RegisterShellHook(long long) 182 varargs ShellMessageBoxW(long long long str long) 183 varargs ShellMessageBoxA(long long long str long) @@ -182,9 +182,9 @@ 188 stdcall ShellDDEInit(long) 189 stdcall ILCreateFromPathA(str) 190 stdcall ILCreateFromPathW(wstr) - 191 stub SHUpdateImageA + 191 stdcall SHUpdateImageA(str long long long) 192 stdcall SHUpdateImageW(wstr long long long) - 193 stub SHHandleUpdateImage + 193 stdcall SHHandleUpdateImage(ptr) 194 stub SHCreatePropSheetExtArrayEx 195 stdcall SHFree(ptr) 196 stdcall SHAlloc(long) @@ -206,7 +206,7 @@ 212 stub Printers_AddPrinterPropPages 213 stub Printers_RegisterWindowW 214 stub Printers_UnregisterWindow - 215 stub SHStartNetConnectionDialog + 215 stdcall SHStartNetConnectionDialog(long str long) 243 stdcall @(long long) shell32_243 244 stdcall SHInitRestricted(ptr ptr) 247 stdcall SHGetDataFromIDListA (ptr ptr long ptr long) @@ -235,15 +235,15 @@ 288 stdcall ShellAboutA(long str str long) 289 stdcall ShellAboutW(long wstr wstr long) 290 stdcall ShellExecuteA(long str str str str long) - 291 stdcall ShellExecuteEx (long) ShellExecuteExAW + 291 stdcall ShellExecuteEx (long) ShellExecuteExA 292 stdcall ShellExecuteExA (long) 293 stdcall ShellExecuteExW (long) 294 stdcall ShellExecuteW (long wstr wstr wstr wstr long) 296 stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA 297 stdcall Shell_NotifyIconA(long ptr) 298 stdcall Shell_NotifyIconW(long ptr) - 299 stub Shl1632_ThunkData32 - 300 stub Shl3216_ThunkData32 +#299 stub Shl1632_ThunkData32 +#300 stub Shl3216_ThunkData32 301 stdcall StrChrA(str long) shlwapi.StrChrA 302 stdcall StrChrIA(str long) shlwapi.StrChrIA 303 stdcall StrChrIW(wstr long) shlwapi.StrChrIW @@ -338,12 +338,12 @@ @ stdcall DoEnvironmentSubstW(wstr wstr) @ stub DragQueryFileAorW @ stdcall DuplicateIcon(long long) -@ stdcall ExtractAssociatedIconA(long ptr long) +@ stdcall ExtractAssociatedIconA(long str ptr) @ stdcall ExtractAssociatedIconExA(long str long long) @ stdcall ExtractAssociatedIconExW(long wstr long long) -@ stub ExtractAssociatedIconW +@ stdcall ExtractAssociatedIconW(long wstr ptr) @ stdcall ExtractIconA(long str long) -@ stdcall ExtractIconEx(ptr long ptr ptr long)ExtractIconExAW +@ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA @ stdcall ExtractIconExA(str long ptr ptr long) @ stdcall ExtractIconExW(wstr long ptr ptr long) @ stdcall ExtractIconW(long wstr long) @@ -376,21 +376,21 @@ @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @ stub ShellHookProc -@ stub SHEmptyRecycleBinA -@ stub SHEmptyRecycleBinW -@ stdcall SHFileOperation(ptr)SHFileOperationAW +@ stdcall SHEmptyRecycleBinA(long str long) +@ stdcall SHEmptyRecycleBinW(long wstr long) +@ stdcall SHFileOperation(ptr) SHFileOperationA @ stdcall SHFileOperationA(ptr) @ stdcall SHFileOperationW(ptr) -@ stub SHFormatDrive +@ stdcall SHFormatDrive(long long long long) @ stdcall SHFreeNameMappings(ptr) @ stdcall SHGetDesktopFolder(ptr) -@ stdcall SHGetFileInfo(ptr long ptr long long)SHGetFileInfoAW +@ stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA @ stdcall SHGetFileInfoA(ptr long ptr long long) @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetInstanceExplorer(long) @ stdcall SHGetMalloc(ptr) -@ stub SHGetNewLinkInfo -@ stdcall SHGetPathFromIDList(ptr ptr)SHGetPathFromIDListAW +@ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA +@ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA @ stdcall SHGetPathFromIDListA(ptr ptr) @ stdcall SHGetPathFromIDListW(ptr ptr) @ stdcall SHGetSettings(ptr long) @@ -399,8 +399,8 @@ @ stub SHHelpShortcuts_RunDLLA @ stub SHHelpShortcuts_RunDLLW @ stdcall SHLoadInProc(long) -@ stub SHQueryRecycleBinA -@ stub SHQueryRecycleBinW +@ stdcall SHQueryRecycleBinA(str ptr) +@ stdcall SHQueryRecycleBinW(wstr ptr) @ stub SHUpdateRecycleBinIcon @ stub WOWShellExecute
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ca.rc --- vendor/wine/dlls/shell32/current/shell32_Ca.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ca.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Quant a %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "D'Acord", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "D'Acord", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine ha estat construit per:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cn.rc --- vendor/wine/dlls/shell32/current/shell32_Cn.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Cn.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -24,10 +24,11 @@
CAPTION "¹ØÓÚ %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "È·¶¨", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "È·¶¨", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Cs.rc --- vendor/wine/dlls/shell32/current/shell32_Cs.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Cs.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@
CAPTION "O aplikaci %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine je d¡lem:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Da.rc --- vendor/wine/dlls/shell32/current/shell32_Da.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Da.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine havde ikke været mulig uden hjælp fra disse personer:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_De.rc --- vendor/wine/dlls/shell32/current/shell32_De.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_De.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@
CAPTION "Informationen über %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "WINE wurde für Sie gekeltert von:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_En.rc --- vendor/wine/dlls/shell32/current/shell32_En.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_En.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -109,10 +109,11 @@
CAPTION "About %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Eo.rc --- vendor/wine/dlls/shell32/current/shell32_Eo.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Eo.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Pri %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Enorde", 1, 153, 130, 50, 12 + DEFPUSHBUTTON "Enorde", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Es.rc --- vendor/wine/dlls/shell32/current/shell32_Es.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Es.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@
CAPTION "Acerca de %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Aceptar", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine está disponible gracias a:", 98, 8, 55, 137, 10 }
@@ -187,3 +188,35 @@ IDS_SHUTDOWN_TITLE "Apagar" IDS_SHUTDOWN_PROMPT "¿Desea terminar su sesión Wine?" } + +/* shell folder path default values */ +STRINGTABLE DISCARDABLE +{ + IDS_PROGRAMS "Menú Inicio\Programas" + IDS_PERSONAL "Mis documentos" + IDS_FAVORITES "Favoritos" + IDS_STARTUP "Menú Inicio\Programas\Inicio" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Menú Inicio" + IDS_MYMUSIC "Mis documentos\Mi música" + IDS_MYVIDEO "Mis documentos\Mis vídeos" + IDS_DESKTOPDIRECTORY "Escritorio" + IDS_NETHOOD "Entorno de red" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Configuración local\Datos de programa" + IDS_INTERNET_CACHE "Archivos temporales de Internet" + IDS_COOKIES "Cookies" + IDS_HISTORY "Historial" + IDS_PROGRAM_FILES "Archivos de programa" + IDS_MYPICTURES "Mis documentos\Mis imágenes" + IDS_PROGRAM_FILES_COMMON "Archivos de programa\Archivos comunes" + IDS_COMMON_DOCUMENTS "Documentos" + IDS_ADMINTOOLS "Menú Inicio\Programas\Accesorios\Herramientas del sistema" + IDS_COMMON_MUSIC "Documentos\Mi música" + IDS_COMMON_PICTURES "Documentos\Mis imágenes" + IDS_COMMON_VIDEO "Documentos\Mis vídeos" + IDS_CDBURN_AREA "Configuración local\Datos de programa\Microsoft\CD Burning" +} _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fi.rc --- vendor/wine/dlls/shell32/current/shell32_Fi.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Fi.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Tietoja: %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine:n tekijät:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Fr.rc --- vendor/wine/dlls/shell32/current/shell32_Fr.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Fr.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -112,10 +112,11 @@
CAPTION "À propos de %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine est une réalisation de :", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Hu.rc --- vendor/wine/dlls/shell32/current/shell32_Hu.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Hu.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "A %s-rõl" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "A WINE-t írták:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_It.rc --- vendor/wine/dlls/shell32/current/shell32_It.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_It.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@
CAPTION "Informazioni su %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine è disponibile grazie a:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ja.rc --- vendor/wine/dlls/shell32/current/shell32_Ja.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ja.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -103,10 +103,11 @@
CAPTION "%s ,É,Â,¢,Ä" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ko.rc --- vendor/wine/dlls/shell32/current/shell32_Ko.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ko.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "%s¿¡ °üÇÏ¿©" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "È®ÀÎ", 1, 153, 130, 50, 12 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Nl.rc --- vendor/wine/dlls/shell32/current/shell32_Nl.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Nl.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Info %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine is geschreven door:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_No.rc --- vendor/wine/dlls/shell32/current/shell32_No.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_No.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pl.rc --- vendor/wine/dlls/shell32/current/shell32_Pl.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Pl.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@
CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Mo¿esz korzystaæ z Wine'a dziêki:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Pt.rc --- vendor/wine/dlls/shell32/current/shell32_Pt.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Pt.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -110,10 +110,11 @@
CAPTION "Sobre %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine foi disponibilizado por:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Ru.rc --- vendor/wine/dlls/shell32/current/shell32_Ru.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Ru.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Î %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Ðàçðàáîò÷èêè Wine:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Si.rc --- vendor/wine/dlls/shell32/current/shell32_Si.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Si.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "V redu", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "V redu", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine so ustvarili:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sk.rc --- vendor/wine/dlls/shell32/current/shell32_Sk.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Sk.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "O programe %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Víno pre vás pripravili:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Sv.rc --- vendor/wine/dlls/shell32/current/shell32_Sv.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Sv.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -23,10 +23,11 @@
CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine hade inte varit möjligt utan dessa personer:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Uk.rc --- vendor/wine/dlls/shell32/current/shell32_Uk.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Uk.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -109,10 +109,11 @@
CAPTION "Ïðî %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Ðîçðîáíèêè Wine:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Wa.rc --- vendor/wine/dlls/shell32/current/shell32_Wa.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Wa.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -28,10 +28,11 @@
CAPTION "Å dfait di %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "I Va", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "I Va", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Wine a estu fwait par:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_Zh.rc --- vendor/wine/dlls/shell32/current/shell32_Zh.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_Zh.rc 2005-01-12 19:26:53 UTC (rev 12979) @@ -24,10 +24,10 @@
CAPTION "êPì¶ %s" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "´_¶¨", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "´_¶¨", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 174, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 35, 10, 137, 10 LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 }
_____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shell32_main.c --- vendor/wine/dlls/shell32/current/shell32_main.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shell32_main.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -543,21 +543,6 @@
}
/*********************************************************************** ** - * SHGetFileInfo [SHELL32.@] - */ -DWORD WINAPI SHGetFileInfoAW( - LPCVOID path, - DWORD dwFileAttributes, - LPVOID psfi, - UINT sizeofpsfi, - UINT flags) -{ - if(SHELL_OsIsUnicode()) - return SHGetFileInfoW(path, dwFileAttributes, psfi, sizeofpsfi, flags ); - return SHGetFileInfoA(path, dwFileAttributes, psfi, sizeofpsfi, flags ); -} - -/********************************************************************** *** * DuplicateIcon [SHELL32.@] */ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon) @@ -631,7 +616,8 @@ HFONT hFont; } ABOUT_INFO;
-#define IDC_STATIC_TEXT 100 +#define IDC_STATIC_TEXT1 100 +#define IDC_STATIC_TEXT2 101 #define IDC_LISTBOX 99 #define IDC_WINE_TEXT 98
@@ -754,7 +740,8 @@ GetWindowTextW( hWnd, Template, sizeof(Template)/sizeof(WCHAR) ); sprintfW( AppTitle, Template, info->szApp ); SetWindowTextW( hWnd, AppTitle ); - SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT), info->szOtherStuff ); + SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT1), info->szApp ); + SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT2), info->szOtherStuff ); hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX); SendMessageW( hWndCtl, WM_SETREDRAW, 0, 0 ); SendMessageW( hWndCtl, WM_SETFONT, (WPARAM)info->hFont, 0 ); @@ -825,8 +812,8 @@
ret = ShellAboutW(hWnd, appW, otherW, hIcon);
- if (otherW) HeapFree(GetProcessHeap(), 0, otherW); - if (appW) HeapFree(GetProcessHeap(), 0, appW); + HeapFree(GetProcessHeap(), 0, otherW); + HeapFree(GetProcessHeap(), 0, appW); return ret; }
@@ -842,10 +829,12 @@ HRSRC hRes; LPVOID template; BOOL bRet; + static const WCHAR wszSHELL_ABOUT_MSGBOX[] = + {'S','H','E','L','L','_','A','B','O','U','T','_','M','S','G','B','O','X' ,0};
TRACE("\n");
- if(!(hRes = FindResourceA(shell32_hInstance, "SHELL_ABOUT_MSGBOX", (LPSTR)RT_DIALOG))) + if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) return FALSE; if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) return FALSE; _____
Modified: vendor/wine/dlls/shell32/Wine-20050111/shelllink.c --- vendor/wine/dlls/shell32/current/shelllink.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/shell32/Wine-20050111/shelllink.c 2005-01-12 19:26:53 UTC (rev 12979) @@ -993,21 +993,12 @@
TRACE("-- destroying IShellLink(%p)\n",This);
- if (This->sIcoPath) - HeapFree(GetProcessHeap(), 0, This->sIcoPath); + HeapFree(GetProcessHeap(), 0, This->sIcoPath); + HeapFree(GetProcessHeap(), 0, This->sArgs); + HeapFree(GetProcessHeap(), 0, This->sWorkDir); + HeapFree(GetProcessHeap(), 0, This->sDescription); + HeapFree(GetProcessHeap(),0,This->sPath);
- if (This->sArgs) - HeapFree(GetProcessHeap(), 0, This->sArgs); - - if (This->sWorkDir) - HeapFree(GetProcessHeap(), 0, This->sWorkDir); - - if (This->sDescription) [truncated at 1000 lines; 1893 more skipped]
-
gvg＠svn.reactos.com