Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 30770: - german translation of open with dialog
by janderwald＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: janderwald Date: Mon Nov 26 01:57:49 2007 New Revision: 30770 URL: http://svn.reactos.org/svn/reactos?rev=30770&view=rev Log: - german translation of open with dialog Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Mon Nov 26 01:57:49 2007 @@ -340,17 +340,17 @@ OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Open With" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 -LTEXT "File: %s", 14001, 30, 35, 180, 10 -GROUPBOX "Programs", -1, 5, 49, 210, 180 +CAPTION "Öffnen mit" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Wählen Sie das Programm, das zum Öffnen dieser Datei verwendet werden soll:", -1, 30, 20, 180, 20 +LTEXT "Datei: %s", 14001, 30, 38, 180, 10 +GROUPBOX "&Programme", -1, 5, 49, 210, 180 CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 -CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 -PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +CHECKBOX "&Dateityp &immer mit dem ausgewählten Programm öffnen", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Durchsuchen...", 14004, 155, 212, 55, 14 PUSHBUTTON "OK", 14005, 100, 260, 50, 13 -PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 +PUSHBUTTON "Abbrechen", 14006, 160, 260, 50, 13 END

1 0

[peterw] 30769: - Fix a bug in TimeDate.cmd.
by peterw＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: peterw Date: Mon Nov 26 01:55:30 2007 New Revision: 30769 URL: http://svn.reactos.org/svn/reactos?rev=30769&view=rev Log: - Fix a bug in TimeDate.cmd. Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd Mon Nov 26 01:55:30 2007 @@ -24,10 +24,10 @@ for /f "usebackq tokens=1" %%u in (`time /t`) do set TIMERAW=%%u :: -:: Check if we have an hour under 10, if so pad it with a zero. +:: Check if we need to pad the time with a zero. :: if "%TIMERAW:~1,1%" == ":" ( - set TIMERAW=0%t% + set TIMERAW=0%TIMERAW% ) ::

1 0

[greatlrd] 30768: Fix wglGetExtensionsStringARB and wglGetExtensionsStringEXT so it tell we support all wgl* but we do not support all of them yet.
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Mon Nov 26 01:55:05 2007 New Revision: 30768 URL: http://svn.reactos.org/svn/reactos?rev=30768&view=rev Log: Fix wglGetExtensionsStringARB and wglGetExtensionsStringEXT so it tell we support all wgl* but we do not support all of them yet. Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Mon Nov 26 01:55:05 2007 @@ -692,7 +692,7 @@ } WINGDIAPI BOOL GLAPIENTRY wglSwapLayerBuffers(HDC hdc, - UINT fuPlanes) + UINT fuPlanes) { (void) hdc; (void) fuPlanes; SetLastError(0); @@ -701,16 +701,27 @@ WINGDIAPI const char * GLAPIENTRY wglGetExtensionsStringARB(HDC hdc) { - return "WGL_ARB_extensions_string"; + /* WGL_ARB_render_texture */ + return "WGL_ARB_extensions_string WGL_" + "ARB_pixel_format WGL_ARB_multi" + "sample WGL_EXT_swap_control WG" + "L_ARB_pbuffer WGL_ARB_render_t" + "exture WGL_ARB_make_current_re" + "ad WGL_EXT_extensions_string W" + "GL_ARB_buffer_region "; } GLAPI const char * GLAPIENTRY wglGetExtensionsStringEXT (void) { - return - // "WGL_EXT_swap_control " - "WGL_EXT_extensions_string WGL_ARB_extensions_string" - /*WGL_ARB_pixel_format WGL_ARB_render_texture WGL_ARB_pbuffer*/; + /* WGL_ARB_render_texture */ + return "WGL_ARB_extensions_string WGL_" + "ARB_pixel_format WGL_ARB_multi" + "sample WGL_EXT_swap_control WG" + "L_ARB_pbuffer WGL_ARB_render_t" + "exture WGL_ARB_make_current_re" + "ad WGL_EXT_extensions_string W" + "GL_ARB_buffer_region "; } GLAPI BOOL GLAPIENTRY Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Mon Nov 26 01:55:05 2007 @@ -320,7 +320,7 @@ {"wglGetExtensionsStringEXT", (PROC)wglGetExtensionsStringEXT}, {"wglSwapIntervalEXT", (PROC)wglSwapIntervalEXT}, {"wglGetSwapIntervalEXT", (PROC)wglGetSwapIntervalEXT}, -// {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB}, +// {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB}, // {"wglGetPixelFormatAttribfvARB", (PROC)wglGetPixelFormatAttribfvARB}, {"wglChoosePixelFormatARB", (PROC)wglChoosePixelFormatARB}, // {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB},

