Ros-diffs

ros-diffs@reactos.org

81390 discussions

[osiejka] 51874: [RPCSS] Addenum. This change slipped past in commit 51873. Fix name of irot header include, which should be irot.h and not irot_s.h. Fixes rpcss build in MSVC.
by osiejka＠svn.reactos.org 23 May '11

23 May '11

Author: osiejka Date: Mon May 23 21:49:12 2011 New Revision: 51874 URL: http://svn.reactos.org/svn/reactos?rev=51874&view=rev Log: [RPCSS] Addenum. This change slipped past in commit 51873. Fix name of irot header include, which should be irot.h and not irot_s.h. Fixes rpcss build in MSVC. Modified: trunk/reactos/base/services/rpcss/irotp.c Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Mon May 23 21:49:12 2011 @@ -1,5 +1,5 @@ /* - * Running Object Table + * Running Object Table * * Copyright 2007 Robert Shearman *

1 0

[osiejka] 51873: Converting POLISH localisation strings to UTF-8. Part 2/4 - - base\setup and base\system coversion - added PRAGMA to rsrc/resource files - added missing polish translations - subst...
by osiejka＠svn.reactos.org 23 May '11

23 May '11

Author: osiejka Date: Mon May 23 21:36:15 2011 New Revision: 51873 URL: http://svn.reactos.org/svn/reactos?rev=51873&view=rev Log: Converting POLISH localisation strings to UTF-8. Part 2/4 - - base\setup and base\system coversion - added PRAGMA to rsrc/resource files - added missing polish translations - subst and runonce - small fixes, style and wording Tested on rbuild/cmake/nmake Added: trunk/reactos/base/system/runonce/lang/pl-PL.rc (with props) trunk/reactos/base/system/subst/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/services/rpcss/irotp.c trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/setup/welcome/lang/pl-PL.rc trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/base/system/regsvr32/lang/pl-PL.rc trunk/reactos/base/system/regsvr32/rsrc.rc trunk/reactos/base/system/rundll32/lang/pl-PL.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/runonce/rsrc.rc trunk/reactos/base/system/subst/rsrc.rc trunk/reactos/base/system/userinit/lang/pl-PL.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/base/system/winlogon/lang/pl-PL.rc trunk/reactos/base/system/winlogon/rsrc.rc Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Mon May 23 21:36:15 2011 @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" -#include "irot_s.h" +#include "irot.h" #include "wine/list.h" #include "wine/debug.h" Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,11 +1,12 @@ /* - * translation by xrogers - * xxrogers(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * http://rogers.cyberdusk.pl/ - * update - niski (bjauy(a)o2.pl) - * updated by Caemyr (Olaf Siejka), Mar 2011 - */ + * translation by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * http://rogers.cyberdusk.pl/ + * update - niski (bjauy(a)o2.pl) + * updated by Caemyr (Olaf Siejka), Mar 2011 + * UTF-8 conversion by Caemyr (May, 2011) + */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -15,8 +16,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Witaj w Kreatorze instalacji ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Nie mo¿esz zainstalowaæ ReactOS bezporednio! Uruchom ponownie komputer z tej p³yty, aby zainstalowaæ ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Nacinij przycisk aby zakoñczyæ pracê Instalatora.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Obecnie nie moÅ¼esz zainstalowaÄ ReactOS bezpoÅrednio! Uruchom ponownie komputer z tej pÅyty, aby zainstalowaÄ ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "NaciÅnij przycisk aby zakoÅczyÄ pracÄ Instalatora.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -25,11 +26,11 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - CONTROL "Jêzyk instalacji:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "JÄzyk instalacji:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 - CONTROL "Uk³ad klawiatury:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "UkÅad klawiatury:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Nacinij Dalej, aby wybraæ rodzaj instalacji.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "NaciÅnij Dalej, aby wybraÄ rodzaj instalacji.", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -39,8 +40,8 @@ BEGIN CONTROL "Rodzaj instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 CONTROL "Zainstaluj ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 - CONTROL "Napraw lub zaktualizuj zainstalowany wczeniej ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Nacinij Dalej, aby zmieniæ ustawienia sprzêtu.", IDC_STATIC, 10, 180 ,297, 10 + CONTROL "Napraw lub zaktualizuj zainstalowany wczeÅniej ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "NaciÅnij Dalej, aby zmieniÄ ustawienia sprzÄtu.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -48,14 +49,14 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Ustawienia sprzêtu", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Ustawienia sprzÄtu", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Komputer:", IDC_STATIC, 20,15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 LTEXT "Ekran:", IDC_STATIC, 20,35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Klawiatura:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Nacinij Dalej, aby ustaliæ miejsce instalacji.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "NaciÅnij Dalej, aby ustaliÄ miejsce instalacji.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -65,24 +66,24 @@ BEGIN CONTROL "Partycja dla instalacji ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 20,155,50,15 - PUSHBUTTON "&Usuñ", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&StwÃ³rz", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&UsuÅ", IDC_PARTDELETE, 76,155,50,15 PUSHBUTTON "s&terownik", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Nacinij Dalej, aby rozpocz¹æ proces instalacji.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "NaciÅnij Dalej, aby rozpoczÄÄ proces instalacji.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Stwórz partycjê" +CAPTION "StwÃ³rz partycjÄ" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "Stwórz i sformatuj partycjê",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + CONTROL "StwÃ³rz i sformatuj partycjÄ",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 LTEXT "Rozmiar:",IDC_STATIC, 13,24,27,9 EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP LTEXT "GB",IDC_UNIT, 117,24,14,9 - LTEXT "System plików:",IDC_STATIC,13,46,35,9 + LTEXT "System plikÃ³w:",IDC_STATIC,13,46,35,9 CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP PUSHBUTTON "&Anuluj",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP @@ -100,7 +101,7 @@ CONTROL "Wgraj bootloader na dysk twardy (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Wgraj bootloader na dysk twardy (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 - CONTROL "Pomiñ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + CONTROL "PomiÅ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Anuluj", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END @@ -111,7 +112,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Podsumowanie instalacji", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Kliknij Dalej, aby rozpocz¹æ proces instalacji.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Kliknij Dalej, aby rozpoczÄÄ proces instalacji.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -120,7 +121,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Instalacja", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Instalacja plików...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "Instalacja plikÃ³w...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -128,34 +129,34 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Koñczenie instalacji ReactOS" +CAPTION "KoÅczenie instalacji ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Koñczenie pierwszego etapu instalacji ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Pierwszy etap instalacji ReactOS zosta³ pomylnie zakoñczony.", IDC_STATIC, 20, 50, 277, 10 + CONTROL "KoÅczenie pierwszego etapu instalacji ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Pierwszy etap instalacji ReactOS zostaÅ pomyÅlnie zakoÅczony.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Po klikniêciu Zakoñcz ten komputer zostanie uruchomiony ponownie.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Po klikniÄciu na ZakoÅcz ten komputer zostanie uruchomiony ponownie.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Jeli w napêdzie jest p³yta CD, wyci¹gnij j¹. Nastêpnie nacinij Zakoñcz, aby uruchomiæ ponownie Twój komputer.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "JeÅli w napÄdzie jest pÅyta CD, wyciÄgnij jÄ. NastÄpnie naciÅnij ZakoÅcz, aby uruchomiÄ ponownie komputer.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "Wybór jêzyka" - IDS_LANGSUBTITLE "Wybierz jêzyk instalacji i docelowego systemu." + IDS_LANGTITLE "WybÃ³r jÄzyka" + IDS_LANGSUBTITLE "Wybierz jÄzyk instalacji i docelowego systemu." IDS_TYPETITLE "Witamy w Instalatorze ReactOS" IDS_TYPESUBTITLE "Wybierz typ instalacji." - IDS_DEVICETITLE "Ustawienia podstawowych urz¹dzeñ" - IDS_DEVICESUBTITLE "Zmieñ ustawienia ekranu i klawiatury." - IDS_DRIVETITLE "Ustaw partycjê instalacji i folder systemowy" + IDS_DEVICETITLE "Ustawienia podstawowych urzÄdzeÅ" + IDS_DEVICESUBTITLE "ZmieÅ ustawienia ekranu i klawiatury." + IDS_DRIVETITLE "Ustaw partycjÄ instalacji i folder systemowy" IDS_DRIVESUBTITLE "Przygotuj partycje instalacji, folder systemowy i bootloader." - IDS_PROCESSTITLE "Przygotuj partycjê, skopiuj pliki i zapisz ustawienia systemu" - IDS_PROCESSSUBTITLE "Przygotuj i sformatuj partycjê, skopiuj pliki, skopiuj i zainstaluj bootloader" - IDS_RESTARTTITLE "Pierwszy etap instalacji zakoñczony sukcesem" - IDS_RESTARTSUBTITLE "Pierwszy etap instalacji zosta³ zakoñczony, uruchom ponownie komputer, aby przejæ do drugiego etapu" + IDS_PROCESSTITLE "Przygotuj partycjÄ, skopiuj pliki i zapisz ustawienia systemu" + IDS_PROCESSSUBTITLE "Przygotuj i sformatuj partycjÄ, skopiuj pliki, skopiuj i zainstaluj bootloader" + IDS_RESTARTTITLE "Pierwszy etap instalacji zakoÅczony sukcesem" + IDS_RESTARTSUBTITLE "Pierwszy etap instalacji zostaÅ zakoÅczony, uruchom ponownie komputer, aby przejÅÄ do drugiego etapu" IDS_SUMMARYTITLE "Podsumowanie instalacji" - IDS_SUMMARYSUBTITLE "Sprawd ustawienia instalacji przed dokonaniem zmian na dysku" - IDS_ABORTSETUP "Instalacja ReactOS nie zosta³a ukoñczona na tym komputerze. Jeli teraz zakoñczysz instalacjê, bêdziesz musia³ uruchomiæ Instalator ponownie, aby zainstalowaæ Reactos. Na pewno zakoñczyæ?" - IDS_ABORTSETUP2 "Przerwaæ instalacjê?" + IDS_SUMMARYSUBTITLE "SprawdÅº ustawienia instalacji przed dokonaniem zmian na dysku" + IDS_ABORTSETUP "Instalacja ReactOS nie zostaÅa ukoÅczona na tym komputerze. JeÅli teraz zakoÅczysz instalacjÄ, bÄdziesz musiaÅ uruchomiÄ Instalator ponownie, aby zainstalowaÄ Reactos. Na pewno zakoÅczyÄ?" + IDS_ABORTSETUP2 "PrzerwaÄ instalacjÄ?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -18,7 +18,6 @@ #include "lang/lt-LT.rc" #include "lang/nl-NL.rc"*/ #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" @@ -27,3 +26,7 @@ #include "lang/th-TH.rc"*/ #include "lang/uk-UA.rc" //#include "lang/zh-CN.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/pl… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,7 +1,8 @@ /* - * translated by Caemyr - * caemyr(a)gmail.com - * https://sourceforge.net/projects/reactospl + * translated by Caemyr + * caemyr(a)gmail.com + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -11,8 +12,8 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Program konfiguracyjny ReactOS wykry³ emulator VMware(r).", -1, 117, 8, 140, 24 - LTEXT "Jeli chcesz zainstalowaæ sterownik SVGA dla VMware(r), nacinij 'Dalej', w przeciwnym razie - 'Anuluj'.", -1, 117, 140, 140, 17 + LTEXT "Program konfiguracyjny ReactOS wykryÅ emulator VMware(r).", -1, 117, 8, 140, 24 + LTEXT "JeÅli chcesz zainstalowaÄ sterownik SVGA dla VMware(r), naciÅnij 'Dalej', w przeciwnym razie - 'Anuluj'.", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -20,7 +21,7 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Program konfiguracyjny ReactOS nie zawiera sterownika SVGA VMware(r).\n\nMusisz wiêc otworzyæ 'VM' w menu Twojej stacji VMware(r) i klikn¹æ na 'Install VMware tools...'\n\n\nNacinij 'Dalej', aby kontynuowaæ albo 'Anuluj', by pomin¹æ instalacjê sterownika SVGA.",-1,25,25,225,85 + LTEXT "Program konfiguracyjny ReactOS nie zawiera sterownika SVGA VMware(r).\n\nMusisz wiÄc otworzyÄ 'VM' w menu Twojej stacji VMware(r) i kliknÄÄ na 'Install VMware tools...'\n\n\nNaciÅnij 'Dalej', aby kontynuowaÄ albo 'Anuluj', by pominÄÄ instalacjÄ sterownika SVGA.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -37,7 +38,7 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Sterownik SVGA VMware(r) zosta³ zainstalowany pomylnie. Proszê wybraæ rozdzielczoæ ekranu:",-1,25,5,225,20 + LTEXT "Sterownik SVGA VMware(r) zostaÅ zainstalowany pomyÅlnie. ProszÄ wybraÄ rozdzielczoÅÄ ekranu:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON @@ -49,7 +50,7 @@ PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON - LTEXT "Proszê wybraæ iloæ kolorów:", -1, 25, 93, 225, 12 + LTEXT "ProszÄ wybraÄ iloÅÄ kolorÃ³w:", -1, 25, 93, 225, 12 COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP END @@ -58,7 +59,7 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Program konfiguracyjny ReactOS Setup nie zdo³a³ zainstalowaæ sterownika SVGA VMware(r).\n\n\nProszê nacisn¹æ 'Zakoñcz', aby kontynuowaæ proces instalacji.",-1,25,25,225,85 + LTEXT "Program konfiguracyjny ReactOS Setup nie zdoÅaÅ zainstalowaÄ sterownika SVGA VMware(r).\n\n\nProszÄ nacisnÄÄ 'ZakoÅcz', aby kontynuowaÄ proces instalacji.",-1,25,25,225,85 END IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -66,11 +67,11 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Sterownik SVGA VMware(r) zosta³ ju¿ zainstalowany.\n\nProszê wybraæ jedn¹ z poni¿szych czynnoci:",-1,25,5,225,30 - PUSHBUTTON "Konfiguracja ustawieñ ekranu", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Sterownik SVGA VMware(r) zostaÅ juÅ¼ zainstalowany.\n\nProszÄ wybraÄ jednÄ z poniÅ¼szych czynnoÅci:",-1,25,5,225,30 + PUSHBUTTON "Konfiguracja ustawieÅ ekranu", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Zmiana sterownika grafiki", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Deinstalacja sterownika SVGA VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Proszê nacisn¹æ 'Dalej', aby kontynuowaæ albo 'Anuluj', aby opuciæ program konfiguracyjny.", -1, 25, 93, 225, 12 + LTEXT "ProszÄ nacisnÄÄ 'Dalej', aby kontynuowaÄ albo 'Anuluj', aby opuÅciÄ program konfiguracyjny.", -1, 25, 93, 225, 12 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -78,10 +79,10 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Proszê wybraæ sterownik grafiki:",-1,25,25,225,15 + LTEXT "ProszÄ wybraÄ sterownik grafiki:",-1,25,25,225,15 PUSHBUTTON "Sterownik ReactOS VGA", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Sterownik ReactOS VBE (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON - LTEXT "Proszê nacisn¹æ 'Zakoñcz', by potwierdziæ wybór albo 'Anuluj', by wyjæ z programu bez zmian.", -1, 25, 93, 225, 20 + LTEXT "ProszÄ nacisnÄÄ 'ZakoÅcz', by potwierdziÄ wybÃ³r albo 'Anuluj', by wyjÅÄ z programu bez zmian.", -1, 25, 93, 225, 20 END IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -89,49 +90,49 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Program konfiguracyjny ReactOS ma zamiar odinstalowaæ sterownik SVGA VMware(r)!\n\n\nNacinij 'Zakoñcz', by odinstalowaæ sterownik lub 'Anuluj', by go pozostawiæ.",-1,25,25,225,85 + LTEXT "Program konfiguracyjny ReactOS ma zamiar odinstalowaÄ sterownik SVGA VMware(r)!\n\n\nNaciÅnij 'ZakoÅcz', by odinstalowaÄ sterownik lub 'Anuluj', by go pozostawiÄ.",-1,25,25,225,85 END STRINGTABLE BEGIN IDS_WIZARD_NAME "Wykryto VMware(r)" - IDS_FAILEDTOLOCATEDRIVERS "Program konfiguracyjny ReactOS nie mo¿e znaleæ potrzebnych plików.\nProszê upewniæ siê, ¿e w napêdzie znajduje siê CD z VMware(r) tools." - IDS_FAILEDTOCOPYFILES "Program konfiguracyjny ReactOS nie by³ w stanie przekopiowaæ niezbêdnych plików.\nProszê upewniæ siê, ¿e w napêdzie znajduje siê CD z VMware(r) tools.\n" + IDS_FAILEDTOLOCATEDRIVERS "Program konfiguracyjny ReactOS nie moÅ¼e znaleÅºÄ potrzebnych plikÃ³w.\nProszÄ upewniÄ siÄ, Å¼e w napÄdzie znajduje siÄ CD z VMware(r) tools." + IDS_FAILEDTOCOPYFILES "Program konfiguracyjny ReactOS nie byÅ w stanie przekopiowaÄ niezbÄdnych plikÃ³w.\nProszÄ upewniÄ siÄ, Å¼e w napÄdzie znajduje siÄ CD z VMware(r) tools.\n" IDS_FAILEDTOACTIVATEDRIVER "Inicjalizacja sterownika SVGA VMware(r) nieudana!" IDS_FAILEDTOSELVGADRIVER "Inicjalizacja sterownika VGA ReactOS nieudana!" IDS_FAILEDTOSELVBEDRIVER "Inicjalizacja sterownika VBE ReactOS nieudana!" - IDS_UNINSTNOTICE "Nie wszystkie pliki sterownika SVGA VMware(r) zosta³y skasowane.\nProszê usun¹æ je rêcznie, po restarcie systemu." - IDS_FAILEDTOADDREGENTRIES "Nie uda³o siê stworzyæ wpisów w rejestrze dla sterownika SVGA VMware(r)!" + IDS_UNINSTNOTICE "Nie wszystkie pliki sterownika SVGA VMware(r) zostaÅy skasowane.\nProszÄ usunÄÄ je rÄcznie, po restarcie systemu." + IDS_FAILEDTOADDREGENTRIES "Nie udaÅo siÄ stworzyÄ wpisÃ³w w rejestrze dla sterownika SVGA VMware(r)!" END STRINGTABLE BEGIN - 10001 "256 kolorów (8BPP)" - 10002 "65k kolorów (16BPP)" - 10003 "16m kolorów (32BPP)" + 10001 "256 kolorÃ³w (8BPP)" + 10002 "65k kolorÃ³w (16BPP)" + 10003 "16m kolorÃ³w (32BPP)" END STRINGTABLE BEGIN IDS_SEARCHINGFORCDROM "Poszukiwanie CD z VMware(r) Tools..." - IDS_COPYINGFILES "Kopiowanie plików..." + IDS_COPYINGFILES "Kopiowanie plikÃ³w..." IDS_ENABLINGDRIVER "Inicjalizacja sterownika SVGA VMware(r)..." END STRINGTABLE BEGIN IDD_INSERT_VMWARE_TOOLSTITLE "Kreator konfiguracji sterownika SVGA VMware(r)" - IDD_INSERT_VMWARE_TOOLSSUBTITLE "Proszê w³o¿yæ CD z VMware tools." + IDD_INSERT_VMWARE_TOOLSSUBTITLE "ProszÄ wÅoÅ¼yÄ CD z VMware tools." IDD_INSTALLING_VMWARE_TOOLSTITLE "Kreator konfiguracji sterownika SVGA VMware(r)" - IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Wyszukiwanie i kopiowanie plików sterownika SVGA VMware(r)." + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Wyszukiwanie i kopiowanie plikÃ³w sterownika SVGA VMware(r)." IDD_CONFIGTITLE "Kreator konfiguracji sterownika SVGA VMware(r)" - IDD_CONFIGSUBTITLE "Proszê wybraæ rozdzielczoæ ekranu." + IDD_CONFIGSUBTITLE "ProszÄ wybraÄ rozdzielczoÅÄ ekranu." IDD_INSTALLATION_FAILEDTITLE "Kreator konfiguracji sterownika SVGA VMware(r)" IDD_INSTALLATION_FAILEDSUBTITLE "Instalacja sterownika SVGA VMware(r) nieudana." IDD_CHOOSEACTIONTITLE "Kreator konfiguracji sterownika SVGA VMware(r)" - IDD_CHOOSEACTIONSUBTITLE "Proszê dokonaæ wyboru." + IDD_CHOOSEACTIONSUBTITLE "ProszÄ dokonaÄ wyboru." IDD_SELECTDRIVERTITLE "Kreator konfiguracji sterownika SVGA VMware(r)" - IDD_SELECTDRIVERSUBTITLE "Proszê wybraæ sterownik." + IDD_SELECTDRIVERSUBTITLE "ProszÄ wybraÄ sterownik." IDD_DOUNINSTALLTITLE "Kreator konfiguracji sterownika SVGA VMware(r)" IDD_DOUNINSTALLSUBTITLE "Deinstalacja sterownika." END Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -26,8 +26,11 @@ #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/pl… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,4 +1,8 @@ -/* $Id: en-US.rc 24952 2006-11-28 21:44:53Z janderwald $ */ +/* + * translated by Polish Translation Team (Apr, 2007) + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -10,16 +14,16 @@ IDS_APPTITLE "ReactOS - Zapraszamy" IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Witaj w systemie operacyjnym ReactOS.\n\nWybierz temat po lewej." -// IDS_CHECKTEXT "Poka¿ ten dialog ponownie" -// IDS_CLOSETEXT "Wyjcie" +// IDS_CHECKTEXT "PokaÅ¼ ten dialog ponownie" +// IDS_CLOSETEXT "WyjÅcie" END /* Topic buttons */ STRINGTABLE DISCARDABLE BEGIN IDS_TOPICBUTTON0 "Zainstaluj ReactOS" - IDS_TOPICBUTTON1 "Przegl¹daj CD" - IDS_TOPICBUTTON2 "Wyjcie" + IDS_TOPICBUTTON1 "PrzeglÄdaj CD" + IDS_TOPICBUTTON2 "WyjÅcie" // IDS_TOPICBUTTON3 "Empty Topic 3" // IDS_TOPICBUTTON4 "Empty Topic 4" // IDS_TOPICBUTTON5 "Empty Topic 5" @@ -33,8 +37,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_TOPICTITLE0 "Zainstaluj ReactOS" - IDS_TOPICTITLE1 "Przegl¹daj CD" - IDS_TOPICTITLE2 "Wyjcie" + IDS_TOPICTITLE1 "PrzeglÄdaj CD" + IDS_TOPICTITLE2 "WyjÅcie" // IDS_TOPICTITLE3 "Empty Topic Title 3" // IDS_TOPICTITLE4 "Empty Topic Title 4" // IDS_TOPICTITLE5 "Empty Topic Title 5" @@ -47,9 +51,9 @@ /* Topic descriptions */ STRINGTABLE DISCARDABLE BEGIN - IDS_TOPICDESC0 "Utwórz now¹ instalacjê ReactOS na komputerze lub aktualizuj istniej¹c¹." - IDS_TOPICDESC1 "Przegl¹daj CD." - IDS_TOPICDESC2 "Kliknij, aby zakoñczyæ aplikacjê." + IDS_TOPICDESC0 "UtwÃ³rz nowÄ instalacjÄ ReactOS na komputerze lub aktualizuj juÅ¼ istniejÄcÄ." + IDS_TOPICDESC1 "PrzeglÄdaj CD." + IDS_TOPICDESC2 "Kliknij, aby zakoÅczyÄ aplikacjÄ." // IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." // IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." // IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/welcome/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -55,7 +55,6 @@ #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" @@ -63,3 +62,7 @@ #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/system/regsvr32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,34 +1,36 @@ +/* + * translated by xrogers (http://rogers.cyberdusk.pl/) + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ + #include "resource.h" -/* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN IDS_UsageMessage, "%s\n\ -Sposób u¿ycia: regsvr32 [/u] [/s] [/c] [/n] [/i[:wiersz_polecenia]] nazwa_pliku_dll\n\ +SposÃ³b uÅ¼ycia: regsvr32 [/u] [/s] [/c] [/n] [/i[:wiersz_polecenia]] nazwa_pliku_dll\n\ /u - Wyrejestruj serwer\n\ -/s - Tryb cichy; nie wywietlaj okien komunikatów\n\ -/c - Wyjcie w konsoli\n\ -/i - Wywo³aj funkcjê DllInstall, przekazuj¹c jej opcjonalny [wiersz_polecenia]; u¿ycie tej opcji razem z opcj¹ /u wywo³uje funkcjê dll uninstall\n\ -/n - Nie wywo³uj serwera DllRegisterServer; tej opcji trzeba u¿yæ z opcj¹ /i" +/s - Tryb cichy; nie wyÅwietlaj okien komunikatÃ³w\n\ +/c - WyjÅcie w konsoli\n\ +/i - WywoÅaj funkcjÄ DllInstall, przekazujÄc jej opcjonalny [wiersz_polecenia]; uÅ¼ycie tej opcji razem z opcjÄ /u wywoÅuje funkcjÄ dll uninstall\n\ +/n - Nie wywoÅuj serwera DllRegisterServer; tej opcji trzeba uÅ¼yÄ z opcjÄ /i" -IDS_NoDllSpecified, "Nie okrelono nazwy biblioteki DLL." +IDS_NoDllSpecified, "Nie okreÅlono nazwy biblioteki DLL." IDS_InvalidFlag, "Nierozpoznana flaga: %s" -IDS_SwitchN_NoI, "Nierozpoznana flaga: /n musi byæ u¿yta z prze³¹cznikiem /i" +IDS_SwitchN_NoI, "Nierozpoznana flaga: /n musi byÄ uÅ¼yta z przeÅÄcznikiem /i" -IDS_DllNotLoaded, "LoadLibrary('%s') nie powiod³o siê.\nGetLastError zwraca 0x%08x." +IDS_DllNotLoaded, "LoadLibrary('%s') nie powiodÅo siÄ.\nGetLastError zwraca 0x%08x." -IDS_MissingEntry, "%s zosta³ za³adowany, jednak punkt wejcia %s nie zosta³ odnaleziony.\n\n\ -%s mo¿e nie byæ eksportowany, lub uszkodzona wersja %s mo¿e byæ za³adowana w pamiêci. Proszê rozwa¿yæ u¿ycie PView, aby wykryæ i usun¹æ to." +IDS_MissingEntry, "%s zostaÅ zaÅadowany, jednak punkt wejÅcia %s nie zostaÅ odnaleziony.\n\n\ +%s moÅ¼e nie byÄ eksportowalny, lub uszkodzona wersja %s moÅ¼e byÄ zaÅadowana w pamiÄci. ProszÄ rozwaÅ¼yÄ uÅ¼ycie PView, aby wykryÄ i usunÄÄ bÅÄdy." -IDS_FailureMessage, "%s w %s nie powiod³a siê.\nKod wynikowy: 0x%08x" +IDS_FailureMessage, "%s w %s nie powiodÅa siÄ.\nKod rezultatu: 0x%08x" -IDS_SuccessMessage "%s w %s zakoñczona sukcesem." +IDS_SuccessMessage "%s w %s zakoÅczona sukcesem." END Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… ============================================================================== --- trunk/reactos/base/system/regsvr32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -16,7 +16,10 @@ #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/system/rundll32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,13 +1,14 @@ #include "resource.h" /* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ + * translated by xrogers (http://rogers.cyberdusk.pl/) + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN - IDS_DllNotLoaded, "LoadLibrary nie móg³ za³adowaæ '%s'" - IDS_MissingEntry, "Brakuj¹cy punkt wejcia:%s\nW %s" + IDS_DllNotLoaded, "Funkcja LoadLibrary nie mogÅa zaÅadowaÄ '%s'" + IDS_MissingEntry, "BrakujÄcy punkt wejÅcia:%s\nW %s" END Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… ============================================================================== --- trunk/reactos/base/system/rundll32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -16,10 +16,13 @@ #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Added: trunk/reactos/base/system/runonce/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/p… ============================================================================== --- trunk/reactos/base/system/runonce/lang/pl-PL.rc (added) +++ trunk/reactos/base/system/runonce/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,0 +1,20 @@ +/* + * translated by Caemyr - Olaf Siejka (May, 2011) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + * UTF-8 conversion by Caemyr (May, 2011) + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + + +IDD_RUNONCE_DLG DIALOG DISCARDABLE 0, 0, 239, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Program konfiguracyjny ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS w tej chwili konfiguruje poniÅ¼sze moduÅy:", -1, 38, 8, 196, 18 + LISTBOX IDC_COMP_LIST, 36, 32, 197, 131, LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 5, 6, 21, 20 +END Propchange: trunk/reactos/base/system/runonce/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/runonce/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r… ============================================================================== --- trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -7,3 +7,6 @@ #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Added: trunk/reactos/base/system/subst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/pl-… ============================================================================== --- trunk/reactos/base/system/subst/lang/pl-PL.rc (added) +++ trunk/reactos/base/system/subst/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,0 +1,27 @@ +/* + * translated by Caemyr - Olaf Siejka (May, 2011) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + * UTF-8 conversion by Caemyr (May, 2011) + */ + +#include "resource.h" + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "NieprawidÅowa liczba parametrÃ³w - %s\n" + IDS_INVALID_PARAMETER "NieprawidÅowy parametr - %s\n" + IDS_INVALID_PARAMETER2 "NieprawidÅowe parametry - %s\n" + IDS_DRIVE_ALREAD_SUBSTED "Na tym dysku juÅ¼ uÅ¼yto komendy SUBST\n" + IDS_FAILED_WITH_ERROCODE "BÅÄd 0x%x: %s\n" + IDS_USAGE "PowiÄzuje ÅcieÅ¼kÄ z literÄ napÄdu.\n\n\ +SUBST [napÄd1: [napÄd2:]ÅcieÅ¼ka]\n\ +SUBST napÄd1: /D\n\n\ + napÄd1: OkreÅla wirutalny napÄd do litery ktÃ³reego chcesz powiÄzaÄ ÅcieÅ¼kÄ.\n\ + [napÄd2:]ÅcieÅ¼ka OkreÅla istniejÄcÄ ÅcieÅ¼kÄ, ktÃ³rÄ chcesz powiÄzaÄ z literÄ napÄdu \n wirtualnego.\n\ + /D Kasuje aktywny (wirtualny) napÄd.\n\n\ +UÅ¼ycie SUBST bez Å¼adnych parametrÃ³w wyÅwietla aktualnÄ listÄ napÄdÃ³w wirtualnych.\n" +END Propchange: trunk/reactos/base/system/subst/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/subst/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/system/subst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/rsrc.rc?… ============================================================================== --- trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -6,3 +6,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,13 +1,16 @@ +/* + * translated by xrogers (http://rogers.cyberdusk.pl/) + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ + #include "resource.h" -/* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -STRING_USERINIT_FAIL, "Nie powiod³o siê uruchomienie pow³oki przez userinit!\n" +STRING_USERINIT_FAIL, "Nie powiodÅo siÄ uruchomienie powÅoki przez userinit!\n" END Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… ============================================================================== --- trunk/reactos/base/system/userinit/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -18,10 +18,13 @@ #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/system/winlogon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/pl-PL.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -1,46 +1,50 @@ -//Polish translation by Sebastian Gasiorek +/* + * translated by Sebastian Gasiorek + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wy³¹czanie komputera" +CAPTION "WyÅÄczanie komputera" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Mo¿na bezpiecznie wy³¹czyæ komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "MoÅ¼na bezpiecznie wyÅÄczyÄ komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "B³¹d interfejsu u¿ytkownika" +CAPTION "BÅÄd interfejsu uÅ¼ytkownika" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nie mo¿na za³adowaæ biblioteki DLL interfejsu logowania u¿ytkownika %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Skontaktuj siê z administratorem systemu, aby zamieni³ bibliotekê DLL lub odtworzy³ jej oryginaln¹ wersjê.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "Nie moÅ¼na zaÅadowaÄ biblioteki DLL interfejsu logowania uÅ¼ytkownika %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Skontaktuj siÄ z administratorem systemu, aby zamieniÄ bibliotekÄ DLL lub odtworzyÄ jej oryginalnÄ wersjÄ.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14 END STRINGTABLE BEGIN - IDS_PREPARENETWORKCONNECTIONS "Trwa przygotowywanie po³¹czeñ sieciowych..." - IDS_APPLYINGCOMPUTERSETTINGS "Trwa wprowadzanie ustawieñ komputera..." - IDS_RUNNINGSTARTUPSCRIPTS "Trwa uruchamianie skryptów uruchamiania..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Trwa uruchamianie skryptów zamykania..." - IDS_APPLYINGYOURPERSONALSETTINGS "Trwa wprowadzanie ustawieñ osobistych..." - IDS_RUNNINGLOGOFFSCRIPTS "Trwa uruchamianie skryptów wylogowania..." - IDS_RUNNINGLOGONSCRIPTS "Trwa uruchamianie skryptów logowania..." - IDS_LOADINGYOURPERSONALSETTINGS "Trwa ³adowanie ustawieñ osobistych..." - IDS_CLOSINGNETWORKCONNECTIONS "Trwa zamykanie po³¹czeñ sieciowych..." + IDS_PREPARENETWORKCONNECTIONS "Trwa przygotowywanie poÅÄczeÅ sieciowych..." + IDS_APPLYINGCOMPUTERSETTINGS "Trwa wprowadzanie ustawieÅ komputera..." + IDS_RUNNINGSTARTUPSCRIPTS "Trwa uruchamianie skryptÃ³w startowych..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Trwa uruchamianie skryptÃ³w zamykania..." + IDS_APPLYINGYOURPERSONALSETTINGS "Trwa wprowadzanie ustawieÅ osobistych..." + IDS_RUNNINGLOGOFFSCRIPTS "Trwa uruchamianie skryptÃ³w wylogowania..." + IDS_RUNNINGLOGONSCRIPTS "Trwa uruchamianie skryptÃ³w logowania..." + IDS_LOADINGYOURPERSONALSETTINGS "Trwa Åadowanie ustawieÅ osobistych..." + IDS_CLOSINGNETWORKCONNECTIONS "Trwa zamykanie poÅÄczeÅ sieciowych..." IDS_REACTOSISSHUTTINGDOWN "Trwa zamykanie systemu ReactOS..." - IDS_PREPARETOSTANDBY "Trwa przygotowywanie do przejcia w stan wstrzymania..." + IDS_PREPARETOSTANDBY "Trwa przygotowywanie do przejÅcia w stan wstrzymania..." IDS_PREPARETOHIBERNATE "Trwa przygotowywanie do hibernacji..." - IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawieñ..." + IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawieÅ..." IDS_REACTOSISSTARTINGUP "Trwa uruchamianie systemu ReactOS..." END STRINGTABLE BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon nie móg³ aktywowaæ pow³oki u¿ytkownika!" + IDS_FAILEDACTIVATEUSERSHELL "Winlogon nie mÃ³gÅ aktywowaÄ powÅoki uÅ¼ytkownika!" END - Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… ============================================================================== --- trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] Mon May 23 21:36:15 2011 @@ -19,10 +19,13 @@ #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc"

