Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[jimtabor] 32884: - Implement SendMessageCallbackA/W, user32 only. - Add client thread infomation structure to W32THREADINFO. Nothing is plugged in yet, the code is there. - Fix IntBroadcastSystemMessage to correct filter action. More work is needed since our message system has issues. - This could be a good project for newbies, rewrite message system could be placed into a branch.
by jimtabor＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: jimtabor Date: Sun Apr 6 13:24:30 2008 New Revision: 32884 URL: http://svn.reactos.org/svn/reactos?rev=32884&view=rev Log: - Implement SendMessageCallbackA/W, user32 only. - Add client thread infomation structure to W32THREADINFO. Nothing is plugged in yet, the code is there. - Fix IntBroadcastSystemMessage to correct filter action. More work is needed since our message system has issues. - This could be a good project for newbies, rewrite message system could be placed into a branch. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sun Apr 6 13:24:30 2008 @@ -1827,9 +1827,8 @@ return Result; } - -/* - * @unimplemented +/* + * @implemented */ BOOL STDCALL @@ -1841,13 +1840,17 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented + return NtUserMessageCall(hWnd, + Msg, + wParam, + lParam, + (ULONG_PTR)&lpCallBack, + NUMC_SENDMESSAGECALLBACK, + TRUE); +} + +/* + * @implemented */ BOOL STDCALL @@ -1859,10 +1862,14 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { - UNIMPLEMENTED; - return FALSE; -} - + return NtUserMessageCall(hWnd, + Msg, + wParam, + lParam, + (ULONG_PTR)&lpCallBack, + NUMC_SENDMESSAGECALLBACK, + FALSE); +} /* * @implemented @@ -2303,22 +2310,10 @@ BOOL WINAPI IsInsideMessagePumpHook() { - if(!gfMessagePumpHook) - return FALSE; - - /* This code checks if we're inside SendMessage. */ -#if 0 - /* Since our TEB doesnt match that of real windows, testing this value is useless until we know what it does - PUCHAR NtTeb = (PUCHAR)NtCurrentTeb(); - - if(!*(PLONG*)&NtTeb[0x708]) - return FALSE; - - if(**(PLONG*)&NtTeb[0x708] <= 0) - return FALSE;*/ -#endif - - return TRUE; +// PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; +// return (gfMessagePumpHook && pcti && (pcti->dwcPumpHook > 0)); + if(!gfMessagePumpHook) return FALSE; + return TRUE; } void WINAPI ResetMessagePumpHook(PUSER_MESSAGE_PUMP_ADDRESSES Addresses) @@ -2564,6 +2559,9 @@ { DWORD flags; LPDWORD recipients; + HDESK hDesk; + HWND hWnd; + LUID luid; } BROADCASTPARM, *PBROADCASTPARM; LONG @@ -2579,12 +2577,13 @@ { BROADCASTPARM parm; DWORD recips = BSM_ALLCOMPONENTS; - BOOL ret = TRUE; + BOOL ret = -1; // Set to return fail static const DWORD all_flags = ( BSF_QUERY | BSF_IGNORECURRENTTASK | BSF_FLUSHDISK | BSF_NOHANG | BSF_POSTMESSAGE | BSF_FORCEIFHUNG | BSF_NOTIMEOUTIFNOTHUNG | BSF_ALLOWSFW | BSF_SENDNOTIFYMESSAGE | BSF_RETURNHDESK | BSF_LUID ); - if (dwflags & ~all_flags) + if ((dwflags & ~all_flags) || + (!pBSMInfo && (dwflags & (BSF_RETURNHDESK|BSF_LUID))) ) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -2596,37 +2595,54 @@ return 0; } + if (dwflags & BSF_FORCEIFHUNG) dwflags |= BSF_NOHANG; + + if (dwflags & BSF_QUERY) dwflags &= ~BSF_SENDNOTIFYMESSAGE|BSF_POSTMESSAGE; + if (!lpdwRecipients) lpdwRecipients = &recips; - if ( pBSMInfo && dwflags & BSF_QUERY ) + if (*lpdwRecipients & ~(BSM_APPLICATIONS|BSM_ALLDESKTOPS|BSM_INSTALLABLEDRIVERS|BSM_NETDRIVER|BSM_VXDS)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if ( pBSMInfo && (dwflags & BSF_QUERY) ) { if (pBSMInfo->cbSize != sizeof(BSMINFO)) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - FIXME("Not returning PBSMINFO information yet\n"); - } - + } + + parm.hDesk = NULL; + parm.hWnd = NULL; parm.flags = dwflags; parm.recipients = lpdwRecipients; + if (dwflags & BSF_LUID) parm.luid = pBSMInfo->luid; + if (*lpdwRecipients & BSM_APPLICATIONS) { - return NtUserMessageCall(GetDesktopWindow(), - uiMessage, - wParam, - lParam, - (ULONG_PTR)&parm, - NUMC_BROADCASTSYSTEMMESSAGE, - Ansi); - } - else - { - FIXME("Recipients %08x not supported!\n", *lpdwRecipients); - } - + ret = NtUserMessageCall(GetDesktopWindow(), + uiMessage, + wParam, + lParam, + (ULONG_PTR)&parm, + NUMC_BROADCASTSYSTEMMESSAGE, + Ansi); + } + + if (!ret) + { + if ( pBSMInfo && (dwflags & BSF_QUERY) ) + { + pBSMInfo->hdesk = parm.hDesk; + pBSMInfo->hwnd = parm.hWnd; + } + } return ret; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Apr 6 13:24:30 2008 @@ -181,6 +181,11 @@ } W32PROCESSINFO, *PW32PROCESSINFO; +typedef struct _CLIENTTHREADINFO +{ + DWORD dwcPumpHook; +} CLIENTTHREADINFO, *PCLIENTTHREADINFO; + typedef struct _W32THREADINFO { PW32PROCESSINFO pi; /* [USER] */ @@ -194,6 +199,7 @@ /* Application compatibility flags */ DWORD AppCompatFlags; DWORD AppCompatFlags2; + CLIENTTHREADINFO ClientThreadInfo; } W32THREADINFO, *PW32THREADINFO; /* Window Client Information structure */ @@ -221,7 +227,7 @@ PVOID pvWND; // " " DWORD dwHookCurrent; ULONG Win32ClientInfo1; - PVOID pClientThreadInfo; + PCLIENTTHREADINFO pClientThreadInfo; DWORD dwHookData; ULONG Win32ClientInfo2[8]; HANDLE hKL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sun Apr 6 13:24:30 2008 @@ -436,6 +436,7 @@ { PTEB Teb; PW32THREADINFO ti; +// PW32CLIENTINFO ci; PW32THREAD W32Thread = PsGetCurrentThreadWin32Thread(); if (W32Thread == NULL) @@ -475,6 +476,7 @@ W32Thread->ThreadInfo = ti; /* update the TEB */ Teb = NtCurrentTeb(); +// ci = GetWin32ClientInfo(); _SEH_TRY { ProbeForWrite(Teb, @@ -482,6 +484,7 @@ sizeof(ULONG)); Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); +// ci->pClientThreadInfo = UserHeapAddressToUser(&ti->ClientThreadInfo); } _SEH_HANDLE {

1 0

[spetreolle] 32883: fix baseaddress.rbuild
by spetreolle＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: spetreolle Date: Sun Apr 6 13:02:45 2008 New Revision: 32883 URL: http://svn.reactos.org/svn/reactos?rev=32883&view=rev Log: fix baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=328… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun Apr 6 13:02:45 2008 @@ -1,6 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> + <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> @@ -12,6 +14,7 @@ <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> + <property name="BASEADDRESS_UFAT" value="0x5b570000" /> <property name="BASEADDRESS_TAPIUI" value="0x5b770000" /> <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> @@ -59,14 +62,12 @@ <property name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> <property name="BASEADDRESS_URLMON" value="0x6b3c0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> - <property name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> <property name="BASEADDRESS_HLINK" value="0x6C6E0000" /> <property name="BASEADDRESS_DESKMON" value="0x6d400000" /> <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> <property name="BASEADDRESS_SCHANNEL" value="0x6e360000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> - <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_WINHTTP" value="0x70c60000" /> @@ -83,11 +84,11 @@ <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> <property name="BASEADDRESS_WINSCARD" value="0x723d0000" /> <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> + <property name="BASEADDRESS_WINSPOOL" value="0x72f50000" /> <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> <property name="BASEADDRESS_ICMP" value="0x741f0000" /> - <property name="BASEADDRESS_UFAT" value="0x741f0000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> @@ -106,6 +107,7 @@ <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <property name="BASEADDRESS_WINSTA" value="0x762F0000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" /> @@ -142,7 +144,6 @@ <property name="BASEADDRESS_SENSAPI" value="0x77700000" /> <property name="BASEADDRESS_PACKET" value="0x77780000" /> <property name="BASEADDRESS_MSAFD" value="0x77780000" /> - <property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> <property name="BASEADDRESS_MSI" value="0x77790000" /> <property name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> @@ -163,5 +164,4 @@ <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" /> <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> - <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> </group>

1 0

[spetreolle] 32882: according to fireball's comment, complete baseaddress.rbuild sort by base address.
by spetreolle＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: spetreolle Date: Sun Apr 6 10:24:06 2008 New Revision: 32882 URL: http://svn.reactos.org/svn/reactos?rev=32882&view=rev Log: according to fireball's comment, complete baseaddress.rbuild sort by base address. Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=328… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun Apr 6 10:24:06 2008 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> - <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> @@ -68,6 +66,7 @@ <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> <property name="BASEADDRESS_SCHANNEL" value="0x6e360000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> + <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_WINHTTP" value="0x70c60000" /> @@ -132,8 +131,8 @@ <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" /> <property name="BASEADDRESS_TAPI32" value="0x76e60000" /> + <property name="BASEADDRESS_RASMAN" value="0x76e90000h" /> <property name="BASEADDRESS_RASAPI32" value="0x76ee0000" /> - <property name="BASEADDRESS_RASMAN" value="0x76e90000h" /> <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> <property name="BASEADDRESS_MSVFW32" value="0x76f60000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> @@ -164,4 +163,5 @@ <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" /> <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> + <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> </group>

1 0

[fireball] 32881: - Sync to Wine, fixes hlink_winetest build.
by fireball＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: fireball Date: Sun Apr 6 07:31:24 2008 New Revision: 32881 URL: http://svn.reactos.org/svn/reactos?rev=32881&view=rev Log: - Sync to Wine, fixes hlink_winetest build. Modified: trunk/reactos/include/psdk/hlink.idl Modified: trunk/reactos/include/psdk/hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hlink.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/hlink.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/hlink.idl [iso-8859-1] Sun Apr 6 07:31:24 2008 @@ -35,6 +35,8 @@ cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DWORD, IMoniker*, LPCWSTR, LPCWSTR, ULONG*);") cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") +cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);") +cpp_quote("HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER,DWORD,LPBC,ULONG,FORMATETC*,IBindStatusCallback*,LPMONIKER);") typedef enum _HLSR_NOREDEF10 { HLSR_HOME,

1 0

[janderwald] 32880: - fix build
by janderwald＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: janderwald Date: Sun Apr 6 03:38:24 2008 New Revision: 32880 URL: http://svn.reactos.org/svn/reactos?rev=32880&view=rev Log: - fix build Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Sun Apr 6 03:38:24 2008 @@ -75,5 +75,4 @@ <file>shv_item_new.c</file> <file>folder_options.c</file> <file>shfldr_netplaces.c</file> - <file>shv_default_context_menu.c</file> </module>

1 0

[janderwald] 32879: - implement PickIconDlg - fix bug a shellink property dialog
by janderwald＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: janderwald Date: Sat Apr 5 23:30:43 2008 New Revision: 32879 URL: http://svn.reactos.org/svn/reactos?rev=32879&view=rev Log: - implement PickIconDlg - fix bug a shellink property dialog Modified: trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -38,6 +38,7 @@ #include "shell32_main.h" #include "shresdef.h" #include "undocshell.h" +#include "shlwapi.h" typedef struct { @@ -60,15 +61,218 @@ * PickIconDlg [SHELL32.62] * */ + +typedef struct +{ + HMODULE hLibrary; + HWND hDlgCtrl; + WCHAR szName[MAX_PATH]; + INT Index; +}PICK_ICON_CONTEXT, *PPICK_ICON_CONTEXT; + +BOOL CALLBACK EnumPickIconResourceProc(HMODULE hModule, + LPCWSTR lpszType, + LPWSTR lpszName, + LONG_PTR lParam +) +{ + WCHAR szName[100]; + int index; + HICON hIcon; + PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)lParam; + + if (IS_INTRESOURCE(lpszName)) + swprintf(szName, L"%u\n", lpszName); + else + wcscpy(szName, (WCHAR*)lpszName); + + + hIcon = LoadIconW(pIconContext->hLibrary, (LPCWSTR)lpszName); + if (hIcon == NULL) + return TRUE; + + index = SendMessageW(pIconContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szName); + if (index != LB_ERR) + SendMessageW(pIconContext->hDlgCtrl, LB_SETITEMDATA, index, (LPARAM)hIcon); + + return TRUE; +} + +void +DestroyIconList(HWND hDlgCtrl) +{ + int count; + int index; + + count = SendMessage(hDlgCtrl, LB_GETCOUNT, 0, 0); + if (count == LB_ERR) + return; + + for(index = 0; index < count; index++) + { + HICON hIcon = (HICON)SendMessageW(hDlgCtrl, LB_GETITEMDATA, index, 0); + DestroyIcon(hIcon); + } +} + +INT_PTR CALLBACK PickIconProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + LPMEASUREITEMSTRUCT lpmis; + LPDRAWITEMSTRUCT lpdis; + HICON hIcon; + INT index; + WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; + OPENFILENAMEW ofn = {0}; + + PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLong(hwndDlg, DWLP_USER); + + switch(uMsg) + { + case WM_INITDIALOG: + pIconContext = (PPICK_ICON_CONTEXT)lParam; + SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext); + pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); + EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext); + if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) + SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); + else + SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName); + + swprintf(szText, L"%u", pIconContext->Index); + index = SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRING, -1, (LPARAM)szText); + if (index != LB_ERR) + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, index, 0); + return TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_GETTEXT, index, (LPARAM)szText); + pIconContext->Index = _wtoi(szText); + SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_GETTEXT, MAX_PATH, (LPARAM)pIconContext->szName); + DestroyIconList(pIconContext->hDlgCtrl); + EndDialog(hwndDlg, 1); + break; + case IDCANCEL: + DestroyIconList(pIconContext->hDlgCtrl); + EndDialog(hwndDlg, 0); + break; + case IDC_PICKICON_LIST: + if (HIWORD(wParam) == LBN_SELCHANGE) + InvalidateRect((HWND)lParam, NULL, TRUE); // FIXME USE UPDATE RECT + break; + case IDC_BUTTON_PATH: + szText[0] = 0; + szTitle[0] = 0; + szFilter[0] = 0; + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hwndDlg; + ofn.lpstrFile = szText; + ofn.nMaxFile = MAX_PATH; + LoadStringW(shell32_hInstance, IDS_PICK_ICON_TITLE, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + ofn.lpstrTitle = szTitle; + LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, sizeof(szFilter) / sizeof(WCHAR)); + ofn.lpstrFilter = szFilter; + if (GetOpenFileNameW(&ofn)) + { + HMODULE hLibrary; + + if (!wcsicmp(pIconContext->szName, szText)) + break; + + DestroyIconList(pIconContext->hDlgCtrl); + + hLibrary = LoadLibraryExW(szText, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); + if (hLibrary == NULL) + break; + FreeLibrary(pIconContext->hLibrary); + pIconContext->hLibrary = hLibrary; + wcscpy(pIconContext->szName, szText); + EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext); + if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) + SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); + else + SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName); + + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + } + break; + } + break; + case WM_MEASUREITEM: + lpmis = (LPMEASUREITEMSTRUCT) lParam; + lpmis->itemHeight = 32; + lpmis->itemWidth = 64; + return TRUE; + case WM_DRAWITEM: + lpdis = (LPDRAWITEMSTRUCT) lParam; + if (lpdis->itemID == -1) + { + break; + } + switch (lpdis->itemAction) + { + case ODA_SELECT: + case ODA_DRAWENTIRE: + index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); + hIcon =(HICON)SendMessage(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, (LPARAM) 0); + + if (lpdis->itemID == index) + { + HBRUSH hBrush; + hBrush = CreateSolidBrush(RGB(0, 0, 255)); + FillRect(lpdis->hDC, &lpdis->rcItem, hBrush); + DeleteObject(hBrush); + } + else + { + HBRUSH hBrush; + hBrush = CreateSolidBrush(RGB(255, 255, 255)); + FillRect(lpdis->hDC, &lpdis->rcItem, hBrush); + DeleteObject(hBrush); + } + DrawIconEx(lpdis->hDC, lpdis->rcItem.left,lpdis->rcItem.top, hIcon, + 0, + 0, + 0, + NULL, + DI_NORMAL); + break; + } + } + + return FALSE; +} + BOOL WINAPI PickIconDlg( - HWND hwndOwner, - LPWSTR lpstrFile, - UINT nMaxFile, - INT* lpdwIconIndex) -{ - FIXME("(%p,%s,%08x,%p):stub.\n", - hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex); - return 0xffffffff; + HWND hwndOwner, + LPWSTR lpstrFile, + UINT nMaxFile, + INT* lpdwIconIndex) +{ + HMODULE hLibrary; + int res; + PICK_ICON_CONTEXT IconContext; + + hLibrary = LoadLibraryExW(lpstrFile, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); + IconContext.hLibrary = hLibrary; + IconContext.Index = *lpdwIconIndex; + wcscpy(IconContext.szName, lpstrFile); + + res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON_DIALOG), hwndOwner, PickIconProc, (LPARAM)&IconContext); + if (res) + { + wcscpy(lpstrFile, IconContext.szName); + *lpdwIconIndex = IconContext.Index; + } + + FreeLibrary(hLibrary); + return res; } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -546,6 +546,19 @@ AUTOCHECKBOX "&Èçïîëçâàíå íà óïëúòíÿâàíå", 28675, 16, 152, 155, 10 END +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 +END STRINGTABLE DISCARDABLE BEGIN @@ -649,6 +662,8 @@ IDS_FOLDER_OPTIONS "Íàñòðîéêè íà ïàïêèòå" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" -END - - + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" +END + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -542,6 +542,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -646,5 +660,6 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,6 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -542,6 +542,20 @@ GROUPBOX "&Formatierungsoptionen", 4610, 7, 121, 170, 49 AUTOCHECKBOX "Sch&nellformatierung", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Komprimierung aktivieren", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,6 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" +END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -543,6 +543,20 @@ GROUPBOX "&Opciones de formato", 4610, 7, 121, 170, 49 AUTOCHECKBOX "Formato &rápido", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Habilitar compresión", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -647,5 +661,7 @@ IDS_FOLDER_OPTIONS "Opciones de carpetas" IDS_RECYCLEBIN_LOCATION "Ubicación de la Papelera de reciclaje" IDS_RECYCLEBIN_DISKSPACE "Espacio disponible" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -545,6 +545,20 @@ GROUPBOX "&Options de formatage", 4610, 7, 121, 170, 49 AUTOCHECKBOX "Formatage rapide", 28674, 16, 135, 155, 10 AUTOCHECKBOX "Activer la compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -649,5 +663,7 @@ IDS_FOLDER_OPTIONS "Options du dossier" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -544,6 +544,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -648,5 +662,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -542,6 +542,20 @@ GROUPBOX "Opzioni di &Formattazione", 4610, 7, 121, 170, 49 AUTOCHECKBOX "Formattazione &rapida", 28674, 16, 135, 155, 10 AUTOCHECKBOX "Abilita la &Compressione", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -646,5 +660,6 @@ IDS_FOLDER_OPTIONS "Opzioni della cartella" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -547,6 +547,20 @@ GROUPBOX "&Opcje", 4610, 7, 121, 170, 49 AUTOCHECKBOX "Szy&bkie formatowanie", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&W³¹cz kompresjê", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -651,5 +665,7 @@ IDS_FOLDER_OPTIONS "Opcje Katalogów" IDS_RECYCLEBIN_LOCATION "Lokalizacja Kosza" IDS_RECYCLEBIN_DISKSPACE "Pozosta³o wolnego miejsca" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -543,6 +543,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -647,5 +661,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -543,6 +543,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -647,5 +661,6 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -540,6 +540,20 @@ GROUPBOX "&Ñïîñîáû ôîðìàòèðîâàíèÿ:", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Áûñòðîå (î÷èñòêà îãëàâëåíèÿ)", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Èñïîëüçîâàòü ñæàòèå", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -643,5 +657,7 @@ IDS_FOLDER_OPTIONS "Ñâîéñòâà ïàïêè" IDS_RECYCLEBIN_LOCATION "Ðàñïîëîæåíèå Êîðçèíû" IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -547,6 +547,20 @@ GROUPBOX "Monosti &formátovania", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Rýchle formátovanie", 28674, 16, 135, 155, 10 AUTOCHECKBOX "Z&apnú kompresiu", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -651,5 +665,7 @@ IDS_FOLDER_OPTIONS "Monosti prieèinka" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -542,6 +542,20 @@ GROUPBOX "&Ñïîñîáè ôîðìàòóâàííÿ", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Øâèäêå (î÷èùåííÿ çì³ñòó)", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ñòèñêàííÿ", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -646,5 +660,7 @@ IDS_FOLDER_OPTIONS "Âëàñòèâîñò³ ïàïêè" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -541,6 +541,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -645,5 +659,7 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -542,6 +542,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -646,7 +660,8 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -542,6 +542,20 @@ GROUPBOX "Format &options", 4610, 7, 121, 170, 49 AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 +END + +IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Icon" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Filename:", -1, 7, 14, 208, 10 + PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL + LTEXT "Icons:", -1, 7, 47, 208, 10 + LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 + PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -646,7 +660,8 @@ IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - + IDS_PICK_ICON_TITLE "Choose Icon" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -18,6 +18,7 @@ <library>gdi32</library> <library>user32</library> <library>comctl32</library> + <library>comdlg32</library> <library>shlwapi</library> <library>ole32</library> <library>version</library> @@ -74,4 +75,5 @@ <file>shv_item_new.c</file> <file>folder_options.c</file> <file>shfldr_netplaces.c</file> + <file>shv_default_context_menu.c</file> </module> Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -2681,6 +2681,9 @@ /// return TRUE; case 14021: + if (This->sIcoPath) + wcscpy(szBuffer, This->sIcoPath); + IconIndex = This->iIcoNdx; if (PickIconDlg(hwndDlg, szBuffer, MAX_PATH, &IconIndex)) { IShellLinkW_fnSetIconLocation((IShellLinkW*)&This->lpvtblw, szBuffer, IconIndex); Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Apr 5 23:30:43 2008 @@ -149,6 +149,12 @@ #define IDD_SHELL_ABOUT_AUTHORS 0x4100 #define IDC_SHELL_ABOUT_AUTHORS 0x4101 #define IDC_SHELL_ABOUT_AUTHORS_LISTBOX 0x4102 +#define IDD_PICK_ICON_DIALOG 0x4120 +#define IDC_PICKICON_LIST 0x4121 +#define IDC_BUTTON_PATH 0x4122 +#define IDC_EDIT_PATH 0x4123 +#define IDS_PICK_ICON_TITLE 0x4124 +#define IDS_PICK_ICON_FILTER 0x4125 #define IDI_SHELL_DOCUMENT 1 #define IDI_SHELL_FOLDER 4