1 0

[greatlrd] 30767: ReactOS spefify change. our gdi32.dll does not have all opengl32 api yet. so we need load opengl32.dll to solv this issue.
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Mon Nov 26 01:48:35 2007 New Revision: 30767 URL: http://svn.reactos.org/svn/reactos?rev=30767&view=rev Log: ReactOS spefify change. our gdi32.dll does not have all opengl32 api yet. so we need load opengl32.dll to solv this issue. Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c Mon Nov 26 01:48:35 2007 @@ -2825,7 +2825,10 @@ #else #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ - mod_gl = GetModuleHandleA("gdi32.dll"); + + /* ReactOS hack, we do not have wglGetProcAddress implement in gdi32.dll yet, */ + mod_gl = GetModuleHandleA("opengl32.dll"); + #endif }

1 0

[janderwald] 30766: - add resources for open with dialog - use CDefFolderMenu_Create2 to create the default menu
by janderwald＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: janderwald Date: Mon Nov 26 01:48:03 2007 New Revision: 30766 URL: http://svn.reactos.org/svn/reactos?rev=30766&view=rev Log: - add resources for open with dialog - use CDefFolderMenu_Create2 to create the default menu Modified: 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/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/shlfldr_mydocuments.c 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,22 @@ RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 +END + STRINGTABLE DISCARDABLE BEGIN 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,22 @@ RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 +END + STRINGTABLE DISCARDABLE BEGIN 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Mon Nov 26 01:48:03 2007 @@ -336,6 +336,22 @@ RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 +END + STRINGTABLE DISCARDABLE BEGIN 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,22 @@ RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 +END + STRINGTABLE DISCARDABLE BEGIN 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Mon Nov 26 01:48:03 2007 @@ -337,6 +337,22 @@ RADIOBUTTON "Dateien nicht in den Papie&rkorb verschieben, sondern sofort löschen", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "Bestätigungs&dialog nach erfolgreichem Löschvorgang anzeigen", 14004, 20, 155, 140, 10, WS_TABSTOP END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 +END + STRINGTABLE DISCARDABLE BEGIN @@ -425,7 +441,7 @@ IDS_DRIVE_CDROM "CD-Laufwerk" IDS_DRIVE_NETWORK "Netzlaufwerk" - IDS_OPEN_WITH "Öffnen mit" + IDS_OPEN_WITH "Öffnen &mit..." IDS_OPEN_WITH_CHOOSE "Programm wählen..." IDS_SHELL_ABOUT_AUTHORS "&Autoren" 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,22 @@ RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 +END + STRINGTABLE DISCARDABLE BEGIN 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Mon Nov 26 01:48:03 2007 @@ -338,6 +338,21 @@ LTEXT "T&aille maximale (MO) :", -1, 20, 105, 70, 10 RADIOBUTTON "Ne pas déplacer les fichie&rs vers la Corbeille. Effacer les fichiers immédiatement lors de la suppression.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "Afficher une fenêtre de confirmation d'effacement", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Mon Nov 26 01:48:03 2007 @@ -337,6 +337,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Mon Nov 26 01:48:03 2007 @@ -336,6 +336,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Mon Nov 26 01:48:03 2007 @@ -336,6 +336,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "&Ìàêñèìàëüíûé ðàçìåð(Ìá):", -1, 17, 95, 102, 10 RADIOBUTTON "&Óíè÷òîæàòü ôàéëû ñðàçó ïîñëå óäàëåíèÿ, íå ïîìåùàÿ èõ â êîðçèíó.", 14003, 17, 108, 206, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Çàïðàøèâàòü ïîäòâåðæäåíèå íà óäàëåíèå", 14004, 20, 145, 176, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,21 @@ LTEXT "&Ãðàíè÷íèé îá'ºì êîøèêà (Ìá):", -1, 20, 105, 70, 10 RADIOBUTTON "Íå ïåðåì³ù&óâàòè ôàéëè äî êîøèêà, à âèäàëÿòè ¿õ îñòàòî÷íî â³äðàçó", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "Ïîêà&çóâàòè ä³àëîã ï³äòâåðäæåííÿ âèäàëåííÿ", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Mon Nov 26 01:48:03 2007 @@ -334,6 +334,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE DISCARDABLE 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 (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Mon Nov 26 01:48:03 2007 @@ -335,6 +335,21 @@ LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 221, 278 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "Choose the program you want to use to open this file:", -1, 30, 20, 180, 10 +LTEXT "File: %s", 14001, 30, 35, 180, 10 +GROUPBOX "Programs", -1, 5, 49, 210, 180 +CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 60, 200, 130 +CHECKBOX "&Always use the selected program to open this kind of file", 14003, 10, 200, 195, 10 +PUSHBUTTON "&Browse...", 14004, 155, 212, 50, 14 +PUSHBUTTON "OK", 14005, 100, 260, 50, 13 +PUSHBUTTON "Cancel", 14006, 160, 260, 50, 13 END STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL Modified: trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfldr_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c (original) +++ trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c Mon Nov 26 01:48:03 2007 @@ -436,11 +436,7 @@ if (IsEqualIID (riid, &IID_IContextMenu)) { - if (cidl > 0) - pObj = (LPUNKNOWN) ISvItemCm_Constructor( (IShellFolder *) iface, This->pidlRoot, apidl, cidl); - else - pObj = (LPUNKNOWN) ISvBgCm_Constructor( (IShellFolder *) iface, TRUE); - hr = S_OK; + hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) {