1 0

[mkupfer] 51872: revert previous commit due to serious build problems
by mkupfer＠svn.reactos.org 23 May '11

23 May '11

Author: mkupfer Date: Mon May 23 19:48:04 2011 New Revision: 51872 URL: http://svn.reactos.org/svn/reactos?rev=51872&view=rev Log: revert previous commit due to serious build problems Modified: trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/configure.sh trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc trunk/reactos/drivers/bus/acpi/busmgr/button.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/pnp.c trunk/reactos/drivers/bus/acpi/power.c trunk/reactos/drivers/bus/pcix/pci/busno.c trunk/reactos/hal/halx86/mp/i386/mps.S trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -126,7 +126,7 @@ FILE_SEQUENTIAL_ONLY); if(!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); + DPRINT1("NtOpenFile failed: %x\n", Status); goto done; } #else Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Mon May 23 19:48:04 2011 @@ -40,7 +40,6 @@ fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2fs.sys=,,,,,,x,,,,,,4 -vgafonts.cab=,,,,,,,,,,,,1 classpnp.sys=,,,,,,,,,,,,4 pcix.sys=,,,,,,,,,,,,4 pcmcia.sys=,,,,,,,,,,,,4 Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=51872&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Mon May 23 19:48:04 2011 @@ -10,6 +10,7 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH +echo ARCH $ARCH ROS $ROS_ARCH if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -33,5 +34,5 @@ cd ../reactos cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" -echo "Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...)." +echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...). Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Mon May 23 19:48:04 2011 @@ -9,8 +9,8 @@ #include "locale_rc.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" #include "lang/es-ES.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Mon May 23 19:48:04 2011 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne jelenÃ&tse meg ezt az Ã¼zenetet mÃ©gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&MÃ©gse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&MÃ©gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Mon May 23 19:48:04 2011 @@ -34,10 +34,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "NÃ£o &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&NÃ£o", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&NÃ£o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -42,13 +42,13 @@ static int acpi_button_remove (struct acpi_device *device, int type); static struct acpi_driver acpi_button_driver = { - {0,0}, - ACPI_BUTTON_DRIVER_NAME, - ACPI_BUTTON_CLASS, - 0, - 0, - "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", - {acpi_button_add,acpi_button_remove} + .name = ACPI_BUTTON_DRIVER_NAME, + .class = ACPI_BUTTON_CLASS, + .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", + .ops = { + .add = acpi_button_add, + .remove = acpi_button_remove, + }, }; struct acpi_button { Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -64,13 +64,14 @@ static int acpi_power_resume(struct acpi_device *device, int state); static struct acpi_driver acpi_power_driver = { - {0,0}, - ACPI_POWER_DRIVER_NAME, - ACPI_POWER_CLASS, - 0, - 0, - ACPI_POWER_HID, - {acpi_power_add, acpi_power_remove, NULL, NULL, acpi_power_resume} + .name = ACPI_POWER_DRIVER_NAME, + .class = ACPI_POWER_CLASS, + .ids = ACPI_POWER_HID, + .ops = { + .add = acpi_power_add, + .remove = acpi_power_remove, + .resume = acpi_power_resume, + }, }; struct acpi_power_reference { Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -48,13 +48,13 @@ ACPI_STATUS acpi_suspend (UINT32 state); static struct acpi_driver acpi_system_driver = { - {0,0}, - ACPI_SYSTEM_DRIVER_NAME, - ACPI_SYSTEM_CLASS, - 0, - 0, - ACPI_SYSTEM_HID, - {acpi_system_add, acpi_system_remove} + .name = ACPI_SYSTEM_DRIVER_NAME, + .class = ACPI_SYSTEM_CLASS, + .ids = ACPI_SYSTEM_HID, + .ops = { + .add = acpi_system_add, + .remove = acpi_system_remove + }, }; struct acpi_system Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -11,13 +11,6 @@ #define NDEBUG #include <debug.h> - -NTSTATUS -NTAPI -DriverEntry ( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath - ); #ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry) Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -9,17 +9,12 @@ #include <wdmguid.h> #define NDEBUG #include <debug.h> - -NTSTATUS -Bus_PlugInDevice ( - struct acpi_device *Device, - PFDO_DEVICE_DATA FdoData - ); #ifdef ALLOC_PRAGMA #pragma alloc_text (PAGE, Bus_PnP) #pragma alloc_text (PAGE, Bus_PlugInDevice) #pragma alloc_text (PAGE, Bus_InitializePdo) +#pragma alloc_text (PAGE, Bus_UnPlugDevice) #pragma alloc_text (PAGE, Bus_DestroyPdo) #pragma alloc_text (PAGE, Bus_FDO_PnP) #pragma alloc_text (PAGE, Bus_StartFdo) Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -224,7 +224,7 @@ return status; } -#if !defined(NDEBUG) || defined(_MSC_VER) +#ifndef NDEBUG PCHAR PowerMinorFunctionString ( Modified: trunk/reactos/drivers/bus/pcix/pci/busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/busno… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -20,9 +20,8 @@ NTAPI PciAreBusNumbersConfigured(IN PPCI_PDO_EXTENSION PdoExtension) { + PAGED_CODE(); UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; - - PAGED_CODE(); /* Get all relevant bus number details */ PrimaryBus = PdoExtension->Dependent.type1.PrimaryBus; Modified: trunk/reactos/hal/halx86/mp/i386/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/i386/mps.S?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] Mon May 23 19:48:04 2011 @@ -11,9 +11,7 @@ /* INCLUDES ******************************************************************/ -#include <asm.inc> - -#include <ks386.inc> +#include <ndk/asm.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] Mon May 23 19:48:04 2011 @@ -30,9 +30,6 @@ #include "float_cast.h" #include "common.h" -#include <windows.h> -#include <debug.h> - static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void linear_reset (SRC_PRIVATE *psrc) ; @@ -110,8 +107,8 @@ src_ratio = psrc->last_ratio + priv->out_gen * (data->src_ratio - psrc->last_ratio) / priv->out_count ; if (SRC_DEBUG && priv->in_used < priv->channels && input_index < 1.0) - { DPRINT1 ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; - ASSERT (0) ; + { printf ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; + exit (1) ; } ; for (ch = 0 ; ch < priv->channels ; ch++) 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] Mon May 23 19:48:04 2011 @@ -41,7 +41,7 @@ ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; ULONG KePrefetchNTAGranularity = 32; -CHAR KeNumberProcessors = 0; +CHAR KeNumberProcessors; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent;

