From cfda712e3ac8f8a9dcddbbb5bd031bd9537cf522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Sat, 8 Oct 2005 17:41:41 +0000 Subject: [PATCH] =?UTF-8?q?Sync=20to=20Wine-20050930:=20Michael=20Jung=20=20-=20Don't=20clone=20pidlLast=20in?= =?UTF-8?q?=20SHBindToParent.=20-=20Pass=20correct=20pointer=20to=20SHFree?= =?UTF-8?q?=20in=20case=20of=20failure=20in=20=20=20UNIXFS=5Fpath=5Fto=5Fp?= =?UTF-8?q?idl.=20-=20Return=20E=5FFAIL=20if=20we=20can't=20get=20the=20un?= =?UTF-8?q?ix=20path=20in=20=20=20IPersistFolder3::InitializeEx.=20-=20Ret?= =?UTF-8?q?urn=20E=5FNOAGGREGATION=20if=20non-NULL=20pUnkOuter=20is=20give?= =?UTF-8?q?n=20to=20the=20=20=20constructor.=20Alexandre=20Julliard=20=20-=20We=20are=20no=20longer=20generating=20.?= =?UTF-8?q?spec.c=20files.=20-=20Generate=2016-bit=20spec=20files=20as=20a?= =?UTF-8?q?ssembly=20code=20too.=20-=20Use=20a=20more=20portable=20scheme?= =?UTF-8?q?=20for=20storing=20the=20name=20of=20a=20critical=20=20=20secti?= =?UTF-8?q?on.=20-=20Removed=20unused=20debug=20channels.=20-=20Specify=20?= =?UTF-8?q?64-bit=20integers=20as=20double=20instead=20of=20long=20long=20?= =?UTF-8?q?in=20spec=20files=20=20=20so=20that=20we=20get=20the=20correct?= =?UTF-8?q?=20number=20of=20arguments.=20-=20We=20are=20no=20longer=20gene?= =?UTF-8?q?rating=20.dbg.c=20files.=20Milko=20Krachounov=20=20-=20Bulgarian=20resources=20for=20mpr,=20msi,=20user,=20com?= =?UTF-8?q?mdlg,=20oleaut32,=20shdocvw,=20=20=20shell32,=20comctl32,=20msr?= =?UTF-8?q?le32,=20mshtml,=20winspool,=20wineps,=20serialui,=20=20=20setup?= =?UTF-8?q?api,=20wininet,=20regedit,=20uninstaller,=20notepad,=20winecfg?= =?UTF-8?q?=20and=20=20=20winhelp.=20Kevin=20Koltzau=20=20?= =?UTF-8?q?-=20Fix=20warnings=20in=2064bit.=20Dmitry=20Timoshkov=20=20-=20Stop=20using=20a=20not=20initialized=20?= =?UTF-8?q?variable=20szTemp=20in=20=20=20=5Fdbg=5FILSimpleGetText,=20make?= =?UTF-8?q?=20=5Fdbg=5FILSimpleGetText=20return=20no=20value=20since=20=20?= =?UTF-8?q?=20nobody=20is=20using=20it.=20-=20Stop=20dereferencing=20a=20p?= =?UTF-8?q?ossible=20NULL=20in=20pdump=20since=20=20=20=5Fdbg=5FILGetDataP?= =?UTF-8?q?ointer=20can=20potentially=20return=20NULL=20(for=20instance=20?= =?UTF-8?q?for=20=20=20root=20or=20desktop=20pidl).=20-=20Make=20shdebugst?= =?UTF-8?q?r=5Fguid=20use=20standard=20wine=5Fdbg=5Fsprintf=20instead=20of?= =?UTF-8?q?=20the=20=20=20handmade=20solution.=20-=20Translate=20file=20na?= =?UTF-8?q?me=20from=20unix=20to=20ANSI=20encoding=20in=20=20=20UnixFolder?= =?UTF-8?q?=5FIShellFolder2=5FGetDisplayNameOf.=20-=20Pass=20a=20locally?= =?UTF-8?q?=20modified=20version=20of=20SHELLEXECUTEINFO=20to=20=20=20IShe?= =?UTF-8?q?llExecuteHookW=5FExecute,=20this=20should=20pass=20through=20at?= =?UTF-8?q?=20least=20=20=20sei=5Ftmp.nShow=20retrieved=20from=20an=20.lnk?= =?UTF-8?q?=20file=20(fStartup).=20Alexander=20N.=20S=C3=B8rnes=20=20-=20Added=20Norwegian=20translation=20of=20?= =?UTF-8?q?comctl32=20and=20shell32.=20Kimmo=20Myllyvirta=20=20-=20Update=20Finnish=20resources.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=18348 --- reactos/lib/shell32/Makefile.in | 4 +- reactos/lib/shell32/brsfolder.c | 2 +- reactos/lib/shell32/changenotify.c | 2 +- reactos/lib/shell32/control.c | 4 +- reactos/lib/shell32/dde.c | 6 +- reactos/lib/shell32/debughlp.c | 34 ++--- reactos/lib/shell32/iconcache.c | 2 +- reactos/lib/shell32/pidl.c | 48 +++---- reactos/lib/shell32/shell.c | 1 - reactos/lib/shell32/shell32.spec | 4 +- reactos/lib/shell32/shell32_Bg.rc | 205 +++++++++++++++++++++++++++ reactos/lib/shell32/shell32_Fi.rc | 172 +++++++++++++++++++++- reactos/lib/shell32/shell32_No.rc | 172 +++++++++++++++++++++- reactos/lib/shell32/shell32_main.c | 19 +-- reactos/lib/shell32/shelllink.c | 2 +- reactos/lib/shell32/shellord.c | 27 ++-- reactos/lib/shell32/shellpath.c | 2 +- reactos/lib/shell32/shlexec.c | 8 +- reactos/lib/shell32/shlmenu.c | 6 +- reactos/lib/shell32/shres.rc | 1 + reactos/lib/shell32/shv_bg_cmenu.c | 2 +- reactos/lib/shell32/shv_item_cmenu.c | 2 +- 22 files changed, 609 insertions(+), 116 deletions(-) create mode 100644 reactos/lib/shell32/shell32_Bg.rc diff --git a/reactos/lib/shell32/Makefile.in b/reactos/lib/shell32/Makefile.in index fa528fcd208..e7700d47f05 100644 --- a/reactos/lib/shell32/Makefile.in +++ b/reactos/lib/shell32/Makefile.in @@ -81,8 +81,8 @@ SUBDIRS = tests version16.res: version16.rc $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc -shell.spec.c: shell.spec version16.res - $(WINEBUILD) $(DEFS) $(DLLFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec +shell.spec.o: shell.spec version16.res + $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec authors.c: $(TOPSRCDIR)/AUTHORS (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ diff --git a/reactos/lib/shell32/brsfolder.c b/reactos/lib/shell32/brsfolder.c index 85fd2d0c661..919fa92d293 100644 --- a/reactos/lib/shell32/brsfolder.c +++ b/reactos/lib/shell32/brsfolder.c @@ -316,7 +316,7 @@ static void FillTreeView( browse_info *info, IShellFolder * lpsf, HRESULT hr; HWND hwnd = GetParent( info->hwndTreeView ); - TRACE("%p %p %x %p\n",lpsf, pidl, (INT)hParent, lpe); + TRACE("%p %p %p %p\n",lpsf, pidl, hParent, lpe); /* No IEnumIDList -> No children */ if (!lpe) return; diff --git a/reactos/lib/shell32/changenotify.c b/reactos/lib/shell32/changenotify.c index 36a699849b7..f231a5381ed 100644 --- a/reactos/lib/shell32/changenotify.c +++ b/reactos/lib/shell32/changenotify.c @@ -36,7 +36,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &SHELL32_ChangenotifyCS, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": SHELL32_ChangenotifyCS") } + 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_ChangenotifyCS") } }; static CRITICAL_SECTION SHELL32_ChangenotifyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; diff --git a/reactos/lib/shell32/control.c b/reactos/lib/shell32/control.c index f0a07167e0f..63c541fae3f 100644 --- a/reactos/lib/shell32/control.c +++ b/reactos/lib/shell32/control.c @@ -153,7 +153,7 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTA* cs) { CPanel* panel = (CPanel*)cs->lpCreateParams; - SetWindowLongA(hWnd, 0, (LPARAM)panel); + SetWindowLongPtrA(hWnd, 0, (LONG_PTR)panel); panel->status = 0; panel->hWnd = hWnd; } @@ -244,7 +244,7 @@ static LRESULT Control_WndProc_LButton(CPanel* panel, LPARAM lParam, BOOL up) static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { - CPanel* panel = (CPanel*)GetWindowLongA(hWnd, 0); + CPanel* panel = (CPanel*)GetWindowLongPtrA(hWnd, 0); if (panel || wMsg == WM_CREATE) { switch (wMsg) { diff --git a/reactos/lib/shell32/dde.c b/reactos/lib/shell32/dde.c index 270ebaf921a..21ddfccb7a1 100644 --- a/reactos/lib/shell32/dde.c +++ b/reactos/lib/shell32/dde.c @@ -104,16 +104,16 @@ static HDDEDATA CALLBACK DdeCallback( switch (uType) { case XTYP_CONNECT: - return (HDDEDATA)Dde_OnConnect(hsz1, hsz2); + return (HDDEDATA)(DWORD_PTR)Dde_OnConnect(hsz1, hsz2); case XTYP_CONNECT_CONFIRM: Dde_OnConnectConfirm(hconv, hsz1, hsz2); return NULL; case XTYP_WILDCONNECT: - return (HDDEDATA)Dde_OnWildConnect(hsz1, hsz2); + return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2); case XTYP_REQUEST: return (HDDEDATA)Dde_OnRequest(uFmt, hconv, hsz1, hsz2); case XTYP_EXECUTE: - return (HDDEDATA)Dde_OnExecute(hconv, hsz1, hdata); + return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata); case XTYP_DISCONNECT: Dde_OnDisconnect(hconv); return NULL; diff --git a/reactos/lib/shell32/debughlp.c b/reactos/lib/shell32/debughlp.c index 03dceaf04fe..46230b6ac3f 100644 --- a/reactos/lib/shell32/debughlp.c +++ b/reactos/lib/shell32/debughlp.c @@ -144,14 +144,12 @@ IID* _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl) } static -DWORD _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) +void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { - DWORD dwReturn=0; LPSTR szSrc; GUID const * riid; - char szTemp[MAX_PATH]; - if (!pidl) return 0; + if (!pidl) return; if (szOut) *szOut = 0; @@ -160,13 +158,11 @@ DWORD _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { /* desktop */ if (szOut) lstrcpynA(szOut, "Desktop", uOutSize); - dwReturn = strlen ("Desktop"); } else if (( szSrc = _dbg_ILGetTextPointer(pidl) )) { /* filesystem */ if (szOut) lstrcpynA(szOut, szSrc, uOutSize); - dwReturn = strlen(szSrc); } else if (( riid = _dbg_ILGetGUIDPointer(pidl) )) { @@ -175,9 +171,7 @@ DWORD _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - dwReturn = strlen (szTemp); } - return dwReturn; } @@ -202,17 +196,18 @@ void pdump (LPCITEMIDLIST pidl) { DWORD dwAttrib = 0; LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); - DWORD type = pData->type; + DWORD type = pData ? pData->type : 0; LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); char szName[MAX_PATH]; _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); - if( PT_FOLDER == type || PT_VALUE == type) + if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) dwAttrib = pData->u.file.uFileAttribs; - MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=\"%s\" (%s,%s)\n", - pidltemp, pidltemp->mkid.cb,type,dwAttrib,szName,debugstr_a(szLongName), debugstr_a(szShortName)); + MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=%s (%s,%s)\n", + pidltemp, pidltemp->mkid.cb, type, dwAttrib, + debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); pidltemp = _dbg_ILGetNext(pidltemp); @@ -290,11 +285,7 @@ BOOL pcheck( LPCITEMIDLIST pidl ) return TRUE; } -static char shdebugstr_buf1[100]; -static char shdebugstr_buf2[100]; -static char * shdebugstr_buf = shdebugstr_buf1; - -static struct { +static const struct { REFIID riid; const char *name; } InterfaceDesc[] = { @@ -328,11 +319,8 @@ const char * shdebugstr_guid( const struct _GUID *id ) const char* name = NULL; char clsidbuf[100]; - shdebugstr_buf = (shdebugstr_buf == shdebugstr_buf1) ? shdebugstr_buf2 : shdebugstr_buf1; + if (!id) return "(null)"; - if (!id) { - strcpy (shdebugstr_buf, "(null)"); - } else { for (i=0;InterfaceDesc[i].riid && !name;i++) { if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name; } @@ -341,10 +329,8 @@ const char * shdebugstr_guid( const struct _GUID *id ) name = clsidbuf; } - sprintf( shdebugstr_buf, "\n\t{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", + return wine_dbg_sprintf( "\n\t{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" ); - } - return shdebugstr_buf; } diff --git a/reactos/lib/shell32/iconcache.c b/reactos/lib/shell32/iconcache.c index fcacbaaea54..4b8755026df 100644 --- a/reactos/lib/shell32/iconcache.c +++ b/reactos/lib/shell32/iconcache.c @@ -67,7 +67,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &SHELL32_SicCS, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": SHELL32_SicCS") } + 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_SicCS") } }; static CRITICAL_SECTION SHELL32_SicCS = { &critsect_debug, -1, 0, 0, 0, 0 }; diff --git a/reactos/lib/shell32/pidl.c b/reactos/lib/shell32/pidl.c index 892f523b0f3..7468a3fdde6 100644 --- a/reactos/lib/shell32/pidl.c +++ b/reactos/lib/shell32/pidl.c @@ -1278,55 +1278,41 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath) */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) { - IShellFolder * psf; - LPITEMIDLIST pidlChild, pidlParent; + IShellFolder * psfDesktop; HRESULT hr=E_FAIL; TRACE_(shell)("pidl=%p\n", pidl); pdump(pidl); - + + if (!pidl || !ppv) + return E_INVALIDARG; + *ppv = NULL; if (ppidlLast) *ppidlLast = NULL; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + if (_ILIsPidlSimple(pidl)) { - IShellFolder* desktop; - /* we are on desktop level */ - hr = SHGetDesktopFolder(&desktop); - - if (SUCCEEDED(hr)) - { - hr = IShellFolder_QueryInterface(desktop, riid, ppv); - - if (SUCCEEDED(hr) && ppidlLast) - *ppidlLast = ILClone(pidl); - - IShellFolder_Release(desktop); - } + hr = IShellFolder_QueryInterface(psfDesktop, riid, ppv); } else { - pidlChild = ILClone(ILFindLastID(pidl)); - pidlParent = ILClone(pidl); + LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); - - hr = SHGetDesktopFolder(&psf); - - if (SUCCEEDED(hr)) - hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); - - if (SUCCEEDED(hr) && ppidlLast) - *ppidlLast = pidlChild; - else - ILFree (pidlChild); - + hr = IShellFolder_BindToObject(psfDesktop, pidlParent, NULL, riid, ppv); SHFree (pidlParent); - if (psf) - IShellFolder_Release(psf); } + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = ILFindLastID(pidl); + TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; } diff --git a/reactos/lib/shell32/shell.c b/reactos/lib/shell32/shell.c index 262ac49bb7d..690538becb7 100644 --- a/reactos/lib/shell32/shell.c +++ b/reactos/lib/shell32/shell.c @@ -51,7 +51,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); -WINE_DECLARE_DEBUG_CHANNEL(exec); typedef struct { /* structure for dropped files */ diff --git a/reactos/lib/shell32/shell32.spec b/reactos/lib/shell32/shell32.spec index c1def3956f7..23cbbb1dee3 100644 --- a/reactos/lib/shell32/shell32.spec +++ b/reactos/lib/shell32/shell32.spec @@ -120,9 +120,9 @@ 127 stdcall -noname SHWinHelp(long long long long) 129 stdcall -noname DAD_AutoScroll(long ptr ptr) 130 stdcall -noname DAD_DragEnter(long) - 131 stdcall -noname DAD_DragEnterEx(long long long) + 131 stdcall -noname DAD_DragEnterEx(long double) 132 stdcall -noname DAD_DragLeave() - 134 stdcall -noname DAD_DragMove(long long) + 134 stdcall -noname DAD_DragMove(double) 136 stdcall -noname DAD_SetDragImage(long long) 137 stdcall -noname DAD_ShowDragImage(long) 139 stub Desktop_UpdateBriefcaseOnEvent diff --git a/reactos/lib/shell32/shell32_Bg.rc b/reactos/lib/shell32/shell32_Bg.rc new file mode 100644 index 00000000000..3f64a492a99 --- /dev/null +++ b/reactos/lib/shell32/shell32_Bg.rc @@ -0,0 +1,205 @@ +/* + * Copyright 2005 Milko Krachounov + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Големи икони", FCIDM_SHVIEW_BIGICON + MENUITEM "&Малки икони", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Списък", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Подробности", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Изглед" + BEGIN + MENUITEM "&Големи икони", FCIDM_SHVIEW_BIGICON + MENUITEM "&Малки икони", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Списък", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Подробности", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Подреди &иконите" + BEGIN + MENUITEM "По &име", 0x30 /* column 0 */ + MENUITEM "По &тип", 0x32 /* column 2 */ + MENUITEM "По &размер", 0x31 /* ... */ + MENUITEM "По &дата", 0x33 + MENUITEM SEPARATOR + MENUITEM "&Автоматично подреждане", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Подравни иконите", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Опресни", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Вмъкни", FCIDM_SHVIEW_INSERT + MENUITEM "Вмъкни като връзка", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Създай" + BEGIN + MENUITEM "Нова &папка", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Нова &връзка", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Свойства", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Разгледай", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Отвори", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&Изрежи", FCIDM_SHVIEW_CUT + MENUITEM "&Копирай", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Създай &връзка", FCIDM_SHVIEW_CREATELINK + MENUITEM "Из&трий", FCIDM_SHVIEW_DELETE + MENUITEM "&Преименувай", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Свойства", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Избор на папка" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Отмени", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Относно %s" +FONT 10, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER + 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 +} + +SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + LTEXT "Въведете име на програма, папка, документ или Интернет ресурс и Wine ще го отвори за вас.", 12289, 36, 11, 182, 18 + LTEXT "&Open:", 12305, 7, 39, 24, 10 + CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Отмени", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Избери...", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Файл" + IDS_SHV_COLUMN2 "Размер" + IDS_SHV_COLUMN3 "Тип" + IDS_SHV_COLUMN4 "Променен" + IDS_SHV_COLUMN5 "Атрибути" + IDS_SHV_COLUMN6 "Размер" + IDS_SHV_COLUMN7 "Оставащ размер" /* Size available, Квооооооооооооо!? */ + IDS_SHV_COLUMN8 "Име" + IDS_SHV_COLUMN9 "Коментар" + IDS_SHV_COLUMN10 "Собственик" + IDS_SHV_COLUMN11 "Група" + + /* special folders */ + IDS_DESKTOP "Работен плот" + IDS_MYCOMPUTER "Моят компютър" + + /* context menus */ + IDS_VIEW_LARGE "&Големи икони" + IDS_VIEW_SMALL "&Малки икони" + IDS_VIEW_LIST "&Списък" + IDS_VIEW_DETAILS "&Подробности" + IDS_SELECT "Избери" + IDS_OPEN "Отвори" + + IDS_CREATEFOLDER_DENIED "Папката не може да бъде създадена: Достъпът отказан." + IDS_CREATEFOLDER_CAPTION "Грешка при създаването на нова папка." + IDS_DELETEITEM_CAPTION "Потвърдете изтриването на файла" + IDS_DELETEFOLDER_CAPTION "Потвърдете изтриването на папката" + IDS_DELETEITEM_TEXT "Наистина ли искате да изтриете '%1'?" + IDS_DELETEMULTIPLE_TEXT "Наистина ли искате да изтриете тези %1 елемента?" + IDS_OVERWRITEFILE_TEXT "Наистина ли искате да презапишете %1?" + IDS_OVERWRITEFILE_CAPTION "Потвърдете презаписа на файла" + + /* message box strings */ + IDS_RESTART_TITLE "Рестартиране" + IDS_RESTART_PROMPT "Искате ли да симулирате рестартиране на Windows?" + IDS_SHUTDOWN_TITLE "Изключване" + IDS_SHUTDOWN_PROMPT "Искате ли да прекратите вашата Wine сесия?" + + /* shell folder path default values */ + /* Тези може би е добра идея да останат непреведени ? */ + IDS_PROGRAMS "Start Menu\\Programs" + IDS_PERSONAL "My Documents" + IDS_FAVORITES "Favorites" + IDS_STARTUP "Start Menu\\Programs\\StartUp" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start Menu" + IDS_MYMUSIC "My Documents\\My Music" + IDS_MYVIDEO "My Documents\\My Video" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "My Documents\\My Pictures" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Documents" + IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_COMMON_MUSIC "Documents\\My Music" + IDS_COMMON_PICTURES "Documents\\My Pictures" + IDS_COMMON_VIDEO "Documents\\My Video" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +} diff --git a/reactos/lib/shell32/shell32_Fi.rc b/reactos/lib/shell32/shell32_Fi.rc index c70d8a75034..42ffc8068ac 100644 --- a/reactos/lib/shell32/shell32_Fi.rc +++ b/reactos/lib/shell32/shell32_Fi.rc @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2005 Kimmo Myllyvirta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,9 +18,95 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Nдkymд" + BEGIN + MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "&Jдrjestд Kuvakkeet" + BEGIN + MENUITEM "&Nimen mukaan", 0x30 /* column 0 */ + MENUITEM "&Tyypin mukaan", 0x32 /* column 2 */ + MENUITEM "&Koon mukaan", 0x31 /* ... */ + MENUITEM "&Pдivдmддrдn mukaan", 0x33 + MENUITEM SEPARATOR + MENUITEM "Jдrjestд &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Jдrjestд kuvakkeet riviin", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Pдivitд", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Liitд", FCIDM_SHVIEW_INSERT + MENUITEM "Liitд Linkiksi", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Uusi" + BEGIN + MENUITEM "Uusi &Kansio", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Uusi &Linkki", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Selaa", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Avaa", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&Leikkaa", FCIDM_SHVIEW_CUT + MENUITEM "&Kopioi", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Lu&o Linkki", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Poista", FCIDM_SHVIEW_DELETE + MENUITEM "&Nimeд Uudelleen", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Ominaisuudet", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Valitse Kansio" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Tietoja: %s" +CAPTION "Tietoja %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP @@ -28,7 +114,7 @@ FONT 10, "MS Shell Dlg" ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS:n tekijдt:", 98, 8, 55, 137, 10 + LTEXT "ReactOS:n toi Sinulle:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +123,82 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Peruuta", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Selaa...", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Tiedosto" + IDS_SHV_COLUMN2 "Koko" + IDS_SHV_COLUMN3 "Tyyppi" + IDS_SHV_COLUMN4 "Muokattu" + IDS_SHV_COLUMN5 "Ominaisuudet" + IDS_SHV_COLUMN6 "Koko" + IDS_SHV_COLUMN7 "Tilaa jдljellд" + IDS_SHV_COLUMN8 "Nimi" + IDS_SHV_COLUMN9 "Kommentit" + IDS_SHV_COLUMN10 "Omistaja" + IDS_SHV_COLUMN11 "Ryhmд" + + /* special folders */ + IDS_DESKTOP "Tyцpцytд" + IDS_MYCOMPUTER "Oma Tietokone" + + /* context menus */ + IDS_VIEW_LARGE "&Suuret Kuvakkeet" + IDS_VIEW_SMALL "&Pienet Kuvakkeet" + IDS_VIEW_LIST "&Lista" + IDS_VIEW_DETAILS "&Tiedot" + IDS_SELECT "Valitse" + IDS_OPEN "Avaa" + + IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivдt riitд." + IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" + IDS_DELETEITEM_CAPTION "Vahvista tiedoston tuhoaminen" + IDS_DELETEFOLDER_CAPTION "Vahvista kansion tuhoaminen" + IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" + IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota nдmд %1?" + IDS_OVERWRITEFILE_TEXT "Ylikirjoita tiedosto %1?" + IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" + + /* message box strings */ + IDS_RESTART_TITLE "Kдynnistд uudestaan" + IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkдynnistдmistд?" + IDS_SHUTDOWN_TITLE "Sammuta" + IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" + + /* shell folder path default values */ + IDS_PROGRAMS "Kдynnistд\\Ohjelmat" + IDS_PERSONAL "Omat tiedostot" + IDS_FAVORITES "Suosikit" + IDS_STARTUP "Kдynnistд\\Ohjelmat\\Kдynnistys" + IDS_RECENT "Дskettдin kдytetyt" + IDS_SENDTO "Lдhetд" + IDS_STARTMENU "Kдynnistд" + IDS_MYMUSIC "Omat tiedostot\\Omat musiikkitiedostot" + IDS_MYVIDEO "Omat tiedostot\\Omat videotiedostot" + IDS_DESKTOPDIRECTORY "Tyцpцytд" + IDS_NETHOOD "Verkkoympдristц" + IDS_TEMPLATES "Mallit" + IDS_APPDATA "Ohjelmien Tiedot" + IDS_PRINTHOOD "Tulostinympдristц" + IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien Tiedot" + IDS_INTERNET_CACHE "Vдliaikaiset Internet-tiedostot" + IDS_COOKIES "Evдsteet" + IDS_HISTORY "Historia" + IDS_PROGRAM_FILES "Ohjelmat" + IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot" + IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot" + IDS_COMMON_DOCUMENTS "Dokumentit" + IDS_ADMINTOOLS "Kдynnistys\\Ohjauspaneeli\\Administrative Tools" + IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" + IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" + IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" + IDS_CDBURN_AREA "Paikalliset Asetukset\\Ohjelmien Tiedot\\Microsoft\\CD Burning" } diff --git a/reactos/lib/shell32/shell32_No.rc b/reactos/lib/shell32/shell32_No.rc index e532f5d0761..72048e684df 100644 --- a/reactos/lib/shell32/shell32_No.rc +++ b/reactos/lib/shell32/shell32_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2005 Alexander N. Sшrnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,93 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "&Smе ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Vis" + BEGIN + MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mе ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Ordne &ikoner" + BEGIN + MENUITEM "Etter &navn", 0x30 /* column 0 */ + MENUITEM "Etter &type", 0x32 /* column 2 */ + MENUITEM "Etter &stшrrelse", 0x31 /* ... */ + MENUITEM "Etter &dato", 0x33 + MENUITEM SEPARATOR + MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Still opp ikoner", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Oppdater", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT + MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Ny" + BEGIN + MENUITEM "Ny &mappe", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Ny &snarvei", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Utforsk", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Еpne", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "Klipp &ut", FCIDM_SHVIEW_CUT + MENUITEM "&Kopier", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "&Opprett snarvei", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Slett", FCIDM_SHVIEW_DELETE + MENUITEM "&Gi nytt navn", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "Egenska&per", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Bla etter mappe" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -28,7 +114,7 @@ FONT 10, "MS Shell Dlg" ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + LTEXT "ReactOS er laget av", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +123,82 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Skriv inn navnet pе programmet, mappen, dokumentet etter Internett-ressursen du шnsker е еpne.", 12289, 36, 11, 182, 18 + LTEXT "&Еpne:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bla . . .", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Fil" + IDS_SHV_COLUMN2 "Stшrrelse" + IDS_SHV_COLUMN3 "Type" + IDS_SHV_COLUMN4 "Endret" + IDS_SHV_COLUMN5 "Egenskaper" + IDS_SHV_COLUMN6 "Stшrrelse" + IDS_SHV_COLUMN7 "Ledig plass" + IDS_SHV_COLUMN8 "Navn" + IDS_SHV_COLUMN9 "Kommentarer" + IDS_SHV_COLUMN10 "Eier" + IDS_SHV_COLUMN11 "Gruppe" + + /* special folders */ + IDS_DESKTOP "Skrivebord" + IDS_MYCOMPUTER "Min datamaskin" + + /* context menus */ + IDS_VIEW_LARGE "&Store ikoner" + IDS_VIEW_SMALL "S&mе ikoner" + IDS_VIEW_LIST "&Liste" + IDS_VIEW_DETAILS "&Detaljer" + IDS_SELECT "Velg" + IDS_OPEN "Еpne" + + IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." + IDS_CREATEFOLDER_CAPTION "Feil ved oppretting av ny mappe" + IDS_DELETEITEM_CAPTION "Bekreft filsletting" + IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" + IDS_DELETEITEM_TEXT "Virkelig slette '%1'?" + IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" + IDS_OVERWRITEFILE_TEXT "Overskrive filen '%1'?" + IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" + + /* message box strings */ + IDS_RESTART_TITLE "Starte pе nytt" + IDS_RESTART_PROMPT "Vil du simulere en omstart av Windows?" + IDS_SHUTDOWN_TITLE "Avslutt" + IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-шkten?" + + /* shell folder path default values */ + IDS_PROGRAMS "Start-meny\\Programmer" + IDS_PERSONAL "Mine dokumenter" + IDS_FAVORITES "Favoritter" + IDS_STARTUP "Start-meny\\Programmer\\Oppstart" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start-meny" + IDS_MYMUSIC "Mine dokumenter\\Min musikk" + IDS_MYVIDEO "Mine dokumenter\\Mine videoklipp" + IDS_DESKTOPDIRECTORY "Skrivebord" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "Mine dokumenter\\Mine bilder" + IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" + IDS_COMMON_DOCUMENTS "Dokumenter" + IDS_ADMINTOOLS "Start-meny\\Programmer\\Administrative verktшy" + IDS_COMMON_MUSIC "Dokumenter\\Min musikk" + IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" + IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" } diff --git a/reactos/lib/shell32/shell32_main.c b/reactos/lib/shell32/shell32_main.c index 3503dce50a5..82aaca16ab6 100644 --- a/reactos/lib/shell32/shell32_main.c +++ b/reactos/lib/shell32/shell32_main.c @@ -308,12 +308,13 @@ static DWORD shgfi_get_exe_type(LPCWSTR szFullPath) * SHGetFileInfoW [SHELL32.@] * */ -DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, - SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags ) +DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, + SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags ) { WCHAR szLocation[MAX_PATH], szFullPath[MAX_PATH]; int iIndex; - DWORD ret = TRUE, dwAttributes = 0; + DWORD_PTR ret = TRUE; + DWORD dwAttributes = 0; IShellFolder * psfParent = NULL; IExtractIconW * pei = NULL; LPITEMIDLIST pidlLast = NULL, pidl = NULL; @@ -557,9 +558,9 @@ DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (ret) { if (flags & SHGFI_SMALLICON) - ret = (DWORD) ShellSmallIconList; + ret = (DWORD_PTR) ShellSmallIconList; else - ret = (DWORD) ShellBigIconList; + ret = (DWORD_PTR) ShellBigIconList; } } @@ -596,9 +597,9 @@ DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /************************************************************************* * SHGetFileInfoA [SHELL32.@] */ -DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, - SHFILEINFOA *psfi, UINT sizeofpsfi, - UINT flags ) +DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, + SHFILEINFOA *psfi, UINT sizeofpsfi, + UINT flags ) { INT len; LPWSTR temppath; @@ -706,7 +707,7 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex { ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR); if (ret != 0xFFFFFFFF && ret) - return (HICON)ret; + return (HICON)(UINT_PTR)ret; return NULL; } else diff --git a/reactos/lib/shell32/shelllink.c b/reactos/lib/shell32/shelllink.c index 2b9a0937861..834b5efe23a 100644 --- a/reactos/lib/shell32/shelllink.c +++ b/reactos/lib/shell32/shelllink.c @@ -2384,7 +2384,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) } static HRESULT WINAPI -ShellLink_GetCommandString( IContextMenu* iface, UINT idCmd, UINT uType, +ShellLink_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); diff --git a/reactos/lib/shell32/shellord.c b/reactos/lib/shell32/shellord.c index a271e5e3592..c4bd324c703 100644 --- a/reactos/lib/shell32/shellord.c +++ b/reactos/lib/shell32/shellord.c @@ -355,16 +355,16 @@ int WINAPIV ShellMessageBoxW( va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ - TRACE("(%08lx,%08lx,%p,%p,%08x)\n", - (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); + TRACE("(%p,%p,%p,%p,%08x)\n", + hInstance,hWnd,lpText,lpCaption,uType); - if (!HIWORD(lpCaption)) - LoadStringW(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + if (IS_INTRESOURCE(lpCaption)) + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); else pszTitle = lpCaption; - if (!HIWORD(lpText)) - LoadStringW(hInstance, (DWORD)lpText, szText, sizeof(szText)/sizeof(szText[0])); + if (IS_INTRESOURCE(lpText)) + LoadStringW(hInstance, LOWORD(lpText), szText, sizeof(szText)/sizeof(szText[0])); else pszText = lpText; @@ -412,16 +412,16 @@ int WINAPIV ShellMessageBoxA( va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ - TRACE("(%08lx,%08lx,%p,%p,%08x)\n", - (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); + TRACE("(%p,%p,%p,%p,%08x)\n", + hInstance,hWnd,lpText,lpCaption,uType); - if (!HIWORD(lpCaption)) - LoadStringA(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle)); + if (IS_INTRESOURCE(lpCaption)) + LoadStringA(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)); else pszTitle = lpCaption; - if (!HIWORD(lpText)) - LoadStringA(hInstance, (DWORD)lpText, szText, sizeof(szText)); + if (IS_INTRESOURCE(lpText)) + LoadStringA(hInstance, LOWORD(lpText), szText, sizeof(szText)); else pszText = lpText; @@ -1004,10 +1004,9 @@ static LPUNKNOWN SHELL32_IExplorerInterface=0; * NOTES * Sets the interface */ -HRESULT WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) +VOID WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) { TRACE("%p\n", lpUnknown); SHELL32_IExplorerInterface = lpUnknown; - return (HRESULT) lpUnknown; } /************************************************************************* * SHGetInstanceExplorer [SHELL32.@] diff --git a/reactos/lib/shell32/shellpath.c b/reactos/lib/shell32/shellpath.c index 534e98ddcb4..b1fedf62782 100644 --- a/reactos/lib/shell32/shellpath.c +++ b/reactos/lib/shell32/shellpath.c @@ -1303,7 +1303,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) { if (LoadStringW(shell32_hInstance, - (UINT)CSIDL_Data[folder].szDefaultPath, resourcePath, MAX_PATH)) + LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH)) { hr = S_OK; pDefaultPath = resourcePath; diff --git a/reactos/lib/shell32/shlexec.c b/reactos/lib/shell32/shlexec.c index 17e9bec956b..2aefac6a3b0 100644 --- a/reactos/lib/shell32/shlexec.c +++ b/reactos/lib/shell32/shlexec.c @@ -928,7 +928,7 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResu if (wDirectory) SHFree( wDirectory ); TRACE("returning %s\n", lpResult); - return (HINSTANCE)retval; + return retval; } /************************************************************************* @@ -1051,7 +1051,7 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfun if (SUCCEEDED(hr)) { - hr = IShellExecuteHookW_Execute(pSEH, sei); + hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); IShellExecuteHookW_Release(pSEH); @@ -1151,7 +1151,7 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfun if (SUCCEEDED(hr)) { - hr = IShellExecuteHookW_Execute(pSEH, sei); + hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); IShellExecuteHookW_Release(pSEH); @@ -1338,7 +1338,7 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfun WCHAR lpstrTmpFile[256]; strcpyW(lpstrTmpFile, wHttp); strcatW(lpstrTmpFile, lpFile); - retval = (UINT)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); + retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } TRACE("retval %u\n", retval); diff --git a/reactos/lib/shell32/shlmenu.c b/reactos/lib/shell32/shlmenu.c index 527d8a21349..99810dc45a8 100644 --- a/reactos/lib/shell32/shlmenu.c +++ b/reactos/lib/shell32/shlmenu.c @@ -206,7 +206,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) MenuInfo.cbSize = sizeof(MENUINFO); MenuInfo.fMask = MIM_MENUDATA; - MenuInfo.dwMenuData = (DWORD) lpFmMi; + MenuInfo.dwMenuData = (ULONG_PTR) lpFmMi; SetMenuInfo (hMenuPopup, &MenuInfo); FileMenu_AppendItemW (hmenu, sTemp, uID, iIcon, hMenuPopup, FM_DEFAULT_HEIGHT); @@ -277,7 +277,7 @@ HMENU WINAPI FileMenu_Create ( MenuInfo.cbSize = sizeof(MENUINFO); MenuInfo.fMask = MIM_MENUDATA; - MenuInfo.dwMenuData = (DWORD) menudata; + MenuInfo.dwMenuData = (ULONG_PTR) menudata; SetMenuInfo (hMenu, &MenuInfo); return hMenu; @@ -342,7 +342,7 @@ static BOOL FileMenu_AppendItemW( myItem->iIconIndex = icon; myItem->hMenu = hMenu; mii.fMask = MIIM_DATA; - mii.dwItemData = (DWORD) myItem; + mii.dwItemData = (ULONG_PTR) myItem; } if ( hMenuPopup ) diff --git a/reactos/lib/shell32/shres.rc b/reactos/lib/shell32/shres.rc index 87d3748cf7a..02325daa0a4 100644 --- a/reactos/lib/shell32/shres.rc +++ b/reactos/lib/shell32/shres.rc @@ -24358,6 +24358,7 @@ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico * which also have a neutral version. This is to * get localized bitmaps for example. */ +#include "shell32_Bg.rc" #include "shell32_Ca.rc" #include "shell32_Cn.rc" #include "shell32_Cs.rc" diff --git a/reactos/lib/shell32/shv_bg_cmenu.c b/reactos/lib/shell32/shv_bg_cmenu.c index 00518f6f460..669d080156e 100644 --- a/reactos/lib/shell32/shv_bg_cmenu.c +++ b/reactos/lib/shell32/shv_bg_cmenu.c @@ -400,7 +400,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( */ static HRESULT WINAPI ISVBgCm_fnGetCommandString( IContextMenu2 *iface, - UINT idCommand, + UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName, diff --git a/reactos/lib/shell32/shv_item_cmenu.c b/reactos/lib/shell32/shv_item_cmenu.c index 63219eaf8b5..43f76fd8181 100644 --- a/reactos/lib/shell32/shv_item_cmenu.c +++ b/reactos/lib/shell32/shv_item_cmenu.c @@ -467,7 +467,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( */ static HRESULT WINAPI ISvItemCm_fnGetCommandString( IContextMenu2 *iface, - UINT idCommand, + UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName,