Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 18157: added clb.dll (mostly just stubs) which is required by MS regedit for it's REG_FULL_RESOURCE_DESCRIPTOR editor. As there doesn't seem to be another application that uses it, this place is probably the best for it.
by weiden＠svn.reactos.com 29 Sep '05

29 Sep '05

added clb.dll (mostly just stubs) which is required by MS regedit for it's REG_FULL_RESOURCE_DESCRIPTOR editor. As there doesn't seem to be another application that uses it, this place is probably the best for it. Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/subsys/system/regedit/clb/ Added: trunk/reactos/subsys/system/regedit/clb/clb.c Added: trunk/reactos/subsys/system/regedit/clb/clb.def Added: trunk/reactos/subsys/system/regedit/clb/clb.rc Added: trunk/reactos/subsys/system/regedit/clb/clb.xml Added: trunk/reactos/subsys/system/regedit/clb/clb_En.rc Added: trunk/reactos/subsys/system/regedit/clb/clbdll.h Added: trunk/reactos/subsys/system/regedit/clb/precomp.h Added: trunk/reactos/subsys/system/regedit/clb/resource.h Modified: trunk/reactos/subsys/system/regedit/regedit.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/baseaddress.xml 2005-09-29 16:55:59 UTC (rev 18157) @@ -29,6 +29,7 @@ <property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> <property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> +<property name="BASEADDRESS_CLB" value="0x6f2b0000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-09-29 16:55:59 UTC (rev 18157) @@ -174,6 +174,7 @@ subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 +subsys\system\regedit\clb\clb.dll 1 subsys\system\regsvr32\regsvr32.exe 1 subsys\system\reporterror\reporterror.exe 1 subsys\system\rundll32\rundll32.exe 1 _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.c --- trunk/reactos/subsys/system/regedit/clb/clb.c 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.c 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,310 @@ +/* + * ReactOS Column List Box + * Copyright (C) 2005 Thomas Weidenmueller + * + * 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 + */ +/* + * PROJECT: ReactOS Column List Box + * FILE: lib/clb/clb.c + * PURPOSE: Column List Box + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * UPDATE HISTORY: + * 10/29/2005 Created + */ +#include <precomp.h> + +static HINSTANCE hDllInstance; + +static const WCHAR ClbClassName[] = L"ColumnListBox"; +static const WCHAR ClbColumns[] = L"Column1;Column2;Column3"; + +typedef struct _CLB_PRIVATEDATA +{ + HWND hwnd; +} CLB_PRIVATEDATA, *PCLB_PRIVATEDATA; + +static const CLBS_INFO ClbsSupportedStyles[] = +{ + { + CLBS_NOTIFY, + 0x0, + L"CLBS_NOTIFY" + }, + { + CLBS_SORT, + 0x0, + L"CLBS_SORT" + }, + { + CLBS_DISABLENOSCROLL, + 0x0, + L"CLBS_DISABLENOSCROLL" + }, + { + CLBS_VSCROLL, + 0x0, + L"CLBS_VSCROLL" + }, + { + CLBS_BORDER, + 0x0, + L"CLBS_BORDER" + }, + { + CLBS_POPOUT_HEADINGS, + 0x0, + L"CLBS_POPOUT_HEADINGS" + }, + { + CLBS_SPRINGLY_COLUMNS, + 0x0, + L"CLBS_SPRINGLY_COLUMNS" + }, + { + LBS_OWNERDRAWFIXED, + 0x0, + L"LBS_OWNERDRAWFIXED" + } +}; + +/* + * @unimplemented + */ +DWORD +WINAPI +ClbAddData(IN DWORD Unknown1, + IN DWORD Unknown2, + IN DWORD Unknown3) +{ + DPRINT1("ClbAddData(0x%x, 0x%x, 0x%x)\n", Unknown1, Unknown2, Unknown3); + return 0; +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +ClbSetColumnWidths(IN DWORD Unknown1, + IN DWORD Unknown2, + IN DWORD Unknown3) +{ + DPRINT1("ClbSetColumnWidths(0x%x, 0x%x, 0x%x)\n", Unknown1, Unknown2, Unknown3); + return 0; +} + + +/* + * @unimplemented + */ +LRESULT +CALLBACK +ClbWndProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PCLB_PRIVATEDATA PrivData; + LRESULT Ret = 0; + + DPRINT1("ClbWndProc(0x%p, 0x%x, 0x%p, 0x%p)\n", hwnd, uMsg, wParam, lParam); + + PrivData = (PCLB_PRIVATEDATA)GetWindowLongPtr(hwnd, + 0); + if (PrivData == NULL && uMsg != WM_CREATE) + { + goto HandleDefMsg; + } + + switch (uMsg) + { + case WM_CREATE: + PrivData = HeapAlloc(GetProcessHeap(), + 0, + sizeof(CLB_PRIVATEDATA)); + if (PrivData == NULL) + { + Ret = (LRESULT)-1; + break; + } + PrivData->hwnd = hwnd; + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), + 0, + PrivData); + break; + + default: +HandleDefMsg: + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + } + + return Ret; +} + + +static INT_PTR CALLBACK +ClbpStyleDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + INT_PTR Ret = FALSE; + + DPRINT1("ClbpStyleDlgProc(0x%p, 0x%x, 0x%p, 0x%p)\n", hwndDlg, uMsg, wParam, lParam); + + switch (uMsg) + { + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hwndDlg, + (INT_PTR)LOWORD(wParam)); + break; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, + IDCANCEL); + break; + + case WM_INITDIALOG: + Ret = TRUE; + break; + } + + return Ret; +} + + +/* + * @implemented + */ +INT_PTR +WINAPI +ClbStyleW(IN HWND hWndParent, + IN LPARAM dwInitParam) +{ + return DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_COLUMNLISTBOXSTYLES), + hWndParent, + ClbpStyleDlgProc, + dwInitParam); +} + + +/* + * @implemented + */ +BOOL +WINAPI +CustomControlInfoW(OUT LPCUSTOM_CONTROL_INFO CustomControlInfo OPTIONAL) +{ + if (CustomControlInfo != NULL) + { + wcscpy(CustomControlInfo->ClassName, + ClbClassName); + + CustomControlInfo->Zero1 = 0; + + wcscpy(CustomControlInfo->ClassName2, + ClbClassName); + + CustomControlInfo->Unknown1 = 0x60; /* FIXME - ??? */ + CustomControlInfo->Unknown2 = 0x50; /* FIXME - ??? */ + CustomControlInfo->Unknown3 = 0x50A10013; /* FIXME - ??? */ + + CustomControlInfo->Zero2 = 0; + CustomControlInfo->Zero3 = 0; + + CustomControlInfo->StylesCount = sizeof(ClbsSupportedStyles) / sizeof(ClbsSupportedStyles[0]); + CustomControlInfo->SupportedStyles = ClbsSupportedStyles; + + wcscpy(CustomControlInfo->Columns, + ClbColumns); + + CustomControlInfo->ClbStyleW = ClbStyleW; + + CustomControlInfo->Zero4 = 0; + CustomControlInfo->Zero5 = 0; + CustomControlInfo->Zero6 = 0; + } + + return TRUE; +} + +BOOL +WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + BOOL Ret = TRUE; + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + { + WNDCLASS ClbWndClass; + + hDllInstance = hinstDLL; + + InitCommonControls(); + + /* register the control's window class */ + ClbWndClass.style = CS_GLOBALCLASS | CS_OWNDC; + ClbWndClass.lpfnWndProc = ClbWndProc; + ClbWndClass.cbClsExtra = 0; + ClbWndClass.cbWndExtra = sizeof(PCLB_PRIVATEDATA); + ClbWndClass.hInstance = hinstDLL, + ClbWndClass.hIcon = NULL; + ClbWndClass.hCursor = LoadCursor(NULL, + (LPWSTR)IDC_ARROW); + ClbWndClass.hbrBackground = NULL; + ClbWndClass.lpszMenuName = NULL; + ClbWndClass.lpszClassName = ClbClassName; + + if (!RegisterClass(&ClbWndClass)) + { + Ret = FALSE; + break; + } + break; + } + + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + break; + + case DLL_PROCESS_DETACH: + UnregisterClass(ClbClassName, + hinstDLL); + break; + } + return Ret; +} + Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.def --- trunk/reactos/subsys/system/regedit/clb/clb.def 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.def 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,10 @@ +LIBRARY clb.dll + +EXPORTS +ClbAddData@12 @1 +ClbSetColumnWidths@12 @2 +ClbStyleW@8 @3 +ClbWndProc@16 @4 +CustomControlInfoW@4 @5 + +; EOF Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.rc --- trunk/reactos/subsys/system/regedit/clb/clb.rc 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.rc 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,12 @@ +#include <windows.h> +#include <reactos/resource.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Column List Box\0" +#define REACTOS_STR_INTERNAL_NAME "clb\0" +#define REACTOS_STR_ORIGINAL_FILENAME "clb.dll\0" +#include <reactos/version.rc> + +#include "clb_En.rc" + Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.xml --- trunk/reactos/subsys/system/regedit/clb/clb.xml 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.xml 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,18 @@ +<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll"> + <importlibrary definition="clb.def" /> + <include base="clb">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <file>clb.c</file> + <file>clb.rc</file> + <pch>precomp.h</pch> +</module> Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb_En.rc --- trunk/reactos/subsys/system/regedit/clb/clb_En.rc 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb_En.rc 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,28 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Column List Box Styles" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Column List Box Styles", -1, 6, 7, 158, 71 + CHECKBOX "&Standard", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Border", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "S&ort", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Notif&y", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "V&ert. Scroll Bar", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Multiple Selection", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "E&xtended Selection", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Popout Headings", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Springy Columns", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Basic Styles", -1, 6, 80, 158, 34 + CHECKBOX "&Visible", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Disabled", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Group", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Tab Stop", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "&Disable No-Scroll", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Property changes on: trunk/reactos/subsys/system/regedit/clb/clb_En.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clbdll.h --- trunk/reactos/subsys/system/regedit/clb/clbdll.h 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clbdll.h 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,43 @@ +#ifndef __CLBDLL_H +#define __CLBDLL_H + +#define CLBS_NOTIFY 0x1 +#define CLBS_SORT 0x2 +#define CLBS_DISABLENOSCROLL 0x1000 +#define CLBS_VSCROLL 0x200000 +#define CLBS_BORDER 0x800000 +#define CLBS_POPOUT_HEADINGS 0x200 +#define CLBS_SPRINGLY_COLUMNS 0x0 + +typedef struct _CLBS_INFO +{ + DWORD Style; + DWORD Unknown; /* FIXME - ExStyle??? */ + LPCWSTR StyleName; +} CLBS_INFO, *LPCLBS_INFO; + +typedef struct _CUSTOM_CONTROL_INFO +{ + WCHAR ClassName[32]; + DWORD Zero1; /* sizeof(DWORD) or sizeof(PVOID)? */ + WCHAR ClassName2[32]; + DWORD Unknown1; /* FIXME - size correct? */ + DWORD Unknown2; /* FIXME - size correct? */ + DWORD Unknown3; /* FIXME - size correct? */ + DWORD Zero2; /* FIXME - size correct? */ + DWORD Zero3; /* FIXME - size correct? */ + DWORD StylesCount; + const CLBS_INFO *SupportedStyles; + WCHAR Columns[256]; + INT_PTR (WINAPI *ClbStyleW)(IN HWND hWndParent, + IN LPARAM dwInitParam); + DWORD Zero4; /* FIXME - size correct? */ + DWORD Zero5; /* FIXME - size correct? */ + DWORD Zero6; /* FIXME - size correct? */ +} CUSTOM_CONTROL_INFO, *LPCUSTOM_CONTROL_INFO; + +LRESULT CALLBACK ClbWndProc(HWND,UINT,WPARAM,LPARAM); +INT_PTR WINAPI ClbStyleW(HWND,LPARAM); +BOOL WINAPI CustomControlInfoW(LPCUSTOM_CONTROL_INFO); + +#endif /* __CLBDLL_H */ Property changes on: trunk/reactos/subsys/system/regedit/clb/clbdll.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/precomp.h --- trunk/reactos/subsys/system/regedit/clb/precomp.h 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/precomp.h 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,10 @@ +#include <windows.h> +#include <commctrl.h> +#include <clbdll.h> + +#include "resource.h" + +ULONG DbgPrint(PCH Format,...); +#define DPRINT1 DbgPrint + +/* EOF */ Property changes on: trunk/reactos/subsys/system/regedit/clb/precomp.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/resource.h --- trunk/reactos/subsys/system/regedit/clb/resource.h 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/resource.h 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,6 @@ +#ifndef __CLB_RESOURCE_H +#define __CLB_RESOURCE_H + +#define IDD_COLUMNLISTBOXSTYLES 1700 + +#endif /* __CLB_RESOURCE_H */ Property changes on: trunk/reactos/subsys/system/regedit/clb/resource.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/regedit/regedit.xml --- trunk/reactos/subsys/system/regedit/regedit.xml 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/regedit.xml 2005-09-29 16:55:59 UTC (rev 18157) @@ -26,3 +26,6 @@ <file>treeview.c</file> <file>regedit.rc</file> </module> +<directory name="clb"> + <xi:include href="clb/clb.xml" /> +</directory> \ No newline at end of file