1 0

[mkupfer] 51871: patch by Igor Paliychuk <mansonigor at gmail dot com>: - [CMAKE] Reduce difference with cmake branch - msvc fixes - minor changes by me
by mkupfer＠svn.reactos.org 23 May '11

23 May '11

Author: mkupfer Date: Mon May 23 19:30:50 2011 New Revision: 51871 URL: http://svn.reactos.org/svn/reactos?rev=51871&view=rev Log: patch by Igor Paliychuk <mansonigor at gmail dot com>: - [CMAKE] Reduce difference with cmake branch - msvc fixes - minor changes by me Modified: trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/configure.sh trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc trunk/reactos/drivers/bus/acpi/busmgr/button.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/pnp.c trunk/reactos/drivers/bus/acpi/power.c trunk/reactos/drivers/bus/pcix/pci/busno.c trunk/reactos/hal/halx86/mp/i386/mps.S trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -126,7 +126,7 @@ FILE_SEQUENTIAL_ONLY); if(!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile failed: %x\n", Status); + DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); goto done; } #else Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Mon May 23 19:30:50 2011 @@ -40,6 +40,7 @@ fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2fs.sys=,,,,,,x,,,,,,4 +vgafonts.cab=,,,,,,,,,,,,1 classpnp.sys=,,,,,,,,,,,,4 pcix.sys=,,,,,,,,,,,,4 pcmcia.sys=,,,,,,,,,,,,4 Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=51871&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Mon May 23 19:30:50 2011 @@ -10,7 +10,6 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -echo ARCH $ARCH ROS $ROS_ARCH if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -34,5 +33,5 @@ cd ../reactos cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" -echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...). +echo "Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...)." Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Mon May 23 19:30:50 2011 @@ -9,8 +9,8 @@ #include "locale_rc.rc" +#include "lang/en-US.rc" #include "lang/de-DE.rc" -#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Mon May 23 19:30:50 2011 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne jelenÃ&tse meg ezt az Ã¼zenetet mÃ©gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&MÃ©gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&MÃ©gse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Mon May 23 19:30:50 2011 @@ -34,10 +34,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "NÃ£o &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&NÃ£o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&NÃ£o", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -42,13 +42,13 @@ static int acpi_button_remove (struct acpi_device *device, int type); static struct acpi_driver acpi_button_driver = { - .name = ACPI_BUTTON_DRIVER_NAME, - .class = ACPI_BUTTON_CLASS, - .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", - .ops = { - .add = acpi_button_add, - .remove = acpi_button_remove, - }, + {0,0}, + ACPI_BUTTON_DRIVER_NAME, + ACPI_BUTTON_CLASS, + 0, + 0, + "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", + {acpi_button_add,acpi_button_remove} }; struct acpi_button { Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -64,14 +64,13 @@ static int acpi_power_resume(struct acpi_device *device, int state); static struct acpi_driver acpi_power_driver = { - .name = ACPI_POWER_DRIVER_NAME, - .class = ACPI_POWER_CLASS, - .ids = ACPI_POWER_HID, - .ops = { - .add = acpi_power_add, - .remove = acpi_power_remove, - .resume = acpi_power_resume, - }, + {0,0}, + ACPI_POWER_DRIVER_NAME, + ACPI_POWER_CLASS, + 0, + 0, + ACPI_POWER_HID, + {acpi_power_add, acpi_power_remove, NULL, NULL, acpi_power_resume} }; struct acpi_power_reference { Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -48,13 +48,13 @@ ACPI_STATUS acpi_suspend (UINT32 state); static struct acpi_driver acpi_system_driver = { - .name = ACPI_SYSTEM_DRIVER_NAME, - .class = ACPI_SYSTEM_CLASS, - .ids = ACPI_SYSTEM_HID, - .ops = { - .add = acpi_system_add, - .remove = acpi_system_remove - }, + {0,0}, + ACPI_SYSTEM_DRIVER_NAME, + ACPI_SYSTEM_CLASS, + 0, + 0, + ACPI_SYSTEM_HID, + {acpi_system_add, acpi_system_remove} }; struct acpi_system Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -11,6 +11,13 @@ #define NDEBUG #include <debug.h> + +NTSTATUS +NTAPI +DriverEntry ( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry) Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -9,12 +9,17 @@ #include <wdmguid.h> #define NDEBUG #include <debug.h> + +NTSTATUS +Bus_PlugInDevice ( + struct acpi_device *Device, + PFDO_DEVICE_DATA FdoData + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (PAGE, Bus_PnP) #pragma alloc_text (PAGE, Bus_PlugInDevice) #pragma alloc_text (PAGE, Bus_InitializePdo) -#pragma alloc_text (PAGE, Bus_UnPlugDevice) #pragma alloc_text (PAGE, Bus_DestroyPdo) #pragma alloc_text (PAGE, Bus_FDO_PnP) #pragma alloc_text (PAGE, Bus_StartFdo) Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -224,7 +224,7 @@ return status; } -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(_MSC_VER) PCHAR PowerMinorFunctionString ( Modified: trunk/reactos/drivers/bus/pcix/pci/busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/busno… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -20,8 +20,9 @@ NTAPI PciAreBusNumbersConfigured(IN PPCI_PDO_EXTENSION PdoExtension) { + UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; + PAGED_CODE(); - UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; /* Get all relevant bus number details */ PrimaryBus = PdoExtension->Dependent.type1.PrimaryBus; Modified: trunk/reactos/hal/halx86/mp/i386/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/i386/mps.S?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] Mon May 23 19:30:50 2011 @@ -11,7 +11,9 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <asm.inc> + +#include <ks386.inc> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -30,6 +30,9 @@ #include "float_cast.h" #include "common.h" +#include <windows.h> +#include <debug.h> + static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void linear_reset (SRC_PRIVATE *psrc) ; @@ -107,8 +110,8 @@ src_ratio = psrc->last_ratio + priv->out_gen * (data->src_ratio - psrc->last_ratio) / priv->out_count ; if (SRC_DEBUG && priv->in_used < priv->channels && input_index < 1.0) - { printf ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; - exit (1) ; + { DPRINT1 ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; + ASSERT (0) ; } ; for (ch = 0 ; ch < priv->channels ; ch++) 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] Mon May 23 19:30:50 2011 @@ -41,7 +41,7 @@ ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; ULONG KePrefetchNTAGranularity = 32; -CHAR KeNumberProcessors; +CHAR KeNumberProcessors = 0; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent;

1 0

[akhaldi] 51870: [CMAKE] * Remove meaningless target_link_libraries(${MODULE})
by akhaldi＠svn.reactos.org 23 May '11

23 May '11

Author: akhaldi Date: Mon May 23 18:52:04 2011 New Revision: 51870 URL: http://svn.reactos.org/svn/reactos?rev=51870&view=rev Log: [CMAKE] * Remove meaningless target_link_libraries(${MODULE}) Modified: trunk/reactos/msc.cmake Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=51870&r1=518… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Mon May 23 18:52:04 2011 @@ -108,7 +108,6 @@ set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) - target_link_libraries(${MODULE}) endif() endmacro() @@ -195,4 +194,3 @@ #pseh workaround set(PSEH_LIB "pseh") -

1 0

[ekohl] 51869: Real fix of the broken build.
by ekohl＠svn.reactos.org 23 May '11

23 May '11

Author: ekohl Date: Mon May 23 18:49:03 2011 New Revision: 51869 URL: http://svn.reactos.org/svn/reactos?rev=51869&view=rev Log: Real fix of the broken build. Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Mon May 23 18:49:03 2011 @@ -20,7 +20,6 @@ HKEY hKey; DWORD dwSize; PBYTE pBitmap; - PBYTE pData; } COMDB, *PCOMDB; @@ -92,7 +91,7 @@ L"ComDB", 0, REG_BINARY, - pComDB->pData, + pComDB->pBitmap, pComDB->dwSize); } @@ -171,10 +170,10 @@ { /* Allocate a new bitmap */ pComDB->dwSize = COMDB_MIN_PORTS_ARBITRATED / BITS_PER_BYTE; - pComDB->pData = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - pComDB->dwSize); - if (pComDB->pData == NULL) + pComDB->pBitmap = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pComDB->dwSize); + if (pComDB->pBitmap == NULL) { ERR("Failed to allocaete the bitmap!\n"); lError = ERROR_ACCESS_DENIED; @@ -186,7 +185,7 @@ L"ComDB", 0, REG_BINARY, - pComDB->pData, + pComDB->pBitmap, pComDB->dwSize); } @@ -197,8 +196,8 @@ if (pComDB->hKey != NULL) RegCloseKey(pComDB->hKey); - if (pComDB->pData != NULL) - HeapFree(GetProcessHeap(), 0, pComDB->pData); + if (pComDB->pBitmap != NULL) + HeapFree(GetProcessHeap(), 0, pComDB->pBitmap); HeapFree(GetProcessHeap(), 0, pComDB);