1 0

[janderwald] 32878: - add missing constants
by janderwald＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: janderwald Date: Sat Apr 5 22:05:23 2008 New Revision: 32878 URL: http://svn.reactos.org/svn/reactos?rev=32878&view=rev Log: - add missing constants Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Apr 5 22:05:23 2008 @@ -326,6 +326,9 @@ #define DONT_RESOLVE_DLL_REFERENCES 1 #define LOAD_LIBRARY_AS_DATAFILE 2 #define LOAD_WITH_ALTERED_SEARCH_PATH 8 +#define LOAD_IGNORE_CODE_AUTHZ_LEVEL 16 +#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 32 +#define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 64 #define LMEM_FIXED 0 #define LMEM_MOVEABLE 2 #define LMEM_NONZEROLHND 2

1 0

[arty] 32877: Fix resource initialization order in vfat too.
by arty＠svn.reactos.org 05 Apr '08

05 Apr '08

Author: arty Date: Sat Apr 5 18:22:02 2008 New Revision: 32877 URL: http://svn.reactos.org/svn/reactos?rev=32877&view=rev Log: Fix resource initialization order in vfat too. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Apr 5 18:22:02 2008 @@ -506,6 +506,9 @@ DPRINT("FsDeviceObject %p\n", DeviceObject); + /* Initialize this resource early ... it's used in VfatCleanup */ + ExInitializeResourceLite(&DeviceExt->DirResource); + DeviceExt->FATFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); Fcb = vfatNewFCB(DeviceExt, &NameU); if (Fcb == NULL) @@ -542,7 +545,6 @@ Fcb); DeviceExt->LastAvailableCluster = 2; - ExInitializeResourceLite(&DeviceExt->DirResource); ExInitializeResourceLite(&DeviceExt->FatResource); InitializeListHead(&DeviceExt->FcbListHead);

1 0

[arty] 32876: Initialize this resource before the first potential use.
by arty＠svn.reactos.org 05 Apr '08

05 Apr '08

Author: arty Date: Sat Apr 5 18:12:05 2008 New Revision: 32876 URL: http://svn.reactos.org/svn/reactos?rev=32876&view=rev Log: Initialize this resource before the first potential use. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sat Apr 5 18:12:05 2008 @@ -361,6 +361,11 @@ NewDeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; NewDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + /* Close (and cleanup) might be called from IoCreateStreamFileObject + * but we use this resource from CdfsCleanup, therefore it should be + * initialized no later than this. */ + ExInitializeResourceLite(&DeviceExt->DirResource); + DeviceExt->StreamFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); @@ -406,7 +411,6 @@ Fcb); ExInitializeResourceLite(&DeviceExt->VcbResource); - ExInitializeResourceLite(&DeviceExt->DirResource); KeInitializeSpinLock(&DeviceExt->FcbListLock); InitializeListHead(&DeviceExt->FcbListHead);

1 0

[janderwald] 32875: - fix alignment issues in input.dll - patch by Vytis Girdzijauskas, cman[at]cman[dot]us See issue #3169 for more details.
by janderwald＠svn.reactos.org 05 Apr '08

05 Apr '08

