Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 36614: Convert to spec. Fix definitions (taken from WINE).
by sserapion＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: sserapion Date: Wed Oct 1 11:39:19 2008 New Revision: 36614 URL: http://svn.reactos.org/svn/reactos?rev=36614&view=rev Log: Convert to spec. Fix definitions (taken from WINE). Added: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (contents, props changed) - copied, changed from r36479, branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def Removed: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c [iso-8859-1] Wed Oct 1 11:39:19 2008 @@ -3,24 +3,31 @@ #include <debug.h> -HRESULT DLLAPI ValidatePixelShader(void) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) { UNIMPLEMENTED return 0; } -HRESULT DLLAPI ValidateVertexShader(void) -{ - UNIMPLEMENTED - return 0; -} -HRESULT DLLAPI DebugSetMute(DWORD dw1) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) { UNIMPLEMENTED return 0; } -DWORD DLLAPI Direct3DCreate8( UINT SDKVersion ) +HRESULT WINAPI D3D8GetSWInfo(void) +{ + UNIMPLEMENTED + return 0; +} + +HRESULT WINAPI DebugSetMute(void) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI Direct3DCreate8( UINT SDKVersion ) { UNIMPLEMENTED return 0; Removed: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def (removed) @@ -1,6 +1,0 @@ -LIBRARY d3d8 -EXPORTS - ValidatePixelShader - ValidateVertexShader - DebugSetMute - Direct3DCreate8 Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] Wed Oct 1 11:39:19 2008 @@ -1,7 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d8" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8.dll"> - <importlibrary definition="d3d8.def" /> + <importlibrary definition="d3d8.spec.def" /> <file>d3d8.c</file> <file>d3d8.rc</file> + <file>d3d8.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (from r36479, branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec [iso-8859-1] Wed Oct 1 11:39:19 2008 @@ -1,6 +1,5 @@ -LIBRARY d3d8 -EXPORTS - ValidatePixelShader - ValidateVertexShader - DebugSetMute - Direct3DCreate8 +@ stdcall D3D8GetSWInfo() +@ stdcall DebugSetMute() +@ stdcall Direct3DCreate8(long) +@ stdcall ValidatePixelShader(ptr long long ptr) +@ stdcall ValidateVertexShader(ptr ptr ptr long ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[dreimer] 36613: sync winhlp32 and wordpad with wine
by dreimer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: dreimer Date: Wed Oct 1 09:17:09 2008 New Revision: 36613 URL: http://svn.reactos.org/svn/reactos?rev=36613&view=rev Log: sync winhlp32 and wordpad with wine Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -68,7 +68,7 @@ IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" CAPTION "õø" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER @@ -76,7 +76,7 @@ IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" CAPTION "õ" { LTEXT "¢À", -1, 10, 10, 180, 150 Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -18,12 +18,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(65001) + IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN MENUITEM "&Neu...\tStrg+N", ID_FILE_NEW - MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "Ã&ffnen...\tStrg+O", ID_FILE_OPEN MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern &unter...", ID_FILE_SAVEAS MENUITEM SEPARATOR @@ -35,21 +37,21 @@ END POPUP "&Bearbeiten" BEGIN - MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO + MENUITEM "&RÃ¼ckgÃ¤ngig\tStrg+Z", ID_EDIT_UNDO MENUITEM "&Wiederholen\tStrg+Y", ID_EDIT_REDO MENUITEM SEPARATOR MENUITEM "&Ausschneiden\tStrg+X", ID_EDIT_CUT MENUITEM "&Kopieren\tStrg+C", ID_EDIT_COPY - MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE - MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR + MENUITEM "&EinfÃ¼gen\tStrg+V", ID_EDIT_PASTE + MENUITEM "&LÃ¶schen\tEntf", ID_EDIT_CLEAR MENUITEM "Alles &markieren\tStrg+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "&Suchen...\tStrg+F", ID_FIND MENUITEM "&Weitersuchen\tF3", ID_FIND_NEXT MENUITEM "Erset&zen...\tStrg+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY - MENUITEM "&Geändert", ID_EDIT_MODIFIED + MENUITEM "SchreibgeschÃ¼&tzt", ID_EDIT_READONLY + MENUITEM "&GeÃ¤ndert", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&Extras" BEGIN @@ -69,14 +71,14 @@ MENUITEM SEPARATOR MENUITEM "&Optionen...", ID_VIEWPROPERTIES END - POPUP "&Einfügen" + POPUP "&EinfÃ¼gen" BEGIN MENUITEM "&Datum und Uhrzeit...", ID_DATETIME END POPUP "Forma&t" BEGIN MENUITEM "Sch&riftart...", ID_FONTSETTINGS - MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "Auf&zÃ¤hlungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT MENUITEM "&Tabstopps..." ID_TABSTOPS POPUP "&Hintergrund" @@ -87,7 +89,7 @@ END POPUP "&?" BEGIN - MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT + MENUITEM "Ã&ber Wine Wordpad" ID_ABOUT END END @@ -97,9 +99,9 @@ BEGIN MENUITEM "Aus&schneiden", ID_EDIT_CUT MENUITEM "&Kopieren", ID_EDIT_COPY - MENUITEM "&Einfügen", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "&EinfÃ¼gen", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Auf&zÃ¤hlungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT END END @@ -109,7 +111,7 @@ CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Verfügbare Formate",0,3,2,100,15 + LTEXT "VerfÃ¼gbare Formate",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 @@ -152,10 +154,10 @@ GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&LÃ¶schen", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15 + PUSHBUTTON "&Alle lÃ¶schen", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -211,11 +213,11 @@ STRINGTABLE DISCARDABLE BEGIN STRING_PREVIEW_PRINT, "&Drucken" - STRING_PREVIEW_NEXTPAGE, "&Nächste" + STRING_PREVIEW_NEXTPAGE, "&NÃ¤chste" STRING_PREVIEW_PREVPAGE, "&Vorherige" STRING_PREVIEW_TWOPAGES, "Zwei Seiten" STRING_PREVIEW_ONEPAGE, "Eine Seite" - STRING_PREVIEW_CLOSE, "&Schließen" + STRING_PREVIEW_CLOSE, "&SchlieÃen" END STRINGTABLE DISCARDABLE @@ -226,12 +228,18 @@ STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" - STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?" + STRING_PROMPT_SAVE_CHANGES, "Ãnderungen an '%s' speichern?" STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet." STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden." STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \ "Dadurch geht die Formatierung verloren. " \ - "Möchten Sie den Vorgang trotzdem fortsetzen?" - STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig." - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt." -END + "MÃ¶chten Sie den Vorgang trotzdem fortsetzen?" + STRING_INVALID_NUMBER, "Diese MaÃeinheit ist nicht zulÃ¤ssig." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstÃ¼tzt." + STRING_WRITE_FAILED, "Die Datei konnte nicht gespeichert werden." + STRING_WRITE_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern." + STRING_OPEN_FAILED, "Die Datei konnte nicht geÃ¶ffnet werden." + STRING_OPEN_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu Ã¶ffnen." +END + +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -222,16 +222,3 @@ BEGIN STRING_UNITS_CM, "cm" END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -107,7 +107,7 @@ IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "útÆ" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "pÅ«é`®",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY @@ -118,7 +118,7 @@ IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "VKì¬" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "Vµ¢¶`®",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT @@ -129,7 +129,7 @@ IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "iÌÝè" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "Cfg", 0, 10, 10, 120, 68 LTEXT "¶(&L)", 0, 15, 22, 40, 13 @@ -147,7 +147,7 @@ IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "^uÌÝè" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "^uÌâ~Êu(&T)", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT @@ -161,7 +161,7 @@ IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 STYLE DS_SYSMODAL CAPTION "" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "sÌÜèÔµ", 0, 10, 10, 130, 85 RADIOBUTTON "EBhEÌ«EÅÜèÔ·(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -467,7 +467,7 @@ SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } -static void on_fontlist_modified(HWND hwndFontList, LPWSTR wszNewFaceName) +static void on_fontlist_modified(LPWSTR wszNewFaceName) { CHARFORMAT2W format; ZeroMemory(&format, sizeof(format)); @@ -1702,7 +1702,7 @@ return 0; } -static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnCreate( HWND hWnd ) { HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); @@ -1858,7 +1858,7 @@ return 0; } -static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnUser( HWND hWnd ) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); @@ -1910,7 +1910,7 @@ return 0; } -static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnNotify( HWND hWnd, LPARAM lParam) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); @@ -1925,10 +1925,10 @@ NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam; if(pHdr->hwndFrom == hwndFontList) { - on_fontlist_modified(hwndFontList, (LPWSTR)endEdit->szText); + on_fontlist_modified((LPWSTR)endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndSizeList, (LPWSTR)endEdit->szText); + on_sizelist_modified(hwndFontList,(LPWSTR)endEdit->szText); } } return 0; @@ -2322,7 +2322,7 @@ WCHAR buffer[LF_FACESIZE]; HWND hwndFontList = (HWND)lParam; get_comboexlist_selection(hwndFontList, buffer, LF_FACESIZE); - on_fontlist_modified(hwndFontList, buffer); + on_fontlist_modified(buffer); } break; @@ -2343,7 +2343,7 @@ return 0; } -static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) +static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam ) { HMENU hMenu = (HMENU)wParam; HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); @@ -2456,13 +2456,13 @@ switch(msg) { case WM_CREATE: - return OnCreate( hWnd, wParam, lParam ); + return OnCreate( hWnd ); case WM_USER: - return OnUser( hWnd, wParam, lParam ); + return OnUser( hWnd ); case WM_NOTIFY: - return OnNotify( hWnd, wParam, lParam ); + return OnNotify( hWnd, lParam ); case WM_COMMAND: if(preview_isactive()) @@ -2494,7 +2494,7 @@ return 0; case WM_INITMENUPOPUP: - return OnInitPopupMenu( hWnd, wParam, lParam ); + return OnInitPopupMenu( hWnd, wParam ); case WM_SIZE: return OnSize( hWnd, wParam, lParam );