1 0

[tkreuzer] 51868: [CMAKE] - Remove last traces of mingw_common - adopt msvcrtex on msvc builds - Fix MSVC warnings in crtexe.c, already pushed upstream
by tkreuzer＠svn.reactos.org 23 May '11

23 May '11

Author: tkreuzer Date: Mon May 23 18:27:16 2011 New Revision: 51868 URL: http://svn.reactos.org/svn/reactos?rev=51868&view=rev Log: [CMAKE] - Remove last traces of mingw_common - adopt msvcrtex on msvc builds - Fix MSVC warnings in crtexe.c, already pushed upstream Added: trunk/reactos/lib/sdk/crt/misc/ofmt_stub.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/ofmt_stub.c trunk/reactos/lib/sdk/crt/startup/crtdll.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/crtdll.c trunk/reactos/lib/sdk/crt/startup/dllentry.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/dllentry.c trunk/reactos/lib/sdk/crt/startup/pseudo-reloc-list.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c Modified: trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/system/autochk/CMakeLists.txt trunk/reactos/base/system/smss/CMakeLists.txt trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/win32/dnsapi/CMakeLists.txt trunk/reactos/dll/win32/olesvr32/CMakeLists.txt trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crtexe.c trunk/reactos/msc.cmake trunk/reactos/subsystems/ntvdm/CMakeLists.txt Modified: trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -11,5 +11,5 @@ add_library(kbsdll SHARED ${SOURCE}) set_module_type(kbsdll win32dll) -add_importlibs(kbsdll user32 comctl32 kernel32 msvcrt) +add_importlibs(kbsdll user32 comctl32 msvcrt kernel32) add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -64,8 +64,6 @@ -lgcc -lmingwex wine - mingw_wmain - mingw_common uuid) add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll) Modified: trunk/reactos/base/system/autochk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/CMakeL… ============================================================================== --- trunk/reactos/base/system/autochk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -3,6 +3,6 @@ set_module_type(autochk nativecui) -target_link_libraries(autochk mingw_common nt) -add_importlibs(autochk kernel32 ntdll) +target_link_libraries(autochk nt) +add_importlibs(autochk ntdll) add_cd_file(TARGET autochk DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/CMakeList… ============================================================================== --- trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -25,7 +25,7 @@ add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE}) -target_link_libraries(smss mingw_common nt smlib) +target_link_libraries(smss nt smlib) if(MSVC) target_link_libraries(smss msvcsup) set_entrypoint(smss DllMainCRTStartup) Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -61,11 +61,6 @@ set_entrypoint(libjpeg 0) -if(MSVC) -# for _fltused -target_link_libraries(libjpeg mingw_common) -endif() - add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeL… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -30,7 +30,7 @@ set_entrypoint(libpng 0) -target_link_libraries(libpng mingw_common zlib) +target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32) Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -53,7 +53,7 @@ set_entrypoint(libtiff 0) -target_link_libraries(libtiff mingw_common zlib getopt) +target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32) Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -28,10 +28,6 @@ set_entrypoint(dnsapi 0) target_link_libraries(dnsapi adns) -if(MSVC) - target_link_libraries(dnsapi msvcsup) -endif() - add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi psdk) Modified: trunk/reactos/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -13,9 +13,7 @@ set_entrypoint(olesvr32 0) -target_link_libraries(olesvr32 - wine - mingw_common) +target_link_libraries(olesvr32 wine) add_importlibs(olesvr32 kernel32 ntdll) add_dependencies(olesvr32 psdk) Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -18,7 +18,6 @@ set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm - mingw_common wine libmpg123) Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -7,18 +7,6 @@ include(libcntpr.cmake) include(msvcrtex.cmake) include(oldnames.cmake) - -if(MSVC) -# This is a temporary solution until we have proper crt libs - list(APPEND MSVCSUP_SOURCE - misc/fltused.c - except/i386/chkstk_asm.s - math/i386/ci.c - math/i386/ftol2_asm.S) - - add_library(msvcsup ${MSVCSUP_SOURCE}) - add_dependencies(msvcsup psdk asm) -endif() add_library(user32_wsprintf printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon May 23 18:27:16 2011 @@ -8,6 +8,7 @@ list(APPEND MSVCRTEX_SOURCE startup/crtexe.c startup/wcrtexe.c + startup/crtdll.c startup/_newmode.c startup/wildcard.c startup/tlssup.c @@ -18,6 +19,7 @@ startup/atonexit.c startup/txtmode.c startup/pseudo-reloc.c + startup/pseudo-reloc-list.c startup/tlsmcrt.c startup/tlsthrd.c startup/tlsmthread.c @@ -28,9 +30,19 @@ startup/wdllargv.c startup/crt0_c.c startup/crt0_w.c + startup/dllentry.c + misc/fltused.c + misc/ofmt_stub.c +) - misc/fltused.c +if(ARCH MATCHES i386) +list(APPEND MSVCRTEX_SOURCE + except/i386/chkstk_asm.s + math/i386/ci.c + math/i386/ftol2_asm.S + math/i386/alldiv_asm.s ) +endif() if(MSVC) list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) @@ -40,6 +52,7 @@ add_library(msvcrtex ${MSVCRTEX_SOURCE}) set_target_properties(msvcrtex PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) +set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL) if(NOT MSVC) target_link_libraries(msvcrtex oldnames) Modified: trunk/reactos/lib/sdk/crt/startup/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtexe… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] Mon May 23 18:27:16 2011 @@ -56,7 +56,7 @@ #if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; #else -int _MINGW_INSTALL_DEBUG_MATHERR = 0; +int __declspec(selectany) _MINGW_INSTALL_DEBUG_MATHERR = 0; #endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); @@ -108,8 +108,8 @@ static int __cdecl pre_c_init (void); static void __cdecl pre_cpp_init (void); static void __cdecl __mingw_prepare_except_for_msvcr80_and_higher (void); -_CRTALLOC(".CRT$XIAA") _PIFV mingw_pcinit = pre_c_init; -_CRTALLOC(".CRT$XCAA") _PVFV mingw_pcppinit = pre_cpp_init; +_CRTALLOC(".CRT$XIAA") _PIFV __declspec(selectany) mingw_pcinit = pre_c_init; +_CRTALLOC(".CRT$XCAA") _PVFV __declspec(selectany) mingw_pcppinit = pre_cpp_init; static int __cdecl pre_c_init (void) Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=51868&r1=518… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Mon May 23 18:27:16 2011 @@ -26,7 +26,7 @@ add_definitions(-D__x86_64) endif() -link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/sdk/crt) set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) @@ -70,28 +70,21 @@ if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) - endif() - if (${TYPE} MATCHES win32gui) + elseif (${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) - set_entrypoint(${MODULE} WinMainCRTStartup) if(IS_UNICODE) - target_link_libraries(${MODULE} mingw_wmain) + set_entrypoint(${MODULE} wWinMainCRTStartup) else() - target_link_libraries(${MODULE} mingw_main) - endif() - target_link_libraries(${MODULE} mingw_common msvcsup) - endif () - if (${TYPE} MATCHES win32cui) + set_entrypoint(${MODULE} WinMainCRTStartup) + endif(IS_UNICODE) + elseif (${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) - set_entrypoint(${MODULE} mainCRTStartup) if(IS_UNICODE) - target_link_libraries(${MODULE} mingw_wmain) + set_entrypoint(${MODULE} wmainCRTStartup) else() - target_link_libraries(${MODULE} mingw_main) - endif() - target_link_libraries(${MODULE} mingw_common msvcsup) - endif () - if(${TYPE} MATCHES win32dll) + set_entrypoint(${MODULE} mainCRTStartup) + endif(IS_UNICODE) + elseif(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken set_entrypoint(${MODULE} DllMainCRTStartup@12) if(DEFINED baseaddress_${MODULE}) @@ -99,29 +92,23 @@ else() message(STATUS "${MODULE} has no base address") endif() - target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") - endif() - if(${TYPE} MATCHES win32ocx) + elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") - target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") - endif() - if(${TYPE} MATCHES cpl) + elseif(${TYPE} MATCHES cpl) set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") - target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") - endif() - if(${TYPE} MATCHES kernelmodedriver) + elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) - target_link_libraries(${MODULE} msvcsup) + target_link_libraries(${MODULE}) endif() endmacro() @@ -182,6 +169,9 @@ macro(add_importlibs MODULE) foreach(LIB ${ARGN}) + if ("${LIB}" MATCHES "msvcrt") + target_link_libraries(${MODULE} msvcrtex) + endif() target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib) add_dependencies(${MODULE} lib${LIB}) endforeach() Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… ============================================================================== --- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -9,11 +9,7 @@ set_module_type(ntvdm win32cui) -target_link_libraries(ntvdm - mingw_main - mingw_common) - -add_importlibs(ntvdm ntdll user32 gdi32 advapi32 kernel32 msvcrt) +add_importlibs(ntvdm ntdll user32 gdi32 advapi32 msvcrt kernel32) add_dependencies(ntvdm ndk bugcodes) -add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)