Author: janderwald Date: Sat Apr 5 17:43:21 2008 New Revision: 32875 URL: http://svn.reactos.org/svn/reactos?rev=32875&view=rev Log: - fix alignment issues in input.dll - patch by Vytis Girdzijauskas, cman[at]cman[dot]us See issue #3169 for more details. Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Sat Apr 5 17:43:21 2008 @@ -5,8 +5,8 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Sat Apr 5 17:43:21 2008 @@ -5,8 +5,8 @@ CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wählen Sie die Dienste, die Sie für die Eingabesprachen in der Liste verwenden wollen.\nVerwenden Sie Hinzufügen und Entfernen, um die Liste zu bearbeiten.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + LTEXT "Wählen Sie die Dienste, die Sie für die Eingabesprachen in der Liste verwenden wollen.\nVerwenden Sie Hinzufügen und Entfernen, um die Liste zu bearbeiten.", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Als Standard", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "Ent&fernen...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Sat Apr 5 17:43:21 2008 @@ -5,8 +5,8 @@ CAPTION "Ñõèìßóåéò" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÅðéëÝîôå ôéò õðçñåóßåò ðïõ èÝëåôå ãéá êÜèå ãëþóóá åéóáãùãÞò ðïõ åìöáíßæåôáé óôç ëßóôá.\n×ñçóéìïðïéÞóôå ôá êïõìðéÜ ÐñïóèÞêç êáé ÊáôÜñãçóç ãéá ôçí ôñïðïðïßçóç áõôÞò ôçò ëßóôáò.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + LTEXT "ÅðéëÝîôå ôéò õðçñåóßåò ðïõ èÝëåôå ãéá êÜèå ãëþóóá åéóáãùãÞò ðïõ åìöáíßæåôáé óôç ëßóôá.\n×ñçóéìïðïéÞóôå ôá êïõìðéÜ ÐñïóèÞêç êáé ÊáôÜñãçóç ãéá ôçí ôñïðïðïßçóç áõôÞò ôçò ëßóôáò.", -1, 9, 6, 238, 33 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 42, 237, 95 PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "Ð&ñïóèÞêç...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "&ÊáôÜñãçóç...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Sat Apr 5 17:43:21 2008 @@ -5,8 +5,8 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Sat Apr 5 17:43:21 2008 @@ -5,8 +5,8 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Sat Apr 5 17:43:21 2008 @@ -9,8 +9,8 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Sat Apr 5 17:43:21 2008 @@ -13,8 +13,8 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008