- fixed for FOR _NO_EXTENSIONS mode - implement ID_VIEW_SPLIT command Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h Modified: trunk/reactos/subsys/system/winefile/zh.rc _____
Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@
MENUITEM "Bara tr&õd", 411 MENUITEM "Bara &mapp", 412 MENUITEM SEPARATOR - MENUITEM "De&la", 414 + MENUITEM "De&la", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Namn", ID_VIEW_NAME MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -86,7 +86,7 @@
MENUITEM "&Jen strom" , 411 MENUITEM "Jen &adresß°e" , 412 MENUITEM SEPARATOR - MENUITEM "&Rozdýlit" , 414 + MENUITEM "&Rozdýlit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&JmÚno" , ID_VIEW_NAME MENUITEM "&Detaily vÜech soubor¨" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -85,7 +85,7 @@
MENUITEM "Nur St&ruktur" , 411 MENUITEM "Nur &Verzeichnis" , 412 MENUITEM SEPARATOR - MENUITEM "&Teilen" , 414 + MENUITEM "&Teilen" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "A&lle Dateiangaben" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -88,7 +88,7 @@
MENUITEM "Tr&ee Only" , 411 MENUITEM "Directory &Only" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&lit" , 414 + MENUITEM "Sp&lit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -84,7 +84,7 @@
MENUITEM "?rbol &s¾lo" , 411 MENUITEM "&Directorio s¾lo" , 412 MENUITEM SEPARATOR - MENUITEM "Di&vidir" , 414 + MENUITEM "Di&vidir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "No&mbre" , ID_VIEW_NAME MENUITEM "T&odos los detalles" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@
MENUITEM "&Arbre seulement" , 411 MENUITEM "&RÚpertoire seulement" , 412 MENUITEM SEPARATOR - MENUITEM "&SÚparer" , 414 + MENUITEM "&SÚparer" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nom" , ID_VIEW_NAME MENUITEM "Tous &les DÚtails" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@
MENUITEM "&K÷nyvtßrfa" , 411 MENUITEM "&Csak mappßk" , 412 MENUITEM SEPARATOR - MENUITEM "&Felosztßs" , 414 + MENUITEM "&Felosztßs" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&NÚv" , ID_VIEW_NAME MENUITEM "&Minden rÚszlet" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@
MENUITEM "So&lo Albero" , 411 MENUITEM "&Solo Directory" , 412 MENUITEM SEPARATOR - MENUITEM "Di&vidi" , 414 + MENUITEM "Di&vidi" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Mostra tutti i dettagli sui file" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -83,7 +83,7 @@
MENUITEM "&Alleen hierarchie" , 411 MENUITEM "Alleen &mapinhoud" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&litsen" , 414 + MENUITEM "Sp&litsen" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Naam" , ID_VIEW_NAME MENUITEM "&Alle details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -87,7 +87,7 @@
MENUITEM "D&rzewo" , 411 MENUITEM "&Katalogi" , 412 MENUITEM SEPARATOR - MENUITEM "&Po??cz" , 414 + MENUITEM "&Po??cz" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nazwa" , ID_VIEW_NAME MENUITEM "&Wszystkie atrybuty pliku" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -86,7 +86,7 @@
MENUITEM "S&omente ßrvore" , 411 MENUITEM "So&mente pasta" , 412 MENUITEM SEPARATOR - MENUITEM "&Dividir" , 414 + MENUITEM "&Dividir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED @@ -214,7 +214,7 @@ MENUITEM "S&omente ßrvore" , 411 MENUITEM "So&mente pasta" , 412 MENUITEM SEPARATOR - MENUITEM "&Dividir" , 414 + MENUITEM "&Dividir" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome" , ID_VIEW_NAME MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-21 16:45:50 UTC (rev 15460) @@ -53,6 +53,7 @@
#define ID_VIEW_SORT_TYPE 405 #define ID_VIEW_SORT_SIZE 406 #define ID_VIEW_SORT_DATE 407 +#define ID_VIEW_SPLIT 414 #define ID_SELECT_FONT 510 #define ID_VIEW_TOOL_BAR 508 #define ID_VIEW_DRIVE_BAR 507 _____
Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -83,7 +83,7 @@
MENUITEM "ʯٳۯ &õÕÕÔ¯" , 411 MENUITEM "ʯٳۯ &´Ó´ÛÓ" , 412 MENUITEM SEPARATOR - MENUITEM "ðÓþ&ßÞ?³" , 414 + MENUITEM "ðÓþ&ßÞ?³" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "?&ý " , ID_VIEW_NAME MENUITEM "?&±Õ ´¯õ¯ßݯ±?Þ ¯ ¶ÓÚÙÕ" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -84,7 +84,7 @@
MENUITEM "Tr&ee Only" , 411 MENUITEM "Directory &Only" , 412 MENUITEM SEPARATOR - MENUITEM "Sp&lit" , 414 + MENUITEM "Sp&lit" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Name" , ID_VIEW_NAME MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED _____
Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-21 16:45:50 UTC (rev 15460) @@ -211,7 +211,9 @@
/* globals */ WINEFILE_GLOBALS Globals;
+static int last_split;
+ /* some common string constants */ const static TCHAR sEmpty[] = {'\0'}; const static TCHAR sSpace[] = {' ', '\0'}; @@ -346,6 +348,15 @@
if (hFind != INVALID_HANDLE_VALUE) { do { +#ifdef _NO_EXTENSIONS + /* hide directory entry "." */ + if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + LPCTSTR name = w32fd.cFileName; + + if (name[0]=='.' && name[1]=='\0') + continue; + } +#endif entry = alloc_entry();
if (!first_entry) @@ -361,15 +372,7 @@ entry->scanned = FALSE; entry->level = level;
-#ifdef _NO_EXTENSIONS - /* hide directory entry "." */ - if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - LPCTSTR name = entry->data.cFileName; - - if (name[0]=='.' && name[1]=='\0') - continue; - } -#else +#ifndef _NO_EXTENSIONS entry->etype = ET_WINDOWS; entry->bhfi_valid = FALSE;
@@ -387,9 +390,10 @@ #endif
last = entry; - } while(FindNextFile(hFind, &entry->data)); + } while(FindNextFile(hFind, &w32fd));
- last->next = NULL; + if (last) + last->next = NULL;
FindClose(hFind); } @@ -568,7 +572,8 @@ last = entry; }
- last->next = NULL; + if (last) + last->next = NULL;
call_closedir(pdir); } @@ -1219,7 +1224,7 @@ len++;
if (len) { - array = (Entry**) HeapAlloc(GetProcessHeap(), 0, len*sizeof(Entry*)); + array = HeapAlloc(GetProcessHeap(), 0, len*sizeof(Entry*));
p = array; for(entry=dir->down; entry; entry=entry->next) @@ -1321,10 +1326,10 @@
static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, SORT_ORDER sortOrder, HWND hwnd) { - const static TCHAR sBackslash[] = {'\', '\0'}; #if !defined(_NO_EXTENSIONS) && defined(__WINE__) const static TCHAR sSlash[] = {'/', '\0'}; #endif + const static TCHAR sBackslash[] = {'\', '\0'};
#ifdef _SHELL_FOLDERS if (pidl) @@ -3397,7 +3402,9 @@ static void create_drive_bar() { TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}; +#ifndef _NO_EXTENSIONS TCHAR b1[BUFFER_LEN]; +#endif int btn = 1; PTSTR p;
@@ -3755,8 +3762,6 @@
LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { - static int last_split; - ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA); ASSERT(child);
@@ -3995,6 +4000,14 @@ set_sort_order(child, SORT_DATE); break;
+ case ID_VIEW_SPLIT: { + last_split = child->split_pos; +#ifdef _NO_EXTENSIONS + draw_splitbar(hwnd, last_split); +#endif + SetCapture(hwnd); + break;} + default: return pane_command(pane, LOWORD(wparam)); } @@ -4244,7 +4257,6 @@ TCHAR path[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; - TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0};
CLIENTCREATESTRUCT ccs;
_____
Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-05-21 16:45:50 UTC (rev 15460) @@ -50,12 +50,11 @@
#include <malloc.h> /* for alloca() */ #endif
+#include <shellapi.h> /* for ShellExecute() */ +#include <shlobj.h> /* for SHFormatDrive() */ + #ifndef _NO_EXTENSIONS #define _SHELL_FOLDERS - -#include <objbase.h> -#include <shellapi.h> -#include <shlobj.h> #endif /* _NO_EXTENSIONS */
#ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED _____
Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-21 16:33:23 UTC (rev 15459) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-21 16:45:50 UTC (rev 15460) @@ -84,7 +84,7 @@
MENUITEM "¢÷¤È?¥?????¸ú¿&Eú®" , 411 MENUITEM "¢÷¤È?¥???????¦ú¿&Oú®" , 412 MENUITEM SEPARATOR - MENUITEM "ÀÍ©¯ú¿&Lú®" , 414 + MENUITEM "ÀÍ©¯ú¿&Lú®" , ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "?????¹?¹ú¿&Nú®" , ID_VIEW_NAME MENUITEM "????¤Û¤ñ?ð?Ýú¿&Aú®" , ID_VIEW_ALL_ATTRIBUTES, CHECKED