1 0

[fireball] 30765: - Remove unneeded kdb_string.c from the build, and a misc fix.
by fireball＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: fireball Date: Mon Nov 26 01:46:13 2007 New Revision: 30765 URL: http://svn.reactos.org/svn/reactos?rev=30765&view=rev Log: - Remove unneeded kdb_string.c from the build, and a misc fix. Removed: trunk/reactos/ntoskrnl/kdbg/kdb_string.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c Mon Nov 26 01:46:13 2007 @@ -49,7 +49,7 @@ "\r\000/" /* 0x60 - 0x6f */ }; -typedef BYTE byte_t; +typedef UCHAR byte_t; VOID KbdEnableMouse() { Removed: trunk/reactos/ntoskrnl/kdbg/kdb_string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_string.c… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_string.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_string.c (removed) @@ -1,124 +1,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/kdb_string.c - * PURPOSE: Kernel debugger string functions - * PROGRAMMER: Gregor Anich (blight(a)blight.eu.org) - * UPDATE HISTORY: - * Created 17/01/2005 - */ - -/* INCLUDES ******************************************************************/ -#include <ntoskrnl.h> -#include <ctype.h> - -/* FUNCTIONS *****************************************************************/ - -#if 0 -int -_stricmp( - const char *s1, - const char *s2) -{ - char c1, c2; - for (;;) - { - c1 = tolower(*s1++); - c2 = tolower(*s2++); - if (c1 < c2) - return -1; - else if (c1 > c2) - return 1; - if (c1 == '\0') - break; - } - return 0; -} -#endif /* unused */ - -/* - * Convert a string to an unsigned long integer. - * - * Ignores `locale' stuff. Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -unsigned long -strtoul(const char *nptr, char **endptr, int base) -{ - const char *s = nptr; - unsigned long acc; - int c; - unsigned long cutoff; - int neg = 0, any, cutlim; - - /* - * See strtol for comments as to the logic used. - */ - do { - c = *s++; - } while (isspace(c)); - if (c == '-') - { - neg = 1; - c = *s++; - } - else if (c == '+') - c = *s++; - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) - { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - cutoff = (unsigned long)0xffffffff / (unsigned long)base; - cutlim = (unsigned long)0xffffffff % (unsigned long)base; - for (acc = 0, any = 0;; c = *s++) - { - if (isdigit(c)) - c -= '0'; - else if (isalpha(c)) - c -= isupper(c) ? 'A' - 10 : 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) - any = -1; - else { - any = 1; - acc *= base; - acc += c; - } - } - if (any < 0) - { - acc = 0xffffffff; - } - else if (neg) - acc = -acc; - if (endptr != 0) - *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); - return acc; -} - Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Nov 26 01:46:13 2007 @@ -276,7 +276,6 @@ <file>kdb_expr.c</file> <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> - <file>kdb_string.c</file> </if> <if property="DBG_OR_KDBG" value="true"> <file>kdb_symbols.c</file>

1 0