1 0

[dreimer] 36612: Sync winfile and write with wine
by dreimer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: dreimer Date: Wed Oct 1 09:14:39 2008 New Revision: 36612 URL: http://svn.reactos.org/svn/reactos?rev=36612&view=rev Log: Sync winfile and write with wine Added: trunk/rosapps/applications/write/lang/ja-JP.rc (with props) Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/rsrc.rc Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -148,7 +148,7 @@ IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Às" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "R}h(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -162,7 +162,7 @@ IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ú®æðIð" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "pX(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -175,7 +175,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -197,7 +197,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -201,14 +201,13 @@ /* load resource string */ -static LPTSTR load_string(LPTSTR buffer, UINT id) -{ - LoadString(Globals.hInstance, id, buffer, BUFFER_LEN); - +static LPTSTR load_string(LPTSTR buffer, DWORD size, UINT id) +{ + LoadString(Globals.hInstance, id, buffer, size); return buffer; } -#define RS(b, i) load_string(b, i) +#define RS(b, i) load_string(b, sizeof(b)/sizeof(b[0]), i) /* display error message for the specified WIN32 error code */ @@ -1407,9 +1406,9 @@ root->drive_type = DRIVE_UNKNOWN; drv[0] = '\\'; drv[1] = '\0'; - load_string(root->volname, IDS_DESKTOP); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_DESKTOP); root->fs_flags = 0; - load_string(root->fs, IDS_SHELL); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_SHELL); return read_tree_shell(root, pidl, sortOrder, hwnd); } @@ -1422,9 +1421,9 @@ root->drive_type = GetDriveType(path); lstrcat(drv, sSlash); - load_string(root->volname, IDS_ROOT_FS); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_ROOT_FS); root->fs_flags = 0; - load_string(root->fs, IDS_UNIXFS); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_UNIXFS); lstrcpy(root->path, sSlash); @@ -1509,7 +1508,7 @@ #ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) - load_string(root->entry.data.cFileName, IDS_DESKTOP); + load_string(root->entry.data.cFileName, sizeof(root->entry.data.cFileName)/sizeof(root->entry.data.cFileName[0]), IDS_DESKTOP); else #endif wsprintf(root->entry.data.cFileName, RS(b1,IDS_TITLEFMT), drv, root->fs); @@ -3865,7 +3864,7 @@ #endif #ifdef _SHELL_FOLDERS /* insert shell namespace button */ - load_string(b1, IDS_SHELL); + load_string(b1, sizeof(b1)/sizeof(b1[0]), IDS_SHELL); b1[lstrlen(b1)+1] = '\0'; SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1); @@ -4720,18 +4719,18 @@ /* load column strings */ col = 1; - load_string(g_pos_names[col++], IDS_COL_NAME); - load_string(g_pos_names[col++], IDS_COL_SIZE); - load_string(g_pos_names[col++], IDS_COL_CDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_NAME); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SIZE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_CDATE); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_ADATE); - load_string(g_pos_names[col++], IDS_COL_MDATE); - load_string(g_pos_names[col++], IDS_COL_IDX); - load_string(g_pos_names[col++], IDS_COL_LINKS); -#endif - load_string(g_pos_names[col++], IDS_COL_ATTR); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ADATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_MDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_IDX); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_LINKS); +#endif + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ATTR); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_SEC); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SEC); #endif } Added: trunk/rosapps/applications/write/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/ja… ============================================================================== --- trunk/rosapps/applications/write/lang/ja-JP.rc (added) +++ trunk/rosapps/applications/write/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -1,0 +1,26 @@ +/* + * Japanese language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Wordpad ÌN®É¸sµÜµ½" +} Propchange: trunk/rosapps/applications/write/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/rsrc.rc… ============================================================================== --- trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -27,6 +27,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc"

1 0

[dreimer] 36611: Updated 64 Bit Target NSIS Script. Still tbd: Proper Uninstall Part.
by dreimer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: dreimer Date: Wed Oct 1 08:29:19 2008 New Revision: 36611 URL: http://svn.reactos.org/svn/reactos?rev=36611&view=rev Log: Updated 64 Bit Target NSIS Script. Still tbd: Proper Uninstall Part. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Oct 1 08:29:19 2008 @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.2.0.0" +VIProductVersion "1.3.0.0" CRCCheck force SetCompressor /FINAL /SOLID lzma Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Oct 1 08:29:19 2008 @@ -1,5 +1,5 @@ -!define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.3" +!define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler" +!define PRODUCT_VERSION "1.0" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -9,7 +9,7 @@ ;; Basic installer options ;; Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "RosBE-${PRODUCT_VERSION}.exe" +OutFile "RosBE64-${PRODUCT_VERSION}.exe" InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.3.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.0.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.2.0.0" +VIProductVersion "1.0.0.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -111,155 +111,17 @@ SetOverwrite try File /r Icons\mingw.ico File /r Icons\rosbe.ico - File /r Root\README.pdf - File /r Root\RosBE.mac - File /r Root\changelog.txt File /r Root\LICENSE.txt - File /r Root\MinGW.cmd File /r Root\charch.cmd - File /r Root\MinGW.mac - File /r Root\Build.cmd - File /r Root\chdefgcc.cmd - File /r Root\Clean.cmd - File /r Root\Help.cmd - File /r Root\RosBE.cmd - File /r Root\rosbe-gcc-env.cmd - File /r Root\TimeDate.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\buildtime.exe - File /r Components\Tools\chknewer.exe - File /r Components\Tools\cpucount.exe - File /r Components\Tools\flash.exe - File /r Components\Tools\getdate.exe - File /r Components\Tools\rquote.exe - File /r Components\Tools\tee.exe SectionEnd Section -MinGWGCCNASM SEC02 SetOutPath "$INSTDIR\4.1.3" SetOverwrite try - File /r Components\4.1.3\*.* -SectionEnd - -Section "RosBE Configurator (options)" SEC03 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\options.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\options.exe - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ - "$INSTDIR\Tools\options.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section "Subversion Tools (svn, ssvn)" SEC04 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\sSVN.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\svn.exe - File /r Components\Tools\intl3_svn.dll - File /r Components\Tools\libapr.dll - File /r Components\Tools\libeay32.dll - File /r Components\Tools\ssleay32.dll - File /r Components\Tools\libaprutil.dll - File /r Components\Tools\libdb44.dll - File /r Components\Tools\libapriconv.dll - File /r Components\Tools\libsasl.dll - File /r Components\Tools\libsvn_client-1.dll - File /r Components\Tools\libsvn_delta-1.dll - File /r Components\Tools\libsvn_diff-1.dll - File /r Components\Tools\libsvn_fs-1.dll - File /r Components\Tools\libsvn_ra-1.dll - File /r Components\Tools\libsvn_repos-1.dll - File /r Components\Tools\libsvn_subr-1.dll - File /r Components\Tools\libsvn_wc-1.dll - SetOutPath "$INSTDIR\Tools\licenses" - SetOverwrite try - File /r Components\Tools\licenses\*.* -SectionEnd - -Section "Shortcut Tool (scut)" SEC05 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\scut.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\scut.exe -SectionEnd - -Section "ccache - Compiler Cache" SEC06 - SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" - SetOverwrite try - File /r Components\Tools\ccache.exe -SectionEnd - -Section "GDB - The GNU Project Debugger" SEC07 - SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" - SetOverwrite try - File /r Components\Tools\gdb.exe - File /r Components\Tools\gdbserver.exe -SectionEnd - -Section "relAddr2Line Tool" SEC08 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\reladdr2line.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\echoh.exe - File /r Components\Tools\raddr2line.exe - File /r Components\Tools\chkslash.exe -SectionEnd - -Section "Other Tools (chdefdir and config)" SEC09 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\chdefdir.cmd - File /r Root\Config.cmd -SectionEnd - -Section "PowerShell RosBE Version" SEC10 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\sSVN.cmd - File /r Components\Powershell\Build.ps1 - File /r Components\Powershell\Clean.ps1 - File /r Components\Powershell\Help.ps1 - File /r Components\Powershell\MinGW.ps1 - File /r Components\Powershell\RosBE.ps1 - File /r Components\Powershell\rosbe-gcc-env.ps1 -SectionEnd - -Section "Update Script" SEC11 - SetShellVarContext current - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\wget.exe - File /r Components\Tools\libintl3.dll - File /r Components\Tools\libeay32.dll - File /r Components\Tools\ssleay32.dll - File /r Components\Tools\libiconv2.dll - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\update.cmd -SectionEnd - -Section -StartMenuShortcuts SEC12 + File /r Components\4.4.0\*.* +SectionEnd + +Section -StartMenuShortcuts SEC03 SetShellVarContext current ;; @@ -268,64 +130,50 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ - "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ - "$INSTDIR\README.pdf" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ + "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC13 +Section /o "Desktop Shortcuts" SEC04 SetShellVarContext current ;; ;; Add our desktop shortcuts. ;; - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" -SectionEnd - -Section /o "Quick Launch Shortcuts" SEC14 +SectionEnd + +Section /o "Quick Launch Shortcuts" SEC05 SetShellVarContext current ;; ;; Add our quick launch shortcuts. ;; - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" -SectionEnd - -Section -Post SEC15 - WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" +SectionEnd + +Section -Post SEC06 + WriteUninstaller "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" SectionEnd Function un.onUninstSuccess HideWindow MessageBox MB_ICONINFORMATION|MB_OK \ - "ReactOS Build Environment was successfully removed from your computer." + "ReactOS Build Environment - 64 Bit Target was successfully removed from your computer." FunctionEnd Function un.onInit MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to completely remove ReactOS Build Environment and all of its components?" \ + "Are you sure you want to completely remove ReactOS Build Environment - 64 Bit Target and all of its components?" \ IDYES +2 Abort FunctionEnd @@ -338,59 +186,14 @@ ;; Clean up installed files. ;; RMDir /r /REBOOTOK "$INSTDIR\4.1.3" - RMDir /r /REBOOTOK "$INSTDIR\Tools" - RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" - IfFileExists "$PROFILE\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$PROFILE\RosBE" - IfFileExists "$APPDATA\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$APPDATA\RosBE" - Delete /REBOOTOK "$INSTDIR\Build.cmd" - Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\charch.cmd" - Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" - Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd" - Delete /REBOOTOK "$INSTDIR\Clean.cmd" - Delete /REBOOTOK "$INSTDIR\Clean.ps1" - Delete /REBOOTOK "$INSTDIR\Config.cmd" - Delete /REBOOTOK "$INSTDIR\Help.cmd" - Delete /REBOOTOK "$INSTDIR\Help.ps1" - Delete /REBOOTOK "$INSTDIR\MinGW.cmd" - Delete /REBOOTOK "$INSTDIR\MinGW.ps1" - Delete /REBOOTOK "$INSTDIR\options.cmd" - Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" - Delete /REBOOTOK "$INSTDIR\RosBE.cmd" - Delete /REBOOTOK "$INSTDIR\RosBE.ps1" - Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.cmd" - Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.ps1" - Delete /REBOOTOK "$INSTDIR\scut.cmd" - Delete /REBOOTOK "$INSTDIR\sSVN.cmd" - Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" - Delete /REBOOTOK "$INSTDIR\update.cmd" - Delete /REBOOTOK "$INSTDIR\README.pdf" - Delete /REBOOTOK "$INSTDIR\rosbe.ico" - Delete /REBOOTOK "$INSTDIR\mingw.ico" - Delete /REBOOTOK "$INSTDIR\uninstall.ico" - Delete /REBOOTOK "$INSTDIR\MinGW.mac" - Delete /REBOOTOK "$INSTDIR\RosBE.mac" - Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" - Delete /REBOOTOK "$INSTDIR\LICENSE.txt" - Delete /REBOOTOK "$INSTDIR\srclist.txt" - Delete /REBOOTOK "$INSTDIR\config.rbuild" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" IfFileExists "$DESKTOP\ReactOS Build Environment 64-bit.lnk" 0 +2 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk" - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" IfFileExists "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" 0 +2 Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" - IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" ;; ;; Clean up the registry.