1 0

[greatlrd] 18156: sorry createDirectoryExW fails to create folder why ? change back to CreateDirectoryW sorry
by greatlrd＠svn.reactos.com 29 Sep '05

29 Sep '05

sorry createDirectoryExW fails to create folder why ? change back to CreateDirectoryW sorry Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-29 16:33:08 UTC (rev 18155) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-29 16:55:01 UTC (rev 18156) @@ -346,7 +346,8 @@ */ RemoveReadOnlyAttributeW(lpExistingFileName); RemoveReadOnlyAttributeW(lpNewFileName); - CreateDirectoryExW(lpExistingFileName,lpNewFileName,NULL); + //CreateDirectoryExW(lpExistingFileName,lpNewFileName,NULL); + CreateDirectoryW(lpNewFileName, NULL); /* search the files/folders and move them */ while (loop==TRUE) @@ -479,7 +480,8 @@ RemoveReadOnlyAttributeW(lpDeleteFile); RemoveReadOnlyAttributeW(lpNewFileName2); - CreateDirectoryExW(lpDeleteFile, lpNewFileName2,NULL); + CreateDirectoryW(lpNewFileName2,NULL); + //CreateDirectoryExW(lpDeleteFile, lpNewFileName2,NULL); /* set new search path from src string */

1 0

[greatlrd] 18155: MoveFileWithProgressW for movefolder
by greatlrd＠svn.reactos.com 29 Sep '05

29 Sep '05