[fireball] 30764: - Remove Ke386WbInvd() and use compatible __wbinvd() intrinsic, already existing in ReactOS headers. - Make i386-dis.c include ntoskrnl.h, remove all unneeded defines, fix function prototypes to match declared in kdb.h.
by fireball＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: fireball Date: Mon Nov 26 01:33:50 2007 New Revision: 30764 URL: http://svn.reactos.org/svn/reactos?rev=30764&view=rev Log: - Remove Ke386WbInvd() and use compatible __wbinvd() intrinsic, already existing in ReactOS headers. - Make i386-dis.c include ntoskrnl.h, remove all unneeded defines, fix function prototypes to match declared in kdb.h. Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Mon Nov 26 01:33:50 2007 @@ -79,8 +79,6 @@ #define Ke386HaltProcessor() __asm__("hlt\n\t"); #define Ke386FnInit() __asm__("fninit\n\t"); - -#define Ke386WbInvd() __asm__("wbinvd\n\t"); // Modified: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/i386-di… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c (original) +++ trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c Mon Nov 26 01:33:50 2007 @@ -8,7 +8,9 @@ * PROGRAMMERS: No programmer listed. */ -#include <stdarg.h> +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> /* ReactOS compatibility stuff. */ #define PARAMS(X) X @@ -25,30 +27,19 @@ typedef unsigned char bfd_byte; enum bfd_endian { BFD_ENDIAN_BIG, BIG_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN }; typedef void* bfd; -typedef void* FILE; typedef signed int bfd_signed_vma; -#define NULL 0 #define bfd_mach_x86_64_intel_syntax 0 #define bfd_mach_x86_64 1 #define bfd_mach_i386_i386_intel_syntax 2 #define bfd_mach_i386_i386 3 #define bfd_mach_i386_i8086 4 -#define abort() __asm__("int $3\n\t") +#define abort() DbgBreakPoint(); #define _(X) X #define ATTRIBUTE_UNUSED -extern char* strcpy(char *dest, const char *src); -extern unsigned int strlen(const char *s); extern int sprintf(char *str, const char *format, ...); -extern int vsprintf(char *buf, const char *format, va_list ap); -extern void* memcpy(void *dest, const void *src, unsigned int length); -extern void DbgPrint(const char *format, ...); #define sprintf_vma(BUF, VMA) sprintf(BUF, "0x%X", VMA) #define _setjmp setjmp -extern unsigned int KdbSymPrintAddress(void* address); struct disassemble_info; - -extern long KdbpSafeReadMemory(void*, void*, unsigned int); - int print_insn_i386 (bfd_vma pc, struct disassemble_info *info); @@ -102,8 +93,8 @@ #include "dis-asm.h" -long -KdbpGetInstLength(unsigned int Address) +LONG +KdbpGetInstLength(IN ULONG Address) { disassemble_info info; @@ -128,8 +119,8 @@ return(print_insn_i386(Address, &info)); } -long -KdbpDisassemble(unsigned int Address, unsigned long IntelSyntax) +LONG +KdbpDisassemble(IN ULONG Address, IN ULONG IntelSyntax) { disassemble_info info; @@ -2164,7 +2155,7 @@ start_codep = priv.the_buffer; codep = priv.the_buffer; - if (setjmp (priv.bailout) != 0) + if (_setjmp (priv.bailout) != 0) { const char *name; Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Mon Nov 26 01:33:50 2007 @@ -891,7 +891,7 @@ if (KeI386CpuType < 6) return FALSE; /* Invalidate all caches */ - Ke386WbInvd(); + __wbinvd(); return TRUE; }

1 0