1 0

[hyperion] 36610: modified ke/i386/cpu.c Added CMPXCHG8B enabling/detection code for TransMeta, Centaur and Rise (source: <URL: http://www.geoffchappell.com/notes/windows/kernel/cpu/cx8.htm>). Code dead until each vendor will be officially supported Alex and others: please review
by hyperion＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: hyperion Date: Wed Oct 1 06:54:29 2008 New Revision: 36610 URL: http://svn.reactos.org/svn/reactos?rev=36610&view=rev Log: modified ke/i386/cpu.c Added CMPXCHG8B enabling/detection code for TransMeta, Centaur and Rise (source: <URL: http://www.geoffchappell.com/notes/windows/kernel/cpu/cx8.htm>). Code dead until each vendor will be officially supported Alex and others: please review Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 1 06:54:29 2008 @@ -353,6 +353,46 @@ CpuFeatures = Reg[3]; } +#ifdef CPU_TRANSMETA + if (Vendor == CPU_TRANSMETA) + { + /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ + if ((Reg[0] & 0x0F00) >= 0x0500 && (Reg[0] & 0x00FF) >= 0x0042) + { + WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); + FeatureBits |= KF_CMPXCHG8B; + } + } +#endif + +#ifdef CPU_CENTAUR + if (Vendor == CPU_CENTAUR) + { + /* If CMPXCHG8B is not detected, try to enable it */ + if (!(CpuFeatures & 0x00000100)) + { + if ((Reg[0] & 0x0F00) == 0x0500) + { + WRMSR(0x0107, RDMSR(0x0107) | 0x02); + FeatureBits |= KF_CMPXCHG8B; + } + else if ((Reg[0] & 0x0F00) >= 0x0600) + { + WRMSR(0x1107, (RDMSR(0x1107) | 0x02) & ~((LONGLONG)0x01)); + FeatureBits |= KF_CMPXCHG8B; + } + } + } +#endif + +#ifdef CPU_RISE + if (Vendor == CPU_RISE) + { + /* Windows Vista assumes CMPXCHG8B is always supported on Rise */ + FeatureBits |= KF_CMPXCHG8B; + } +#endif + /* Convert all CPUID Feature bits into our format */ if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; if (CpuFeatures & 0x00000008) FeatureBits |= KF_LARGE_PAGE | KF_CR4;

1 0

[gschneider] 36609: Check DC for NULL before accessing it, fixes Coverity CID 661.
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 06:48:12 2008 New Revision: 36609 URL: http://svn.reactos.org/svn/reactos?rev=36609&view=rev Log: Check DC for NULL before accessing it, fixes Coverity CID 661. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed Oct 1 06:48:12 2008 @@ -3356,13 +3356,13 @@ DWORD cscp = IntGdiGetCharSet(hDC); // If here, update everything! Dc = DC_LockDc(hDC); - Dc_Attr = Dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (!Dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + Dc_Attr = Dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; Dc_Attr->iCS_CP = cscp; Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; DC_UnlockDc( Dc );

1 0

[gschneider] 36608: GetDIBits: destination height may be smaller than the source height, so the image size should always be calculated. Removed the hack in the bit copy phase that addressed the wrong bits buffer size. This allows CopyImage to work, this can be seen in taskbar icons 1-4 for example. Fixes two gdi32 winetests. Bugs #2225 and #3082 for more info. Tested: QEMU VGA/8/16/24bpp, VMWare Server VMWare Driver 8/16/32bpp, VMWare Server ReactOS VBE Driver 8/16/32bpp
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 05:49:10 2008 New Revision: 36608 URL: http://svn.reactos.org/svn/reactos?rev=36608&view=rev Log: GetDIBits: destination height may be smaller than the source height, so the image size should always be calculated. Removed the hack in the bit copy phase that addressed the wrong bits buffer size. This allows CopyImage to work, this can be seen in taskbar icons 1-4 for example. Fixes two gdi32 winetests. Bugs #2225 and #3082 for more info. Tested: QEMU VGA/8/16/24bpp, VMWare Server VMWare Driver 8/16/32bpp, VMWare Server ReactOS VBE Driver 8/16/32bpp Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Oct 1 05:49:10 2008 @@ -552,7 +552,8 @@ coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; + /* Resulting height may be smaller than original height */ + coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); if (BitmapObj->SurfObj.lDelta > 0) coreheader->bcHeight = -coreheader->bcHeight; @@ -563,7 +564,8 @@ ProbeForWrite(Info, sizeof(BITMAPINFO), 1); Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; - Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; + /* Resulting height may be smaller than original height */ + Info->bmiHeader.biHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); /* Report negtive height for top-down bitmaps. */ if (BitmapObj->SurfObj.lDelta > 0) Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; @@ -594,8 +596,9 @@ Info->bmiHeader.biCompression = BI_PNG; break; } - - Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits; + /* Image size has to be calculated */ + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, + Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ Info->bmiHeader.biClrUsed = 0; @@ -707,8 +710,7 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { hDestBitmap = EngCreateBitmap(DestSize, - /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ - DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ + DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits);

1 0

[gschneider] 36607: [FORMATTING], spelling, misc cleanup. No functional changes.
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 05:05:02 2008 New Revision: 36607 URL: http://svn.reactos.org/svn/reactos?rev=36607&view=rev Log: [FORMATTING], spelling, misc cleanup. No functional changes. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Wed Oct 1 05:05:02 2008 @@ -1065,7 +1065,7 @@ BlendObj->BlendFunction.AlphaFormat); - /* Validate input */ + /* Validate output */ OutputRect = *DestRect; if (OutputRect.right < OutputRect.left) { Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Oct 1 05:05:02 2008 @@ -755,8 +755,7 @@ Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta); Bitmap.bmPlanes = 1; Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat); - //Bitmap.bmBits = bmp->SurfObj.pvBits; - Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */ + Bitmap.bmBits = NULL; /* not set according to wine test, confirmed in win2k */ memcpy(buffer, &Bitmap, Count); } return Count; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Oct 1 05:05:02 2008 @@ -549,9 +549,9 @@ ProbeForWrite(Info, sizeof(BITMAPINFO), 1); coreheader = (BITMAPCOREHEADER*) Info; - coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; + coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; - coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; if (BitmapObj->SurfObj.lDelta > 0) @@ -665,7 +665,7 @@ { Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; - Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; } } @@ -990,7 +990,7 @@ if (!hDc) { - hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); + hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); if (!hDc) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -1031,7 +1031,7 @@ IN OPTIONAL HANDLE hSection, IN DWORD dwOffset, IN LPBITMAPINFO bmi, - DWORD Usage, + DWORD Usage, IN UINT cjHeader, IN FLONG fl, IN ULONG_PTR dwColorSpace, @@ -1148,7 +1148,8 @@ case 16: dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; + break; case 24: dib->dsBitfields[0] = 0xff0000; @@ -1164,11 +1165,8 @@ } dib->dshSection = section; dib->dsOffset = offset; - } - - // Create Device Dependent Bitmap and add DIB pointer - if (dib) - { + + // Create Device Dependent Bitmap and add DIB pointer Size.cx = bm.bmWidth; Size.cy = abs(bm.bmHeight); res = IntCreateBitmap(Size, bm.bmWidthBytes, @@ -1312,7 +1310,6 @@ if (NULL == palGDI) { -// RELEASEDCINFO(hDC); return NULL; } @@ -1344,7 +1341,6 @@ lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue; lpIndex++; } -// RELEASEDCINFO(hDC); PALETTE_UnlockPalette(palGDI); return lpRGB;

1 0

[gschneider] 36606: hColor is not needed in IntSetCursor, fixes Coverity CID 40.
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 04:57:51 2008 New Revision: 36606 URL: http://svn.reactos.org/svn/reactos?rev=36606&view=rev Log: hColor is not needed in IntSetCursor, fixes Coverity CID 40. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Oct 1 04:57:51 2008 @@ -107,7 +107,7 @@ PSYSTEM_CURSORINFO CurInfo; PCURICON_OBJECT OldCursor; HCURSOR Ret = (HCURSOR)0; - HBITMAP dcbmp, hColor = (HBITMAP)0; + HBITMAP dcbmp; HBITMAP hMask = 0; SURFOBJ *soMask = NULL, *soColor = NULL; XLATEOBJ *XlateObj = NULL; @@ -293,10 +293,6 @@ { EngUnlockSurface(soMask); EngDeleteSurface((HSURF)hMask); - } - if(hColor) - { - EngDeleteSurface((HSURF)hColor); } if(XlateObj) {

1 0

[tkreuzer] 36605: fix usage of InterlockedIncrement
by tkreuzer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: tkreuzer Date: Wed Oct 1 04:44:53 2008 New Revision: 36605 URL: http://svn.reactos.org/svn/reactos?rev=36605&view=rev Log: fix usage of InterlockedIncrement Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] Wed Oct 1 04:44:53 2008 @@ -786,7 +786,7 @@ #if defined(HAVE_WIN32_THREADS) if (!run_once.done) { - if (InterlockedIncrement(&run_once.control) == 1) + if (InterlockedIncrement((PLONG)&run_once.control) == 1) { #if !defined(HAVE_COMPILER_TLS) globalkey = TlsAlloc();

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