1 0

[tkreuzer] 51867: [MSPORTS] Fix build
by tkreuzer＠svn.reactos.org 23 May '11

23 May '11

Author: tkreuzer Date: Mon May 23 18:22:24 2011 New Revision: 51867 URL: http://svn.reactos.org/svn/reactos?rev=51867&view=rev Log: [MSPORTS] Fix build Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Mon May 23 18:22:24 2011 @@ -20,6 +20,7 @@ HKEY hKey; DWORD dwSize; PBYTE pBitmap; + PBYTE pData; } COMDB, *PCOMDB; @@ -214,4 +215,4 @@ return lError; } -/* EOF */ +/* EOF */

1 0

[ekohl] 51866: [MSPORTS] - Add msports.h header file. - Add the initial version of the com port database and use it to track the used com ports.
by ekohl＠svn.reactos.org 23 May '11

23 May '11

Author: ekohl Date: Mon May 23 17:54:16 2011 New Revision: 51866 URL: http://svn.reactos.org/svn/reactos?rev=51866&view=rev Log: [MSPORTS] - Add msports.h header file. - Add the initial version of the com port database and use it to track the used com ports. Added: trunk/reactos/dll/win32/msports/comdb.c (with props) trunk/reactos/include/ddk/msports.h (with props) Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/msports/classinst.c trunk/reactos/dll/win32/msports/msports.rbuild trunk/reactos/dll/win32/msports/msports.spec Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon May 23 17:54:16 2011 @@ -5,6 +5,7 @@ list(APPEND SOURCE classinst.c + comdb.c msports.c msports.rc ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Mon May 23 17:54:16 2011 @@ -10,6 +10,7 @@ #include <windows.h> #include <cmtypes.h> #include <stdio.h> +#include <msports.h> #include <setupapi.h> #include <wine/debug.h> @@ -244,21 +245,33 @@ WCHAR szFriendlyName[256]; WCHAR szPortName[5]; DWORD dwPortNumber; + HCOMDB hComDB = HCOMDB_INVALID_HANDLE_VALUE; TRACE("InstallSerialPort(%p, %p)\n", DeviceInfoSet, DeviceInfoData); + + /* Open the com port database */ + ComDBOpen(&hComDB); dwPortNumber = GetSerialPortNumber(DeviceInfoSet, DeviceInfoData); if (dwPortNumber != 0) { swprintf(szPortName, L"COM%u", dwPortNumber); + + ComDBClaimPort(hComDB, + dwPortNumber, + FALSE, + NULL); } else { wcscpy(szPortName, L"COMx"); } + /* Close the com port database */ + if (hComDB != HCOMDB_INVALID_HANDLE_VALUE) + ComDBClose(hComDB); /* Install the device */ if (!SetupDiInstallDevice(DeviceInfoSet, Added: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c (added) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Mon May 23 17:54:16 2011 @@ -1,0 +1,217 @@ +/* + * PROJECT: Ports installer library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\msports\comdb.c + * PURPOSE: COM port database + * COPYRIGHT: Copyright 2011 Eric Kohl + */ + +#include <windows.h> +#include <msports.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(msports); + +#define BITS_PER_BYTE 8 + +typedef struct _COMDB +{ + HKEY hKey; + DWORD dwSize; + PBYTE pBitmap; +} COMDB, *PCOMDB; + + +LONG +WINAPI +ComDBClaimPort(IN HCOMDB hComDB, + IN DWORD ComNumber, + IN BOOL ForceClaim, + OUT PBOOL Forced) +{ + PCOMDB pComDB; + PBYTE pByte; + BYTE cMask; + DWORD dwBitIndex; + DWORD dwType; + DWORD dwSize; + LONG lError; + + if (hComDB == INVALID_HANDLE_VALUE || + hComDB == NULL || + ComNumber == 0 || + ComNumber > COMDB_MAX_PORTS_ARBITRATED) + return ERROR_INVALID_PARAMETER; + + pComDB = (PCOMDB)hComDB; + + /* Update the bitmap */ + dwSize = pComDB->dwSize; + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + pComDB->pBitmap, + &dwSize); + if (lError != ERROR_SUCCESS) + return lError; + + /* Get the bit index */ + dwBitIndex = ComNumber - 1; + + /* Check if the bit to set fits into the bitmap */ + if (dwBitIndex >= (pComDB->dwSize * BITS_PER_BYTE)) + { + /* FIXME: Resize the bitmap */ + return ERROR_INVALID_PARAMETER; + } + + /* Get a pointer to the affected byte and calculate a mask for the affected bit */ + pByte = &(pComDB->pBitmap[dwBitIndex / BITS_PER_BYTE]); + cMask = 1 << (dwBitIndex % BITS_PER_BYTE); + + /* Check if the bit is not set */ + if ((*pByte & cMask) == 0) + { + /* Set the bit */ + *pByte |= cMask; + lError = ERROR_SUCCESS; + } + else + { + /* The bit is already set */ + lError = ERROR_SHARING_VIOLATION; + } + + /* Save the bitmap if it was modified */ + if (lError == ERROR_SUCCESS) + { + lError = RegSetValueExW(pComDB->hKey, + L"ComDB", + 0, + REG_BINARY, + pComDB->pData, + pComDB->dwSize); + } + + return lError; +} + + +LONG +WINAPI +ComDBClose(IN HCOMDB hComDB) +{ + PCOMDB pComDB; + + if (hComDB == HCOMDB_INVALID_HANDLE_VALUE || hComDB == NULL) + return ERROR_INVALID_PARAMETER; + + pComDB = (PCOMDB)hComDB; + + /* Close the registry key */ + if (pComDB->hKey != NULL) + RegCloseKey(pComDB->hKey); + + /* Release the bitmap */ + if (pComDB->pBitmap != NULL) + HeapFree(GetProcessHeap(), 0, pComDB->pBitmap); + + /* Release the database */ + HeapFree(GetProcessHeap(), 0, pComDB); + + return ERROR_SUCCESS; +} + + +LONG +WINAPI +ComDBOpen(OUT HCOMDB *phComDB) +{ + PCOMDB pComDB; + DWORD dwDisposition; + DWORD dwType; + LONG lError; + + TRACE("ComDBOpen(%p)\n", phComDB); + + /* Allocate a new database */ + pComDB = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(COMDB)); + if (pComDB == NULL) + { + ERR("Failed to allocaete the database!\n"); + return ERROR_ACCESS_DENIED; + } + + /* Create or open the database key */ + lError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\COM Name Arbiter", + 0, + NULL, + 0, + KEY_ALL_ACCESS, + NULL, + &pComDB->hKey, + &dwDisposition); + if (lError != ERROR_SUCCESS) + goto done; + + /* Get the required bitmap size */ + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + NULL, + &pComDB->dwSize); + if (lError == ERROR_FILE_NOT_FOUND) + { + /* Allocate a new bitmap */ + pComDB->dwSize = COMDB_MIN_PORTS_ARBITRATED / BITS_PER_BYTE; + pComDB->pData = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pComDB->dwSize); + if (pComDB->pData == NULL) + { + ERR("Failed to allocaete the bitmap!\n"); + lError = ERROR_ACCESS_DENIED; + goto done; + } + + /* Read the bitmap from the registry */ + lError = RegSetValueExW(pComDB->hKey, + L"ComDB", + 0, + REG_BINARY, + pComDB->pData, + pComDB->dwSize); + } + +done:; + if (lError != ERROR_SUCCESS) + { + /* Clean up in case of failure */ + if (pComDB->hKey != NULL) + RegCloseKey(pComDB->hKey); + + if (pComDB->pData != NULL) + HeapFree(GetProcessHeap(), 0, pComDB->pData); + + HeapFree(GetProcessHeap(), 0, pComDB); + + *phComDB = HCOMDB_INVALID_HANDLE_VALUE; + } + else + { + /* Return the database handle */ + *phComDB = (HCOMDB)pComDB; + } + + TRACE("done (Error %lu)\n", lError); + + return lError; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msports/comdb.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/comdb.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/msports/msports.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] Mon May 23 17:54:16 2011 @@ -6,6 +6,7 @@ <library>advapi32</library> <library>setupapi</library> <file>classinst.c</file> + <file>comdb.c</file> <file>msports.c</file> <file>msports.rc</file> </module> Modified: trunk/reactos/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] Mon May 23 17:54:16 2011 @@ -1,8 +1,8 @@ @ stub ComDBClaimNextFreePort -@ stub ComDBClaimPort -@ stub ComDBClose +@ stdcall ComDBClaimPort(ptr long long ptr) +@ stdcall ComDBClose(ptr) @ stub ComDBGetCurrentPortUsage -@ stub ComDBOpen +@ stdcall ComDBOpen(ptr) @ stub ComDBReleasePort @ stub ComDBResizeDatabase @ stdcall LibMain(ptr long ptr) DllMain Added: trunk/reactos/include/ddk/msports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/msports.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/msports.h (added) +++ trunk/reactos/include/ddk/msports.h [iso-8859-1] Mon May 23 17:54:16 2011 @@ -1,0 +1,52 @@ +#ifndef _MSPORTS_ +#define _MSPORTS_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(HCOMDB); +typedef HCOMDB *PHCOMDB; +#define HCOMDB_INVALID_HANDLE_VALUE ((HCOMDB)INVALID_HANDLE_VALUE) + +#define COMDB_MIN_PORTS_ARBITRATED 256 +#define COMDB_MAX_PORTS_ARBITRATED 4096 + +LONG +WINAPI +ComDBClaimPort(IN HCOMDB hComDB, + IN DWORD ComNumber, + IN BOOL ForceClaim, + OUT PBOOL Forced); + +LONG +WINAPI +ComDBClose(IN HCOMDB hComDB); + +LONG +WINAPI +ComDBGetCurrentPortUsage(IN HCOMDB hComDB, + OUT PBYTE Buffer, + IN DWORD BufferSize, + IN ULONG ReportType, + OUT LPDWORD MaxPortsReported); + +LONG +WINAPI +ComDBOpen(OUT HCOMDB *phComDB); + +LONG +WINAPI +ComDBReleasePort(IN HCOMDB hComDB, + IN DWORD ComNumber); + +LONG +WINAPI +ComDBResizeDatabase(IN HCOMDB hComDB, + IN DWORD NewSize); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSPORTS_ */ Propchange: trunk/reactos/include/ddk/msports.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/ddk/msports.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[tkreuzer] 51865: [USETUP] Don't link to mingw_main/mingw_common/kernel32!
by tkreuzer＠svn.reactos.org 23 May '11

23 May '11

Author: tkreuzer Date: Mon May 23 17:43:13 2011 New Revision: 51865 URL: http://svn.reactos.org/svn/reactos?rev=51865&view=rev Log: [USETUP] Don't link to mingw_main/mingw_common/kernel32! Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Mon May 23 17:43:13 2011 @@ -31,17 +31,11 @@ usetup.rc) target_link_libraries(usetup - mingw_main zlib inflib ext2lib - vfatlib - mingw_common) - -if(MSVC) - target_link_libraries(usetup msvcsup) -endif() + vfatlib) set_module_type(usetup nativecui) -add_importlibs(usetup kernel32 ntdll) +add_importlibs(usetup ntdll) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)

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