[janderwald] 30763: - check for NoOpen key (not yet used) - recurse into persistent handler when required - fix position for open with shell extension - add notes for internet search for file type
by janderwald＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: janderwald Date: Mon Nov 26 01:06:25 2007 New Revision: 30763 URL: http://svn.reactos.org/svn/reactos?rev=30763&view=rev Log: - check for NoOpen key (not yet used) - recurse into persistent handler when required - fix position for open with shell extension - add notes for internet search for file type Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Mon Nov 26 01:06:25 2007 @@ -41,6 +41,11 @@ const GUID CLSID_OpenWith = { 0x09799AFB, 0xAD67, 0x11d1, {0xAB,0xCD,0x00,0xC0,0x4F,0xC3,0x09,0x36} }; +/// +/// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\policies\system] +/// "NoInternetOpenWith"=dword:00000001 +/// + typedef struct { const IContextMenu2Vtbl *lpVtblContextMenu; @@ -48,8 +53,10 @@ LONG wId; volatile LONG ref; WCHAR ** szArray; + BOOL NoOpen; UINT size; UINT count; + WCHAR szName[MAX_PATH]; } SHEOWImpl; static const IShellExtInitVtbl eivt; @@ -203,7 +210,7 @@ MENUITEMINFOW mii; USHORT items = 0; WCHAR szBuffer[100]; - BOOL bDefault = FALSE; + INT pos; HMENU hSubMenu = NULL; SHEOWImpl *This = impl_from_IContextMenu(iface); @@ -213,8 +220,7 @@ TRACE("failed to load string\n"); return E_FAIL; } - - if (This->count) + if (This->count > 1) { hSubMenu = CreatePopupMenu(); if (hSubMenu == NULL) @@ -224,16 +230,7 @@ } items = AddItems(This, hSubMenu, idCmdFirst + 1); } - else - { - /* no file association found */ - UINT pos = GetMenuDefaultItem(hmenu, TRUE, 0); - if (pos != -1) - { - /* replace default item with "Open With" action */ - bDefault = DeleteMenu(hmenu, pos, MF_BYPOSITION); - } - } + pos = GetMenuDefaultItem(hmenu, TRUE, 0) + 1; ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -245,7 +242,7 @@ } mii.dwTypeData = (LPWSTR) szBuffer; mii.fState = MFS_ENABLED; - if (bDefault) + if (!pos) { mii.fState |= MFS_DEFAULT; } @@ -254,7 +251,7 @@ This->wId = idCmdFirst; mii.fType = MFT_STRING; - if (InsertMenuItemW( hmenu, 0, TRUE, &mii)) + if (InsertMenuItemW( hmenu, pos, TRUE, &mii)) items++; TRACE("items %x\n",items); @@ -519,12 +516,14 @@ RegCloseKey(hSubKey); } + if (RegGetValueW(HKEY_CLASSES_ROOT, szExt, L"NoOpen", RRF_RT_REG_SZ, NULL, NULL, &dwSize) == ERROR_SUCCESS) + { + This->NoOpen = TRUE; + } + RegCloseKey(hKey); return NumKeys; } - - - UINT SHEOW_LoadItemFromHKCU(SHEOWImpl *This, WCHAR * szExt) @@ -586,6 +585,7 @@ LPCITEMIDLIST pidl_child; LPCITEMIDLIST pidl; WCHAR szPath[MAX_PATH]; + DWORD dwPath; LPWSTR szPtr; static const WCHAR szShortCut[] = { '.','l','n','k', 0 }; @@ -647,6 +647,12 @@ SHEOW_LoadItemFromHKCU(This, szPtr); SHEOW_LoadItemFromHKCR(This, szPtr); + dwPath = sizeof(szPath); + if (RegGetValueW(HKEY_CLASSES_ROOT, szPtr, NULL, RRF_RT_REG_SZ, NULL, szPath, &dwPath) == ERROR_SUCCESS) + { + SHEOW_LoadItemFromHKCU(This, szPath); + } + } TRACE("count %u\n", This->count); return S_OK;

1 0

[janderwald] 30762: - add RRF_RT_ANY constant
by janderwald＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: janderwald Date: Mon Nov 26 00:47:17 2007 New Revision: 30762 URL: http://svn.reactos.org/svn/reactos?rev=30762&view=rev Log: - add RRF_RT_ANY constant Modified: trunk/reactos/include/psdk/winreg.h Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h (original) +++ trunk/reactos/include/psdk/winreg.h Mon Nov 26 00:47:17 2007 @@ -47,6 +47,7 @@ #define RRF_RT_REG_QWORD (1 << 6) #define RRF_RT_DWORD (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD) #define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) +#define RRF_RT_ANY (0x0000FFFF) #define RRF_NOEXPAND (1 << 28) #define RRF_ZEROONFAILURE (1 << 29) #endif

1 0

[peterw] 30761: - Fix a display bug when displaying binutils version.
by peterw＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: peterw Date: Mon Nov 26 00:12:24 2007 New Revision: 30761 URL: http://svn.reactos.org/svn/reactos?rev=30761&view=rev Log: - Fix a display bug when displaying binutils version. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Mon Nov 26 00:12:24 2007 @@ -840,6 +840,7 @@ { FILE *fp; int ch, i; + size_t newline; char buffer[81]; fp = popen ( versionCommand.c_str () , "r" ); @@ -865,6 +866,8 @@ { prevtoken = token; version = string( prevtoken ); + if ( (newline = version.find('\n')) != std::string::npos ) + version.erase(newline, 1); if ( version.find('.') != std::string::npos ) break; token = strtok ( NULL, separators );

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