MoveFileWithProgressW for movefolder - change from CreateDirectoryW to CreateDirectoryExW - fix close handle bug - overwrite readonly file - make sure both dest and src are not set to readonly - Source cleanup - Remove goto Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-29 12:06:02 UTC (rev 18154) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-29 16:33:08 UTC (rev 18155) @@ -35,132 +35,7 @@ return FALSE; } -static BOOL -AdjustFileAttributes ( - LPCWSTR ExistingFileName, - LPCWSTR NewFileName - ) -{ - IO_STATUS_BLOCK IoStatusBlock; - FILE_BASIC_INFORMATION ExistingInfo, - NewInfo; - HANDLE hFile; - DWORD Attributes; - NTSTATUS errCode; - BOOL Result = FALSE; - hFile = CreateFileW (ExistingFileName, - FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (INVALID_HANDLE_VALUE != hFile) - { - errCode = NtQueryInformationFile (hFile, - &IoStatusBlock, - &ExistingInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (NT_SUCCESS (errCode)) - { - if (0 != (ExistingInfo.FileAttributes & FILE_ATTRIBUTE_READONLY)) - { - Attributes = ExistingInfo.FileAttributes; - ExistingInfo.FileAttributes &= ~ FILE_ATTRIBUTE_READONLY; - if (0 == (ExistingInfo.FileAttributes & - (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_ARCHIVE))) - { - ExistingInfo.FileAttributes |= FILE_ATTRIBUTE_NORMAL; - } - errCode = NtSetInformationFile (hFile, - &IoStatusBlock, - &ExistingInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(errCode)) - { - DPRINT("Removing READONLY attribute from source failed with status 0x%08x\n", errCode); - } - ExistingInfo.FileAttributes = Attributes; - } - CloseHandle(hFile); - - if (NT_SUCCESS(errCode)) - { - hFile = CreateFileW (NewFileName, - FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (INVALID_HANDLE_VALUE != hFile) - { - errCode = NtQueryInformationFile(hFile, - &IoStatusBlock, - &NewInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (NT_SUCCESS(errCode)) - { - NewInfo.FileAttributes = (NewInfo.FileAttributes & - ~ (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_READONLY | - FILE_ATTRIBUTE_NORMAL)) | - (ExistingInfo.FileAttributes & - (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_READONLY | - FILE_ATTRIBUTE_NORMAL)) | - FILE_ATTRIBUTE_ARCHIVE; - NewInfo.CreationTime = ExistingInfo.CreationTime; - NewInfo.LastAccessTime = ExistingInfo.LastAccessTime; - NewInfo.LastWriteTime = ExistingInfo.LastWriteTime; - errCode = NtSetInformationFile (hFile, - &IoStatusBlock, - &NewInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (NT_SUCCESS(errCode)) - { - Result = TRUE; - } - else - { - DPRINT("Setting attributes on dest file failed with status 0x%08x\n", errCode); - } - } - else - { - DPRINT("Obtaining attributes from dest file failed with status 0x%08x\n", errCode); - } - CloseHandle(hFile); - } - else - { - DPRINT("Opening dest file to set attributes failed with code %d\n", GetLastError()); - } - } - } - else - { - DPRINT("Obtaining attributes from source file failed with status 0x%08x\n", errCode); - CloseHandle(hFile); - } - } - else - { - DPRINT("Opening source file to obtain attributes failed with code %d\n", GetLastError()); - } - - return Result; -} - /*********************************************************************** * add_boot_rename_entry * @@ -411,8 +286,7 @@ FileRename->ReplaceIfExists ? 0 : COPY_FILE_FAIL_IF_EXISTS); if (Result) { - /* Cleanup the source file */ - AdjustFileAttributes(lpExistingFileName, lpNewFileName); + /* Cleanup the source file */ Result = DeleteFileW (lpExistingFileName); } } @@ -420,36 +294,40 @@ { /* move folder code start */ WIN32_FIND_DATAW findBuffer; - LPCWSTR lpExistingFileName2 = NULL; - LPCWSTR lpNewFileName2 = NULL; - LPCWSTR lpDeleteFile = NULL; + LPWSTR lpExistingFileName2 = NULL; + LPWSTR lpNewFileName2 = NULL; + LPWSTR lpDeleteFile = NULL; INT size; INT size2; BOOL loop = TRUE; BOOL Result = FALSE; + INT max_size = MAX_PATH; - /* Build the string */ + + /* Build the string */ size = wcslen(lpExistingFileName); + if (size+6> max_size) + max_size = size + 6; - lpDeleteFile = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); - if (lpDeleteFile == NULL) - goto FreeMemAndExit; + lpDeleteFile = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); + if (lpDeleteFile == NULL) + return FALSE; - lpNewFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + lpNewFileName2 = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); if (lpNewFileName2 == NULL) - goto FreeMemAndExit; - - lpExistingFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); - if (lpExistingFileName2 == NULL) - goto FreeMemAndExit; - - if ((size+6)*sizeof(WCHAR)>MAX_PATH) - { - HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(VOID *) lpExistingFileName2,(size+6)*sizeof(WCHAR)); - if (lpExistingFileName2 == NULL) - goto FreeMemAndExit; + { + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + return FALSE; } - + + lpExistingFileName2 = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); + if (lpNewFileName2 == NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + return FALSE; + } + wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); @@ -461,18 +339,16 @@ if (findBuffer.cFileName[0] == L'\0') loop=FALSE; - - DPRINT("MoveFileWithProgressW : lpExistingFileName1 = %S\n",lpExistingFileName); - DPRINT("MoveFileWithProgressW : lpExistingFileName2 = %S\n",lpExistingFileName2); - DPRINT("MoveFileWithProgressW : lpNewFileName = %S\n",lpNewFileName); + - DPRINT("MoveFileWithProgressW : loop = %d %d %d\n",TRUE, FALSE, loop); - - - CreateDirectoryW(lpNewFileName,NULL); - - - /* search the file */ + /* FIXME + * remove readonly flag from source folder and do not set the readonly flag to dest folder + */ + RemoveReadOnlyAttributeW(lpExistingFileName); + RemoveReadOnlyAttributeW(lpNewFileName); + CreateDirectoryExW(lpExistingFileName,lpNewFileName,NULL); + + /* search the files/folders and move them */ while (loop==TRUE) { Result = TRUE; @@ -485,20 +361,26 @@ { size = wcslen(lpExistingFileName2)-4; FindClose(hFile); - wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\0"); + wcscpy( &lpExistingFileName2[size],L"\0"); if (wcsncmp(lpExistingFileName,lpExistingFileName2,size)) { + DWORD Attributes; + FindClose(hFile); /* delete folder */ - DPRINT("MoveFileWithProgressW : folder : %s\n",lpDeleteFile); + DPRINT("MoveFileWithProgressW : Delete folder : %S\n",lpDeleteFile); - - Result = RemoveReadOnlyAttributeW(lpExistingFileName2); - if (Result == FALSE) - break; - + /* remove system folder flag other wise we can not delete the folder */ + Attributes = GetFileAttributesW(lpExistingFileName2); + if (Attributes != INVALID_FILE_ATTRIBUTES) + { + SetFileAttributesW(lpExistingFileName2,(Attributes & ~FILE_ATTRIBUTE_SYSTEM)); + } + + RemoveReadOnlyAttributeW(lpExistingFileName2); + Result = RemoveDirectoryW(lpExistingFileName2); if (Result == FALSE) break; @@ -506,20 +388,22 @@ loop=TRUE; size = wcslen(lpExistingFileName); - if ((size+6)*sizeof(WCHAR)>MAX_PATH) - { - lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *)lpExistingFileName2,(size+6)*sizeof(WCHAR)); - - if (lpExistingFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } + if (size+6>max_size) + { + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; } - wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); - wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); + wcscpy( lpExistingFileName2,lpExistingFileName); + wcscpy( &lpExistingFileName2[size],L"\\*.*\0"); /* Get the file name */ memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); @@ -530,89 +414,75 @@ } if (findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - DPRINT("MoveFileWithProgressW : 1: %S %S\n",lpExistingFileName2,findBuffer.cFileName); + { - /* Build the new string */ + /* Build the new src string */ size = wcslen(findBuffer.cFileName); size2= wcslen(lpExistingFileName2); - if ((size2+size+6)*sizeof(WCHAR)>MAX_PATH) + if (size2+size+6>max_size) { - lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *)lpExistingFileName2, (size2+size+6)*sizeof(WCHAR)); + FindClose(hFile); - if (lpExistingFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; } - wcscpy( (WCHAR *)&lpExistingFileName2[size2-3],findBuffer.cFileName); - + wcscpy( &lpExistingFileName2[size2-3],findBuffer.cFileName); + wcscpy( &lpExistingFileName2[size2+size-3],L"\0"); - /* FIXME - * RemoveReadOnlyAttributeW(lpExistingFileName2); is a hack - * for to move readonly folders - */ - wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\0"); - RemoveReadOnlyAttributeW(lpExistingFileName2); - /* Continue */ - wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\\*.*\0"); + wcscpy( lpDeleteFile,lpExistingFileName2); + wcscpy( &lpExistingFileName2[size2+size-3],L"\\*.*\0"); /* Build the new dst string */ size = wcslen(lpExistingFileName2) + wcslen(lpNewFileName); size2 = wcslen(lpExistingFileName); - if (size>MAX_PATH) + if (size>max_size) { - lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + FindClose(hFile); - if (lpNewFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; } - wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + wcscpy( lpNewFileName2,lpNewFileName); size = wcslen(lpNewFileName); - wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpExistingFileName2[size2]); + wcscpy( &lpNewFileName2[size], &lpExistingFileName2[size2]); size = wcslen(lpNewFileName2); - wcscpy( (WCHAR *)&lpNewFileName2[size-4],L"\0"); + wcscpy( &lpNewFileName2[size-4],L"\0"); + + /* Create Folder */ - /* build dest path */ - /* remove this code when it will be out into kernel32.dll ? */ + /* FIXME + * remove readonly flag from source folder and do not set the readonly flag to dest folder + */ + RemoveReadOnlyAttributeW(lpDeleteFile); + RemoveReadOnlyAttributeW(lpNewFileName2); - size = GetFullPathNameW(lpNewFileName2, MAX_PATH,(LPWSTR) lpDeleteFile, NULL); - if (MAX_PATH>size2) - { - lpDeleteFile = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *) lpDeleteFile,size) ; + CreateDirectoryExW(lpDeleteFile, lpNewFileName2,NULL); + - if (lpDeleteFile == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } - - GetFullPathNameW(lpNewFileName2, size,(LPWSTR) lpDeleteFile, NULL); - } - - /* Create Folder */ - - DPRINT("MoveFileWithProgressW : CreateDirectoryW lpNewFileName2 : %S\n",lpNewFileName2); - DPRINT("MoveFileWithProgressW : CreateDirectoryW : %S\n",lpDeleteFile); - - CreateDirectoryW(lpDeleteFile,NULL); - - DPRINT("MoveFileWithProgressW : 1x: %S : %S \n",lpExistingFileName2, lpNewFileName2); - + /* set new search path from src string */ FindClose(hFile); memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); @@ -623,30 +493,44 @@ /* Build the new string */ size = wcslen(findBuffer.cFileName); size2= wcslen(lpExistingFileName2); - wcscpy( (WCHAR *)lpDeleteFile,lpExistingFileName2); - wcscpy( (WCHAR *)&lpDeleteFile[size2-3],findBuffer.cFileName); + wcscpy( lpDeleteFile,lpExistingFileName2); + wcscpy( &lpDeleteFile[size2-3],findBuffer.cFileName); /* Build dest string */ size = wcslen(lpDeleteFile) + wcslen(lpNewFileName); size2 = wcslen(lpExistingFileName); - if (size*sizeof(WCHAR)>MAX_PATH) - { - lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + if (size>max_size) + { + FindClose(hFile); - if (lpNewFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } - } + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; + } - wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + wcscpy( lpNewFileName2,lpNewFileName); size = wcslen(lpNewFileName); - wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpDeleteFile[size2]); + wcscpy(&lpNewFileName2[size],&lpDeleteFile[size2]); - /* copy file */ + + /* overrite existsen file, if the file got the flag have readonly + * we need reomve that flag + */ + + /* copy file */ + + DPRINT("MoveFileWithProgressW : Copy file : %S to %S\n",lpDeleteFile, lpNewFileName2); + RemoveReadOnlyAttributeW(lpDeleteFile); + RemoveReadOnlyAttributeW(lpNewFileName2); + Result = CopyFileExW (lpDeleteFile, lpNewFileName2, lpProgressRoutine, @@ -654,50 +538,43 @@ NULL, 0); - if (Result == FALSE) - { - DPRINT("MoveFileWithProgressW : Fails\n"); - break; - } - - /* delete file */ - DPRINT("MoveFileWithProgressW : Delete file : %S : %S\n",lpDeleteFile, lpNewFileName2); - - + if (Result == FALSE) + break; + + /* delete file */ + DPRINT("MoveFileWithProgressW : remove readonly flag from file : %S\n",lpNewFileName2); Result = RemoveReadOnlyAttributeW(lpDeleteFile); if (Result == FALSE) break; - Result = DeleteFileW(lpDeleteFile); - if (Result == FALSE) - { - DPRINT("MoveFileWithProgressW : Fails\n"); - break; - } - } - DPRINT("MoveFileWithProgressW : 2 : %S : %S \n",lpExistingFileName2,findBuffer.cFileName); + DPRINT("MoveFileWithProgressW : Delete file : %S\n",lpDeleteFile); + Result = DeleteFileW(lpDeleteFile); + if (Result == FALSE) + break; + + } loop = FindNextFileW(hFile, &findBuffer); } - FindClose(hFile); - memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); - hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); - if (hFile == NULL) - loop=TRUE; - - if (findBuffer.cFileName[0] == L'\0') - loop=TRUE; - - if (loop == FALSE) + + /* Remove last folder */ + if ((loop == FALSE) && (Result != FALSE)) { + DWORD Attributes; + FindClose(hFile); - Result = RemoveDirectoryW(lpExistingFileName); - DPRINT("MoveFileWithProgressW RemoveDirectoryW :%S",lpExistingFileName); + Attributes = GetFileAttributesW(lpDeleteFile); + if (Attributes != INVALID_FILE_ATTRIBUTES) + { + SetFileAttributesW(lpDeleteFile,(Attributes & ~FILE_ATTRIBUTE_SYSTEM)); + } + + Result = RemoveDirectoryW(lpExistingFileName); } - -FreeMemAndExit: - DPRINT("MoveFileWithProgressW : result : r=%d, T=%d, F=%d",Result,TRUE,FALSE); - + + /* Cleanup */ + FindClose(hFile); + if (lpNewFileName2 != NULL) { HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); @@ -716,7 +593,8 @@ lpDeleteFile = NULL; } - return Result; + return Result; + // end move folder code } }

1 0

[hpoussin] 18154: Set eol-style for new resources files
by hpoussin＠svn.reactos.com 29 Sep '05

29 Sep '05

Set eol-style for new resources files Add back Da.rc resources Modified: trunk/reactos/lib/setupapi/Bg.rc Modified: trunk/reactos/lib/setupapi/No.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Modified: trunk/reactos/lib/setupapi/Bg.rc --- trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 11:58:31 UTC (rev 18153) +++ trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 12:06:02 UTC (rev 18154) @@ -1,34 +1,34 @@ -/* - * Bulgarian resources for SETUPAPI - * - * 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 - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "?¯´ÞÓÝÕ ÝÓ ¶ÓÚÙ¯ÔÕ..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "?þ?¯¸ÝÞÛ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "ÍÕÙ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Bulgarian resources for SETUPAPI + * + * 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 + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "?¯´ÞÓÝÕ ÝÓ ¶ÓÚÙ¯ÔÕ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "?þ?¯¸ÝÞÛ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ÍÕÙ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Bg.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/No.rc --- trunk/reactos/lib/setupapi/No.rc 2005-09-29 11:58:31 UTC (rev 18153) +++ trunk/reactos/lib/setupapi/No.rc 2005-09-29 12:06:02 UTC (rev 18154) @@ -1,34 +1,34 @@ -/* - * Norwegian BokmÕl resources for SETUPAPI - * - * Copyright 2005 Alexander N. S°rnes <alex(a)thehandofagony.com> - * - * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Kopierer filer . . ." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Kilde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "MÕl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Norwegian BokmÕl resources for SETUPAPI + * + * Copyright 2005 Alexander N. S°rnes <alex(a)thehandofagony.com> + * + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopierer filer . . ." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Kilde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "MÕl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/No.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 11:58:31 UTC (rev 18153) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 12:06:02 UTC (rev 18154) @@ -26,6 +26,7 @@ #include "Bg.rc" #include "Cs.rc" +#include "Da.rc" #include "De.rc" #include "En.rc" #include "Es.rc"

1 0

[hpoussin] 18153: - Milko Krachounov <milko@3mhz.net>
by hpoussin＠svn.reactos.com 29 Sep '05

29 Sep '05

- Milko Krachounov <milko(a)3mhz.net> Added Bulgarian translations. - Alexander N. Sørnes <alex(a)thehandofagony.com> Added Norwegian translations. Added: trunk/reactos/lib/setupapi/Bg.rc Added: trunk/reactos/lib/setupapi/No.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Added: trunk/reactos/lib/setupapi/Bg.rc --- trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 09:46:35 UTC (rev 18152) +++ trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 11:58:31 UTC (rev 18153) @@ -0,0 +1,34 @@ +/* + * Bulgarian resources for SETUPAPI + * + * 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 + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "?¯´ÞÓÝÕ ÝÓ ¶ÓÚÙ¯ÔÕ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "?þ?¯¸ÝÞÛ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ÍÕÙ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Added: trunk/reactos/lib/setupapi/No.rc --- trunk/reactos/lib/setupapi/No.rc 2005-09-29 09:46:35 UTC (rev 18152) +++ trunk/reactos/lib/setupapi/No.rc 2005-09-29 11:58:31 UTC (rev 18153) @@ -0,0 +1,34 @@ +/* + * Norwegian BokmÕl resources for SETUPAPI + * + * Copyright 2005 Alexander N. S°rnes <alex(a)thehandofagony.com> + * + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopierer filer . . ." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Kilde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "MÕl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 09:46:35 UTC (rev 18152) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 11:58:31 UTC (rev 18153) @@ -24,8 +24,8 @@ #include "winnls.h" #include "setupapi_private.h" +#include "Bg.rc" #include "Cs.rc" -#include "Da.rc" #include "De.rc" #include "En.rc" #include "Es.rc" @@ -34,6 +34,7 @@ #include "It.rc" #include "Ja.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Pt.rc" #include "Ru.rc"

1 0

[hpoussin] 18152: Don't tell to MultiByteToWideChar that buffer is bigger than its real size. The size is in characters, not in bytes.
by hpoussin＠svn.reactos.com 29 Sep '05

29 Sep '05

Don't tell to MultiByteToWideChar that buffer is bigger than its real size. The size is in characters, not in bytes. Spotted by Robert Shearman <rob(a)codeweavers.com> Modified: trunk/reactos/lib/setupapi/parser.c _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-09-29 03:39:38 UTC (rev 18151) +++ trunk/reactos/lib/setupapi/parser.c 2005-09-29 09:46:35 UTC (rev 18152) @@ -956,8 +956,7 @@ WCHAR *new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); if (new_buff) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, buffer, size, new_buff, - size * sizeof(WCHAR) ); + DWORD len = MultiByteToWideChar( CP_ACP, 0, buffer, size, new_buff, size ); err = parse_buffer( file, new_buff, new_buff + len, error_line ); HeapFree( GetProcessHeap(), 0, new_buff ); }

1 0

[npwoods] 18151: Christoph_vW: Updated notepad rc files to match Windows notepad's menu layout (bug #839)
by npwoods＠svn.reactos.com 29 Sep '05

29 Sep '05

Christoph_vW: Updated notepad rc files to match Windows notepad's menu layout (bug #839) Modified: trunk/reactos/subsys/system/notepad/Cs.rc Modified: trunk/reactos/subsys/system/notepad/Da.rc Modified: trunk/reactos/subsys/system/notepad/De.rc Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/Es.rc Modified: trunk/reactos/subsys/system/notepad/Fi.rc Modified: trunk/reactos/subsys/system/notepad/Fr.rc Modified: trunk/reactos/subsys/system/notepad/Hu.rc Modified: trunk/reactos/subsys/system/notepad/It.rc Modified: trunk/reactos/subsys/system/notepad/Ja.rc Modified: trunk/reactos/subsys/system/notepad/Nl.rc Modified: trunk/reactos/subsys/system/notepad/Pl.rc Modified: trunk/reactos/subsys/system/notepad/Pt.rc Modified: trunk/reactos/subsys/system/notepad/Ru.rc Modified: trunk/reactos/subsys/system/notepad/Si.rc Modified: trunk/reactos/subsys/system/notepad/Sv.rc Modified: trunk/reactos/subsys/system/notepad/Th.rc Modified: trunk/reactos/subsys/system/notepad/Wa.rc Modified: trunk/reactos/subsys/system/notepad/Zh.rc Modified: trunk/reactos/subsys/system/notepad/notepad_res.h _____ Modified: trunk/reactos/subsys/system/notepad/Cs.rc --- trunk/reactos/subsys/system/notepad/Cs.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Cs.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,26 +45,21 @@ MENUITEM "&Vlo¥it\tCtrl+V", CMD_PASTE MENUITEM "&Smazat\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH + MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Vybrat v?&e\tCtrl+A", CMD_SELECT_ALL MENUITEM "?&as/Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "Zalo&mit dlouhÚ °ßdky", CMD_WRAP MENUITEM "&PÝsmo...", CMD_FONT } -POPUP "&HledßnÝ" { - MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH - MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT - } POPUP "&Nßpovýda" { MENUITEM "&Obsah", CMD_HELP_CONTENTS MENUITEM "&NajÝt...", CMD_HELP_SEARCH MENUITEM "&Pomoc k nßpovýdý", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Licence", CMD_LICENSE - MENUITEM "&BEZ Z?RUKY", CMD_NO_WARRANTY - MENUITEM "&O Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Da.rc --- trunk/reactos/subsys/system/notepad/Da.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Da.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -28,8 +28,8 @@ MENUITEM "?&bn\tEnter", CMD_OPEN MENUITEM "&Gem", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS - MENUITEM "&Udskriv", CMD_PRINT MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP + MENUITEM "&Udskriv", CMD_PRINT MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Afslut", CMD_EXIT @@ -56,11 +56,7 @@ MENUITEM "&S°g efter hjµlp om...", CMD_HELP_SEARCH MENUITEM "&Brug af Hjµlp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&Om Notesblok..." { - MENUITEM "&Licens", CMD_LICENSE - MENUITEM "&Ingen Garanti", CMD_NO_WARRANTY - MENUITEM "&Om WINE", CMD_ABOUT_WINE - } + MENUITEM "&Om Notesblok", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/De.rc --- trunk/reactos/subsys/system/notepad/De.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/De.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -30,8 +30,8 @@ MENUITEM "&Speichern", CMD_SAVE MENUITEM "Speichern &unter...", CMD_SAVE_AS MENUITEM SEPARATOR + MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP MENUITEM "&Drucken", CMD_PRINT - MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Beenden", CMD_EXIT @@ -44,26 +44,27 @@ MENUITEM "&Einf³gen\tStrg+V", CMD_PASTE MENUITEM "&L÷schen\tEntf", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "Suchen...", CMD_SEARCH + MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ersetzen\tCtrl+H", CMD_REPLACE + MENUITEM "Gehe zu...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR MENUITEM "Alles &markieren", CMD_SELECT_ALL MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR + } +POPUP "F&ormat" { MENUITEM "&Zeilenumbruch", CMD_WRAP - MENUITEM "&Schriftarten...", CMD_FONT - } -POPUP "&Suchen" { - MENUITEM "Suchen...", CMD_SEARCH - MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT - } + MENUITEM "&Schriftart...", CMD_FONT +} +POPUP "&Anicht" { + MENUITEM "Status&leiste", CMD_STATUSBAR +} POPUP "&Hilfe" { MENUITEM "&Inhalt", CMD_HELP_CONTENTS MENUITEM "&Suchen...", CMD_HELP_SEARCH MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Lizenz", CMD_LICENSE - MENUITEM "&KEINE GARANTIE", CMD_NO_WARRANTY - MENUITEM "&?ber Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/En.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -30,8 +30,8 @@ MENUITEM "&Save\tCtrl+S", CMD_SAVE MENUITEM "Save &as...", CMD_SAVE_AS MENUITEM SEPARATOR + MENUITEM "Page Se&tup...", CMD_PAGE_SETUP MENUITEM "&Print", CMD_PRINT - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "E&xit", CMD_EXIT @@ -44,28 +44,29 @@ MENUITEM "&Paste\tCtrl+V", CMD_PASTE MENUITEM "&Delete\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - } -POPUP "&Search" { MENUITEM "&Find...\tCtrl+F", CMD_SEARCH MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT MENUITEM "Replace\tCtrl+H", CMD_REPLACE MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Time/Date\tF5", CMD_TIME_DATE } +POPUP "F&ormat" { + MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Font...", CMD_FONT +} +POPUP "&View" { + MENUITEM "Status&bar", CMD_STATUSBAR +} POPUP "&Help" { MENUITEM "&Contents", CMD_HELP_CONTENTS MENUITEM "&Search...", CMD_HELP_SEARCH MENUITEM "&Help on help", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&License", CMD_LICENSE - MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY - MENUITEM "&About Wine", CMD_ABOUT_WINE - } + MENUITEM "&License", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "Inf&o", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Es.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -46,6 +46,9 @@ MENUITEM "&Pegar\tCtrl+V", CMD_PASTE MENUITEM "&Borrar\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH + MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE MENUITEM SEPARATOR @@ -53,19 +56,13 @@ MENUITEM "Tipo de &letra...", CMD_FONT } POPUP "&Buscar" { - MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH - MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT } POPUP "A&yuda" { MENUITEM "?&ndice", CMD_HELP_CONTENTS MENUITEM "&Buscar...", CMD_HELP_SEARCH MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&Informaci¾n..." { - MENUITEM "&Licencia", CMD_LICENSE - MENUITEM "SIN &GARANT?A", CMD_NO_WARRANTY - MENUITEM "&Acerca de Wine", CMD_ABOUT_WINE - } + MENUITEM "&Informaci¾n...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Fi.rc --- trunk/reactos/subsys/system/notepad/Fi.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Fi.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -42,25 +42,20 @@ MENUITEM "L&iitõ\tCtrl+V", CMD_PASTE MENUITEM "P&oista\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "Etsi...", CMD_SEARCH + MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "&Valitse kaikki", CMD_SELECT_ALL MENUITEM "&Aika/Põivõmõõrõ\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "Ka&tkaise pitkõ rivi", CMD_WRAP } -POPUP "&Etsi" { - MENUITEM "Etsi...", CMD_SEARCH - MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT - } POPUP "&Apua" { MENUITEM "&Sisõlt÷", CMD_HELP_CONTENTS MENUITEM "&Etsi...", CMD_HELP_SEARCH MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Lisenssi", CMD_LICENSE - MENUITEM "&EI TAKUUTA", CMD_NO_WARRANTY - MENUITEM "&Tietoja Wine:ista", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Fr.rc --- trunk/reactos/subsys/system/notepad/Fr.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Fr.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -44,26 +44,21 @@ MENUITEM "C&oller\tCtrl+V", CMD_PASTE MENUITEM "&Effacer\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH + MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Tout &sÚlectionner\tCtrl+A", CMD_SELECT_ALL MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Retour Ó la ligne", CMD_WRAP MENUITEM "&Police...", CMD_FONT } -POPUP "&Rechercher" { - MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH - MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT - } POPUP "&Aide" { MENUITEM "&Sommaire", CMD_HELP_CONTENTS MENUITEM "&Rechercher...", CMD_HELP_SEARCH MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Licence", CMD_LICENSE - MENUITEM "&AUCUNE GARANTIE", CMD_NO_WARRANTY - MENUITEM "&A propos de Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Hu.rc --- trunk/reactos/subsys/system/notepad/Hu.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Hu.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -43,25 +43,20 @@ MENUITEM "&BeillesztÚs\tCtrl+V", CMD_PASTE MENUITEM "T÷r&lÚs\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&KeresÚs...", CMD_SEARCH + MENUITEM "K÷ve&tkez§ keresÚse\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "&Az ÷sszes kijel÷lÚse", CMD_SELECT_ALL MENUITEM "&Id§/dßtum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Hossz· sorok t÷rdelÚse", CMD_WRAP } -POPUP "&KeresÚs" { - MENUITEM "&KeresÚs...", CMD_SEARCH - MENUITEM "K÷ve&tkez§ keresÚse\tF3", CMD_SEARCH_NEXT - } POPUP "&S·g¾" { MENUITEM "&TÚmak÷r÷k", CMD_HELP_CONTENTS MENUITEM "&KeresÚs...", CMD_HELP_SEARCH MENUITEM "&Hasznßlat", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&ormßci¾..." { - MENUITEM "&Licenc", CMD_LICENSE - MENUITEM "&SEMMI GARANCIA", CMD_NO_WARRANTY - MENUITEM "&Wine nÚvjegy", CMD_ABOUT_WINE - } + MENUITEM "Inf&ormßci¾...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/It.rc --- trunk/reactos/subsys/system/notepad/It.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/It.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -46,26 +46,21 @@ MENUITEM "&Incolla\tCtrl+V", CMD_PASTE MENUITEM "&Elimina\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Trova\tCtrl+F", CMD_SEARCH + MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Seleziona &tutto\tCtrl+A", CMD_SELECT_ALL MENUITEM "&Ora/Data\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&A campo automatico", CMD_WRAP MENUITEM "&Imposta carattere...", CMD_FONT } -POPUP "&Trova" { - MENUITEM "&Trova\tCtrl+F", CMD_SEARCH - MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT - } POPUP "&Aiuto" { MENUITEM "&Contenuti", CMD_HELP_CONTENTS MENUITEM "&Trova...", CMD_HELP_SEARCH MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Licenza", CMD_LICENSE - MENUITEM "&Garanzia", CMD_NO_WARRANTY - MENUITEM "&Informazioni sul Blocco Note", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Ja.rc --- trunk/reactos/subsys/system/notepad/Ja.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Ja.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -44,26 +44,21 @@ MENUITEM "âyü[âXâg(&P)\tCtrl+V", CMD_PASTE MENUITEM "ìÝÅ£(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "îfì§(&S)\tCtrl+F", CMD_SEARCH + MENUITEM "Äfé?î¾òÔéîfì§(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "æSé?æIæ(&a)\tCtrl+A", CMD_SELECT_ALL MENUITEM "ô·òtéãÄ×ìÅ(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "ÆÀéóìséÉ?éÞòÈéÀ(&W)", CMD_WRAP MENUITEM "âtâHâôâg(&F)...", CMD_FONT } -POPUP "îfì§(&S)" { - MENUITEM "îfì§(&S)\tCtrl+F", CMD_SEARCH - MENUITEM "Äfé?î¾òÔéîfì§(&S)\tF3", CMD_SEARCH_NEXT - } POPUP "âwâïâv(&H)" { MENUITEM "û?Äf(&C)", CMD_HELP_CONTENTS MENUITEM "îfì§(&S)...", CMD_HELP_SEARCH MENUITEM "âwâïâvé?Ägéóò¹(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Å¯ò±(&o)..." { - MENUITEM "âëâCâZâôâX(&L)", CMD_LICENSE - MENUITEM "ûóò?ÅÏ(&N)", CMD_NO_WARRANTY - MENUITEM "Wineé?é?éóé?(&A)", CMD_ABOUT_WINE - } + MENUITEM "Å¯ò±(&o)...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Nl.rc --- trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -1,4 +1,4 @@ -/* +´??/* * Notepad (Dutch resources) * * Copyright 2003 Hans Leidekker @@ -42,26 +42,21 @@ MENUITEM "&Plakken\tCtrl+V", CMD_PASTE MENUITEM "&Verwijderen\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH + MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "&Alles selecteren\tCtrl+A", CMD_SELECT_ALL MENUITEM "Tijd/&datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "A&utomatische terugloop", CMD_WRAP MENUITEM "&Lettertype instellen...", CMD_FONT } -POPUP "&Zoeken" { - MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH - MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT - } POPUP "&Help" { MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS MENUITEM "&Zoeken...", CMD_HELP_SEARCH MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Licentie", CMD_LICENSE - MENUITEM "&GEEN GARANTIE", CMD_NO_WARRANTY - MENUITEM "&Over Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Pl.rc --- trunk/reactos/subsys/system/notepad/Pl.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Pl.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,26 +45,21 @@ MENUITEM "Wkl&ej\tCtrl+V", CMD_PASTE MENUITEM "&Usu±\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Znajdf\tCtrl+F", CMD_SEARCH + MENUITEM "Z&najdf nastÛpny\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Zaznacz w&szystko\tCtrl+A", CMD_SELECT_ALL MENUITEM "Godzina/&Data\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Zawijanie wierszy", CMD_WRAP MENUITEM "Czci&onka...", CMD_FONT } -POPUP "&Znajdf" { - MENUITEM "&Znajdf\tCtrl+F", CMD_SEARCH - MENUITEM "Z&najdf nastÛpny\tF3", CMD_SEARCH_NEXT - } POPUP "Pomo&c" { MENUITEM "&Tematy pomocy", CMD_HELP_CONTENTS MENUITEM "&Szukaj...", CMD_HELP_SEARCH MENUITEM "&Pomoc", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "In&fo..." { - MENUITEM "&Licencja", CMD_LICENSE - MENUITEM "&BEZ GWARANCJI", CMD_NO_WARRANTY - MENUITEM "&O Wine...", CMD_ABOUT_WINE - } + MENUITEM "In&fo...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Pt.rc --- trunk/reactos/subsys/system/notepad/Pt.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Pt.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,26 +45,21 @@ MENUITEM "C&olar\tCtrl+V", CMD_PASTE MENUITEM "E&xcluir\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Localizar...", CMD_SEARCH + MENUITEM "Localizar &pr¾xima\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Selecionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Quebrar automßtica de linha", CMD_WRAP MENUITEM "&Fonte...", CMD_FONT } -POPUP "&Pesquisa" { - MENUITEM "&Localizar...", CMD_SEARCH - MENUITEM "Localizar &pr¾xima\tF3", CMD_SEARCH_NEXT - } POPUP "&Ajuda" { MENUITEM "&Conte·do", CMD_HELP_CONTENTS MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&Informaþ§es..." { - MENUITEM "&Licenþa", CMD_LICENSE - MENUITEM "&SEM GARANTIA", CMD_NO_WARRANTY - MENUITEM "&Sobre o Wine", CMD_ABOUT_WINE - } + MENUITEM "&Informaþ§es...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Ru.rc --- trunk/reactos/subsys/system/notepad/Ru.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Ru.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -40,25 +40,20 @@ MENUITEM "?±?&ÓÔÞ?³\tCtrl+V", CMD_PASTE MENUITEM "&ËõÓÙÞ?³\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&?ÓÚ?Þ", CMD_SEARCH + MENUITEM "?ÓÚ?Þ &õÓÙÕÕ\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "?¹õÕÙÞ?³ Ô&±Õ", CMD_SELECT_ALL MENUITEM "?Õý& Þ õÓ?Ó\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&¤ÕÕÝ¯± ´¯ ±Ù¯ÔÓý", CMD_WRAP } -POPUP "¤&¯Þ±Û" { - MENUITEM "&?ÓÚ?Þ", CMD_SEARCH - MENUITEM "?ÓÚ?Þ &õÓÙÕÕ\tF3", CMD_SEARCH_NEXT - } POPUP "&Ð´ÓÔÛÓ" { MENUITEM "&Ð¯õÕµÓÝÞÕ", CMD_HELP_CONTENTS MENUITEM "&¤¯Þ±Û...", CMD_HELP_SEARCH MENUITEM "&?±´¯Ù³þ¯ÔÓÝÞÕ ±´ÓÔÛÞ", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&ÐÔÕõÕÝÞ ..." { - MENUITEM "&?Þ÷ÕÝþÞ ", CMD_LICENSE - MENUITEM "&??Ã ??ð??Ê??", CMD_NO_WARRANTY - MENUITEM "&O Wine", CMD_ABOUT_WINE - } + MENUITEM "&ÐÔÕõÕÝÞ ...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Si.rc --- trunk/reactos/subsys/system/notepad/Si.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Si.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -42,25 +42,20 @@ MENUITEM "&Prilepi\tCtrl+V", CMD_PASTE MENUITEM "Izbri&Üi\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Najdi ...", CMD_SEARCH + MENUITEM "Na&daljuj iskanje\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Izberi &vse", CMD_SELECT_ALL MENUITEM "?as/&Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "Pr&elom vrstice", CMD_WRAP } -POPUP "&Iskanje" { - MENUITEM "&Najdi ...", CMD_SEARCH - MENUITEM "Na&daljuj iskanje\tF3", CMD_SEARCH_NEXT - } POPUP "&PomoÞ" { MENUITEM "&Teme pomoÞi", CMD_HELP_CONTENTS MENUITEM "&Najdi ...", CMD_HELP_SEARCH MENUITEM "&O pomoÞi", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&ormacije ..." { - MENUITEM "&LicenÞna pogodba", CMD_LICENSE - MENUITEM "&BREZ GARANCIJE", CMD_NO_WARRANTY - MENUITEM "&O Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&ormacije ...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Sv.rc --- trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -44,25 +44,20 @@ MENUITEM "K&listra in\tCtrl+V", CMD_PASTE MENUITEM "&Ta bort\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "S÷k...", CMD_SEARCH + MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Markera &allt", CMD_SELECT_ALL MENUITEM "&Tid/datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Automatiskt radbyte", CMD_WRAP } -POPUP "&S÷k" { - MENUITEM "S÷k...", CMD_SEARCH - MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT - } POPUP "&Hjõlp" { MENUITEM "&InnehÕll", CMD_HELP_CONTENTS MENUITEM "&S÷k...", CMD_HELP_SEARCH MENUITEM "Anvisningar f÷r hjõlpen", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&ormation..." { - MENUITEM "&Licens", CMD_LICENSE - MENUITEM "&INGEN GARANTI", CMD_NO_WARRANTY - MENUITEM "&Om Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&ormation...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Th.rc --- trunk/reactos/subsys/system/notepad/Th.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Th.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -42,26 +42,21 @@ MENUITEM "ÃÊº\tCtrl+V", CMD_PASTE MENUITEM "??\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "ñÚ??Ê\tCtrl+F", CMD_SEARCH + MENUITEM "ñÚ??ÊÁÞ?õ?\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Ó?Î?íÀÐÚº???\tCtrl+A", CMD_SELECT_ALL MENUITEM "ÃÐ?ÀiÞ/\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "?Þ????ÀÐ??ÊÃ", CMD_WRAP MENUITEM "???ß???ÐÃ?Ðí??...", CMD_FONT } - POPUP "ñÐ??Ê" { - MENUITEM "ñÚ??Ê\tCtrl+F", CMD_SEARCH - MENUITEM "ñÚ??ÊÁÞ?õ?\tF3", CMD_SEARCH_NEXT - } POPUP "¬ÞÃ?Ó??i?" { MENUITEM "Ó?ÎÚ??Ê", CMD_HELP_CONTENTS MENUITEM "ñÚ??Ê...", CMD_HELP_SEARCH MENUITEM "ÓíiÞ?ÃíÐ?¬ÞÃ?Ó??i?", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "?Ê??ðÓ?i??..." { - MENUITEM "Ò???Ï¡ÊÁ", CMD_LICENSE - MENUITEM "õ?Þ?i WARRANTY", CMD_NO_WARRANTY - MENUITEM "ÓíiÞ?ÃíÐ? Wine... ", CMD_ABOUT_WINE - } + MENUITEM "?Ê??ðÓ?i??...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Wa.rc --- trunk/reactos/subsys/system/notepad/Wa.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Wa.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,25 +45,20 @@ MENUITEM "C&laper\tCtrl+V", CMD_PASTE MENUITEM "&Rafacer\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "Cwer¯...", CMD_SEARCH + MENUITEM "&Sh¹vant\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "&Tchwezi totafwait", CMD_SELECT_ALL MENUITEM "&Eure/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "C¶per les ro&yes", CMD_WRAP } -POPUP "C&wer¯" { - MENUITEM "Cwer¯...", CMD_SEARCH - MENUITEM "&Sh¹vant\tF3", CMD_SEARCH_NEXT - } POPUP "&Aide" { MENUITEM "?&dvins", CMD_HELP_CONTENTS MENUITEM "C&wer¯...", CMD_HELP_SEARCH MENUITEM "&Aide so l' Aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&InformÕcion..." { - MENUITEM "&Licinse", CMD_LICENSE - MENUITEM "&NOLE WARANTEYE", CMD_NO_WARRANTY - MENUITEM "? &dfait di Wine", CMD_ABOUT_WINE - } + MENUITEM "&InformÕcion...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Zh.rc --- trunk/reactos/subsys/system/notepad/Zh.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Zh.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -39,25 +39,20 @@ MENUITEM "i??¨ú¿&Pú®\tCtrl+V", CMD_PASTE MENUITEM "?¥?²ú¿&Dú®\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "?Ð?¸ú¿&Sú®", CMD_SEARCH + MENUITEM "?Ð?¸¤?Ê?©÷ú¿&Sú®\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "?½Ðíú¿&Aú®", CMD_SELECT_ALL MENUITEM "?Õ?Ù?iã?íó???õú¿&Tú®\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "ÎÈÂ»??ððú¿&Wú®", CMD_WRAP } -POPUP "?Ð?¸ú¿&Sú®" { - MENUITEM "?Ð?¸ú¿&Sú®", CMD_SEARCH - MENUITEM "?Ð?¸¤?Ê?©÷ú¿&Sú®\tF3", CMD_SEARCH_NEXT - } POPUP "?´Í·ú¿&Hú®" { MENUITEM "???¦ú¿&Cú®", CMD_HELP_CONTENTS MENUITEM "?Ð?¸ú¿&Sú®...", CMD_HELP_SEARCH MENUITEM "?þ????Ë??´Í·ú¿&Hú®", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Î??¤ð?¤óú¿&Oú®..." { - MENUITEM "Ë??ºðÝ??ð¡ÊÚú¿&Lú®", CMD_LICENSE - MENUITEM "È???Ì?Ïú¿&Nú®", CMD_NO_WARRANTY - MENUITEM "?ÏË? Wineú¿&Aú®", CMD_ABOUT_WINE - } + MENUITEM "Î??¤ð?¤óú¿&Oú®...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/notepad_res.h --- trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-29 03:39:38 UTC (rev 18151) @@ -54,6 +54,8 @@ #define CMD_WRAP 0x119 #define CMD_FONT 0x140 +#define CMD_STATUSBAR 0x150 + #define CMD_HELP_CONTENTS 0x130 #define CMD_HELP_SEARCH 0x131 #define CMD_HELP_ON_HELP 0x132

1 0

[npwoods] 18150: Christoph_vW: regedit: make "modify" to default menu entry (bug #840)
by npwoods＠svn.reactos.com 29 Sep '05

29 Sep '05

Christoph_vW: regedit: make "modify" to default menu entry (bug #840) Modified: trunk/reactos/subsys/system/regedit/main.c _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-09-29 03:07:26 UTC (rev 18149) +++ trunk/reactos/subsys/system/regedit/main.c 2005-09-29 03:33:28 UTC (rev 18150) @@ -118,12 +118,13 @@ /* Initialize the Windows Common Controls DLL */ InitCommonControls(); + HMENU hEditMenu; + hEditMenu = GetSubMenu(hMenuFrame, 1); + AclUiAvailable = InitializeAclUiDll(); if(!AclUiAvailable) { - HMENU hEditMenu; /* hide the Edit/Permissions... menu entry */ - hEditMenu = GetSubMenu(hMenuFrame, 1); if(hEditMenu != NULL) { RemoveMenu(hEditMenu, ID_EDIT_PERMISSIONS, MF_BYCOMMAND); @@ -132,6 +133,9 @@ } } + if(hEditMenu != NULL) + SetMenuDefaultItem(hEditMenu, ID_EDIT_MODIFY, MF_BYCOMMAND); + nClipboardFormat = RegisterClipboardFormat(strClipboardFormat); /* if (nClipboardFormat == 0) { DWORD dwError = GetLastError();

1 0

[npwoods] 18149: Regedit: Set up the export all/export branch UI; currently disabled for now
by npwoods＠svn.reactos.com 29 Sep '05

29 Sep '05

Regedit: Set up the export all/export branch UI; currently disabled for now Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/resource.h _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-09-29 02:50:38 UTC (rev 18148) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-09-29 03:07:26 UTC (rev 18149) @@ -349,11 +349,15 @@ * Dialog */ -IDD_DIALOG1 DIALOG DISCARDABLE 50, 50, 268, 98 +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Sans Serif" BEGIN + GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 + CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-29 02:50:38 UTC (rev 18148) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-29 03:07:26 UTC (rev 18149) @@ -183,25 +183,6 @@ return TRUE; } -static UINT_PTR CALLBACK ImportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) -{ - OPENFILENAME* pOpenFileName; - OFNOTIFY* pOfNotify; - - switch (uiMsg) { - case WM_INITDIALOG: - pOpenFileName = (OPENFILENAME*)lParam; - break; - case WM_NOTIFY: - pOfNotify = (OFNOTIFY*)lParam; - if (pOfNotify->hdr.code == CDN_INITDONE) {} - break; - default: - break; - } - return 0L; -} - #define MAX_CUSTOM_FILTER_SIZE 50 TCHAR CustomFilterBuffer[MAX_CUSTOM_FILTER_SIZE]; TCHAR FileNameBuffer[_MAX_PATH]; @@ -311,6 +292,37 @@ } +static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hControl; + UINT_PTR iResult = 0; + + switch(uiMsg) { + case WM_INITDIALOG: + hControl = GetDlgItem(hdlg, IDC_EXPORT_ALL); + if (hControl) + { + EnableWindow(hControl, FALSE); + SendMessage(hControl, BM_SETCHECK, BST_CHECKED, 0); + } + + hControl = GetDlgItem(hdlg, IDC_EXPORT_BRANCH); + if (hControl) + { + EnableWindow(hControl, FALSE); + SendMessage(hControl, BM_SETCHECK, BST_UNCHECKED, 0); + } + + hControl = GetDlgItem(hdlg, IDC_EXPORT_BRANCH_TEXT); + if (hControl) + { + EnableWindow(hControl, FALSE); + } + break; + } + return iResult; +} + static BOOL ExportRegistryFile(HWND hWnd) { OPENFILENAME ofn; @@ -322,9 +334,9 @@ LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, sizeof(Caption)/sizeof(TCHAR)); ofn.lpstrTitle = Caption; /* ofn.lCustData = ;*/ - ofn.Flags = OFN_ENABLETEMPLATE + OFN_EXPLORER; - ofn.lpfnHook = ImportRegistryFile_OFNHookProc; - ofn.lpTemplateName = MAKEINTRESOURCE(IDD_DIALOG1); + ofn.Flags = OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_ENABLEHOOK; + ofn.lpfnHook = ExportRegistryFile_OFNHookProc; + ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { BOOL result; /* FIXME - convert strings to ascii! */ _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-09-29 02:50:38 UTC (rev 18148) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-09-29 03:07:26 UTC (rev 18149) @@ -35,7 +35,7 @@ #define IDC_REGEDIT 109 #define IDC_REGEDIT_FRAME 110 #define IDR_REGEDIT_MENU 130 -#define IDD_DIALOG1 131 +#define IDD_EXPORTRANGE 131 #define IDI_OPEN_FILE 132 #define IDD_DIALOG2 132 #define IDI_CLOSED_FILE 133 @@ -174,4 +174,8 @@ #define IDD_EDIT_MULTI_STRING 2006 #define IDD_EDIT_BIN_DATA 2007 +#define IDC_EXPORT_ALL 2008 +#define IDC_EXPORT_BRANCH 2009 +#define IDC_EXPORT_BRANCH_TEXT 2010 + #define IDC_STATIC -1

1 0

[weiden] 18148: display all known value types
by weiden＠svn.reactos.com 29 Sep '05

29 Sep '05

display all known value types Modified: trunk/reactos/subsys/system/regedit/listview.c _____ Modified: trunk/reactos/subsys/system/regedit/listview.c --- trunk/reactos/subsys/system/regedit/listview.c 2005-09-29 02:26:33 UTC (rev 18147) +++ trunk/reactos/subsys/system/regedit/listview.c 2005-09-29 02:50:38 UTC (rev 18148) @@ -223,7 +223,7 @@ LPTSTR strBinary; if(dwCount > 0) { - strBinary = HeapAlloc(GetProcessHeap(), 0, (dwCount * sizeof(TCHAR) * 3) + 1); + strBinary = HeapAlloc(GetProcessHeap(), 0, (dwCount * sizeof(TCHAR) * 3) + 1); for (i = 0; i < dwCount; i++) { wsprintf( strBinary + i*3, _T("%02X "), pData[i] ); @@ -235,8 +235,8 @@ else { TCHAR szText[128]; - LoadString(hInst, IDS_BINARY_EMPTY, szText, sizeof(szText)/sizeof(TCHAR)); - ListView_SetItemText(hwndLV, index, 2, szText); + LoadString(hInst, IDS_BINARY_EMPTY, szText, sizeof(szText)/sizeof(TCHAR)); + ListView_SetItemText(hwndLV, index, 2, szText); } } break; @@ -310,6 +310,9 @@ break; case 1: switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { + case REG_NONE: + plvdi->item.pszText = _T("REG_NONE"); + break; case REG_SZ: plvdi->item.pszText = _T("REG_SZ"); break; @@ -319,18 +322,18 @@ case REG_BINARY: plvdi->item.pszText = _T("REG_BINARY"); break; - case REG_DWORD: + case REG_DWORD: /* REG_DWORD_LITTLE_ENDIAN */ plvdi->item.pszText = _T("REG_DWORD"); break; case REG_DWORD_BIG_ENDIAN: plvdi->item.pszText = _T("REG_DWORD_BIG_ENDIAN"); break; + case REG_LINK: + plvdi->item.pszText = _T("REG_LINK"); + break; case REG_MULTI_SZ: plvdi->item.pszText = _T("REG_MULTI_SZ"); break; - case REG_LINK: - plvdi->item.pszText = _T("REG_LINK"); - break; case REG_RESOURCE_LIST: plvdi->item.pszText = _T("REG_RESOURCE_LIST"); break; @@ -340,8 +343,8 @@ case REG_RESOURCE_REQUIREMENTS_LIST: plvdi->item.pszText = _T("REG_RESOURCE_REQUIREMENTS_LIST"); break; - case REG_NONE: - plvdi->item.pszText = _T("REG_NONE"); + case REG_QWORD: /* REG_QWORD_LITTLE_ENDIAN */ + plvdi->item.pszText = _T("REG_QWORD"); break; default: { TCHAR buf2[200];

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs