Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[dreimer] 45988: Polish translation update by Maciej Bialas.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Mar 7 12:51:02 2010 New Revision: 45988 URL: http://svn.reactos.org/svn/reactos?rev=45988&view=rev Log: Polish translation update by Maciej Bialas. Modified: trunk/reactos/base/applications/paint/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/base/applications/paint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] Sun Mar 7 12:51:02 2010 @@ -49,7 +49,7 @@ MENUITEM SEPARATOR POPUP "Powiêkszenie" BEGIN - POPUP "User defined" + POPUP "Zdefiniowane przez u¿ytkownika" BEGIN MENUITEM "12,5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -60,8 +60,8 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Show grid", IDM_VIEWSHOWGRID - MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Poka¿ siatkê", IDM_VIEWSHOWGRID + MENUITEM "Poka¿ miniaturê", IDM_VIEWSHOWMINIATURE END MENUITEM "Pe³ny ekran\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -181,7 +181,7 @@ IDS_INFOTEXT, "Paint dla ReactOS jest dostêpny na licencji GNU Lesser General Public License (LGPL) wersja 3 (www.gnu.org)" IDS_SAVEPROMPTTEXT, "Czy chcesz zapisaæ zmiany do %s?" IDS_DEFAULTFILENAME, "Nienazwany.bmp" - IDS_MINIATURETITLE, "Miniature" + IDS_MINIATURETITLE, "Miniatura" IDS_TOOLTIP1, "Zaznaczenie dowolne" IDS_TOOLTIP2, "Zaznaczenie" IDS_TOOLTIP3, "Gumka" @@ -190,16 +190,16 @@ IDS_TOOLTIP6, "Przybli¿enie" IDS_TOOLTIP7, "O³ówek" IDS_TOOLTIP8, "Pêdzel" - IDS_TOOLTIP9, "Spray" + IDS_TOOLTIP9, "Aerograf" IDS_TOOLTIP10, "Tekst" IDS_TOOLTIP11, "Linia" IDS_TOOLTIP12, "Krzywa Beziera" IDS_TOOLTIP13, "Prostok¹t" - IDS_TOOLTIP14, "Polygon" + IDS_TOOLTIP14, "Wielok¹t" IDS_TOOLTIP15, "Elipsa" IDS_TOOLTIP16, "Zaokr¹glony Prostok¹t" IDS_OPENFILTER, "Pliki Bitmapy (*.bmp;*.dib)\1*.bmp;*.dib\1Wszystkie pliki (*.*)\1*.*\1" IDS_SAVEFILTER, "Bitmapa 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1" - IDS_FILESIZE, "%d bytes" - IDS_PRINTRES, "%d x %d pixels per meter" -END + IDS_FILESIZE, "%d bajtów" + IDS_PRINTRES, "%d x %d pikseli na metr" +END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Sun Mar 7 12:51:02 2010 @@ -16,7 +16,7 @@ MENUITEM "&Odinstaluj",ID_UNINSTALL MENUITEM "&Modyfikuj", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "&Usuñ z rejestru", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "O&dwie¿", ID_REFRESH END @@ -44,7 +44,7 @@ MENUITEM "&odinstaluj", ID_UNINSTALL MENUITEM "&Modyfikuj", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "&Usuñ z rejestru", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Odwie¿", ID_REFRESH END @@ -52,37 +52,37 @@ IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Settings" +CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12 - AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "Ogólne", -1, 4, 2, 240, 61 + AUTOCHECKBOX "&Zapisz pozycjê okna", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "&Aktualizuj listê dostêpnych programów przy ka¿dym uruchomieniu", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "Zap&isuj dziennik instalacji i usuwania programów", IDC_LOG_ENABLED, 15, 46, 219, 12 - GROUPBOX "Downloading", -1, 4, 65, 240, 51 - LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9 + GROUPBOX "Pobieranie", -1, 4, 65, 240, 51 + LTEXT "Katalog dla pobranych plików:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "&Usuñ instalatory programów po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "Domylne", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 181, 124, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Program installation" +CAPTION "Instalacja programu" FONT 8, "MS Shell Dlg" BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "&Zainstaluj z dysku (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Pobierz i zainstaluj", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14 END IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 @@ -101,7 +101,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 - PUSHBUTTON "Close", IDOK, 133, 46, 50, 14 + PUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END @@ -139,7 +139,7 @@ IDS_INFO_INSTLOCATION "\nScie¿ka instalacji: " IDS_INFO_INSTALLSRC "\nród³o instalacji: " IDS_INFO_UNINSTALLSTR "\nKomenda deinstalacji: " - IDS_INFO_MODIFYPATH "\nModify Path: " + IDS_INFO_MODIFYPATH "\nModyfikacja cie¿ki instalacji: " IDS_INFO_INSTALLDATE "\nData instalacji: " END @@ -186,10 +186,10 @@ IDS_AVAILABLEFORINST "Dostêpne" IDS_UPDATES "Uaktualnienia" IDS_APPLICATIONS "Aplikacje" - IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" - IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" - IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" - IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" - IDS_INFORMATION "Information" - IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" + IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym bêda zapisywane pobrane programy:" + IDS_CHOOSE_FOLDER_ERROR "Wybra³e nieistniej¹cy katalog!" + IDS_USER_NOT_ADMIN "Musisz mieæ uprawnienia administratora aby uruchomiæ ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Czy na pewno chcesz usun¹æ wpis tego programu z rejestru?" + IDS_INFORMATION "Informacja" + IDS_UNABLE_TO_REMOVE "Nie mo¿na by³o usun¹æ wpisu z rejestru!" END 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] Sun Mar 7 12:51:02 2010 @@ -66,25 +66,25 @@ 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 "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + 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 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Create Partition" +CAPTION "Stwórz partycjê" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 - LTEXT "Size:",IDC_STATIC, 13,24,27,9 + 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 "Filesystem:",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 "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Anuluj",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 @@ -105,11 +105,11 @@ IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + 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 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -151,8 +151,8 @@ 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 "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + 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ê?" END Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sun Mar 7 12:51:02 2010 @@ -8,13 +8,13 @@ STRINGTABLE DISCARDABLE BEGIN -STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ -assoc [.ext[=[FileType]]]\n\ +STRING_ASSOC_HELP, "Modyfikuje skojarzenia rozszerzeñ plików.\n\n\ +assoc [.ext[=[typPliku]]]\n\ \n\ -assoc (print all associations)\n\ -assoc .ext (print specific association)\n\ -assoc .ext= (remove specific association)\n\ -assoc .ext=FileType (add new association)\n" +assoc (wywietla wszystkie skojarzenia)\n\ +assoc .ext (wywietla okrelone skojarzenie)\n\ +assoc .ext= (usuwa okrelone skojarzenie)\n\ +assoc .ext=typPliku (dodaje nowe skojarzenie)\n" STRING_ATTRIB_HELP, "Wywietla lub zmienia atrybuty plików.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\ @@ -298,12 +298,12 @@ STRING_MKDIR_HELP, "Tworzy katalog.\n\n\ MKDIR [napêd:]cie¿ka\nMD [napêd:]cie¿ka" -STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ -MKLINK [/D | /H | /J] linkname target\n\n\ - /D Indicates that the symbolic link target is a directory.\n\ - /H Create a hard link.\n\ - /J Create a directory junction.\n\n\ -If neither /H or /J is specified, a symbolic link is created." +STRING_MKLINK_HELP, "Tworzy dowi¹zanie obiektu w systemie plików.\n\n\ +MKLINK [/D | /H | /J] nazwa_linku element_docelowy\n\n\ + /D Oznacza, ¿e dowi¹zanie symboliczne elementu docelowego jest katalogiem.\n\ + /H Tworzy dowi¹zanie twarde.\n\ + /J Tworzy punkt po³¹czenia katalogów.\n\n\ +Jeli nie zosta³y u¿yte zarówno /H jak i /J, zostanie utworzone dowi¹zanie symboliczne." STRING_MEMMORY_HELP1, "Wywietla iloæ pamiêci systemowej.\n\nMEMORY" @@ -546,7 +546,7 @@ LABEL Tworzy, zmienia lub kasuje etykietê woluminu w danym napêdzie.\n\ MD Tworzy katalog.\n\ MKDIR Tworzy katalog.\n\ -MKLINK Creates a filesystem link object.\n\ +MKLINK Tworzy dowi¹zanie obiektu w systemie plików.\n\ MOVE Przenosi jeden lub wiêcej plików z jednego katalogu do drugiego.\n\ PATH Wywietla lub ustawia cie¿ki dostêpu dla programów.\n\ PAUSE Zawiesza przetwarzanie programu wsadowego i wywietla komunikat.\n\ @@ -656,11 +656,11 @@ STRING_SCREEN_COL, "nieprawid³owy numer kolumny" STRING_SCREEN_ROW, "nieprawid³owy numer rzêdu" STRING_TIMER_TIME "Stoper %d czas - %s: " -STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" -STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" -STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" -STRING_MORE, "More? " -STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Tak/Nie/Zawsze) " +STRING_MKLINK_CREATED_SYMBOLIC, "Dowi¹zanie symboliczne utworzone dla %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Dowi¹zanie twarde utworzone dla %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Punkt dowi¹zania katalogów utworzony dla %s <<===>> %s\n" +STRING_MORE, "Wiêcej? " +STRING_CANCEL_BATCH_FILE, "\r\nWciniêto Ctrl-Break. Anulowaæ wykonanie pliku wsadowego? (Tak/Nie/Zawsze) " STRING_INVALID_OPERAND, "Nieprawid³owy argument operatora." STRING_EXPECTED_CLOSE_PAREN, "Oczekiwano ')'." Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Sun Mar 7 12:51:02 2010 @@ -63,7 +63,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schemat kolorów", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Efekty...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -108,24 +108,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Efekty" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&U¿yj nastêpuj¹cego efektu przejcia dla menu i etykiet narzêdzi:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "U¿&yj nastêpuj¹cej metody wyg³adzania krawêdzi czcionek ekranowych:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "U¿y&j du¿ych ikon",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Pok&a¿ cienie pod menu",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Poka¿ za&wartoæ okna podczas przeci¹gania",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "U&kryj podkrelenie liter do nawigacji klawiatur¹ dopóki nie nacisnê klawisza Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -188,13 +188,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" + IDS_SLIDEEFFECT "Efekt przewijania" + IDS_FADEEFFECT "Efekt przejcia" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standardowe" IDS_CLEARTYPEEFFECT "ClearType" END Modified: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] Sun Mar 7 12:51:02 2010 @@ -75,12 +75,12 @@ 22 "Witamy w grupie roboczej %1." 23 "Witamy w domenie %1." 24 "Musisz zrestartowaæ komputer aby zmiany odnios³y skutek." - 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." + 25 "Mo¿esz zmieniæ nazwê i cz³onkostwo tego komputera. Zmiany mog¹ mieæ wp³yw na dostêp do zasobów sieciowych." 1021 "Uwaga: Tylko Administratorzy mog¹ zmieniaæ identyfikator tego komputera." 1022 "Uwaga: Identyfikator tego komputera nie zosta³ zmieniony, powód:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "Nowa nazwa komputera ""%s"" zawiera niedozwolone znaki. Do niedozwolonych znaków nale¿¹ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / oraz ?" 3210 "&Szczegó³y >>" 3220 "<< &Szczegó³y" - 4000 "Information" - 4001 "Can't set new a computer name!" + 4000 "Informacja" + 4001 "Nie mo¿na zmieniæ nazwy komputera!" END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sun Mar 7 12:51:02 2010 @@ -755,5 +755,5 @@ IDS_INSTALLNEWFONT "Zainstaluj Now¹ Czcionkê..." IDS_DEFAULT_CLUSTER_SIZE "Domylny rozmiar jednostki alokacji" - IDS_COPY_OF "Copy of" -END + IDS_COPY_OF "Kopia" +END

14 years, 9 months

[cwittich] 45987: [IMM32] sync imm32 to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 12:27:14 2010 New Revision: 45987 URL: http://svn.reactos.org/svn/reactos?rev=45987&view=rev Log: [IMM32] sync imm32 to wine 1.1.40 Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… Modified: trunk/reactos/dll/win32/imm32/imm32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.spec…

14 years, 9 months

[cwittich] 45986: [ITIRCL] sync itircl to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 12:21:31 2010 New Revision: 45986 URL: http://svn.reactos.org/svn/reactos?rev=45986&view=rev Log: [ITIRCL] sync itircl to wine 1.1.40 Modified: trunk/reactos/dll/win32/itircl/itircl_main.c Modified: trunk/reactos/dll/win32/itircl/itircl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/itircl_ma… ============================================================================== --- trunk/reactos/dll/win32/itircl/itircl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itircl/itircl_main.c [iso-8859-1] Sun Mar 7 12:21:31 2010 @@ -71,6 +71,5 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("stub\n"); return S_FALSE; }

14 years, 9 months

[cwittich] 45985: [ICCVID] sync iccvid to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 12:20:29 2010 New Revision: 45985 URL: http://svn.reactos.org/svn/reactos?rev=45985&view=rev Log: [ICCVID] sync iccvid to wine 1.1.40 Added: trunk/reactos/dll/win32/iccvid/iccvid_Es.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Ja.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Lt.rc (with props) Modified: trunk/reactos/dll/win32/iccvid/iccvid_Da.rc trunk/reactos/dll/win32/iccvid/iccvid_De.rc trunk/reactos/dll/win32/iccvid/iccvid_En.rc trunk/reactos/dll/win32/iccvid/iccvid_Fr.rc trunk/reactos/dll/win32/iccvid/iccvid_Hu.rc trunk/reactos/dll/win32/iccvid/iccvid_Ko.rc trunk/reactos/dll/win32/iccvid/iccvid_Nl.rc trunk/reactos/dll/win32/iccvid/iccvid_No.rc trunk/reactos/dll/win32/iccvid/iccvid_Pl.rc trunk/reactos/dll/win32/iccvid/iccvid_Pt.rc trunk/reactos/dll/win32/iccvid/iccvid_Ro.rc trunk/reactos/dll/win32/iccvid/iccvid_Ru.rc trunk/reactos/dll/win32/iccvid/iccvid_Si.rc trunk/reactos/dll/win32/iccvid/iccvid_Sv.rc trunk/reactos/dll/win32/iccvid/iccvid_Tr.rc trunk/reactos/dll/win32/iccvid/iccvid_private.h trunk/reactos/dll/win32/iccvid/rsrc.rc Modified: trunk/reactos/dll/win32/iccvid/iccvid_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Da… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Da.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_De… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_De.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_En… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_En.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/iccvid/iccvid_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Es… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Es.rc (added) +++ trunk/reactos/dll/win32/iccvid/iccvid_Es.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -1,0 +1,30 @@ +/* + * Copyright 2010 JosÃ© Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "CÃ³dec de vÃdeo Cinepak" + IDS_DESCRIPTION "CÃ³dec de vÃdeo Cinepak" +} Propchange: trunk/reactos/dll/win32/iccvid/iccvid_Es.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/iccvid/iccvid_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Fr… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Fr.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,10 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_NAME "codec vidéo Cinepak" - IDS_DESCRIPTION "codec vidéo Cinepak" + IDS_NAME "Codec vidÃ©o Cinepak" + IDS_DESCRIPTION "Codec vidÃ©o Cinepak" } Modified: trunk/reactos/dll/win32/iccvid/iccvid_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Hu… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Hu.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/iccvid/iccvid_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Ja… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Ja.rc (added) +++ trunk/reactos/dll/win32/iccvid/iccvid_Ja.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -1,0 +1,30 @@ +/* + * Copyright 2009 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak ãããªã³ã¼ããã¯" + IDS_DESCRIPTION "Cinepak ãããªã³ã¼ããã¯" +} Propchange: trunk/reactos/dll/win32/iccvid/iccvid_Ja.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/iccvid/iccvid_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Ko… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Ko.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/iccvid/iccvid_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Lt… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Lt.rc (added) +++ trunk/reactos/dll/win32/iccvid/iccvid_Lt.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -1,0 +1,30 @@ +/* + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak vaizdo kodekas" + IDS_DESCRIPTION "Cinepak vaizdo kodekas" +} Propchange: trunk/reactos/dll/win32/iccvid/iccvid_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/iccvid/iccvid_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Nl… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Nl.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_No… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_No.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Pl… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Pl.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Pt… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Pt.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Ro… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Ro.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Ru… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Ru.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,10 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "Âèäåî êîäåð-äåêîäåð Cinepak" - IDS_DESCRIPTION "Âèäåî êîäåð-äåêîäåð Cinepak" + IDS_NAME "ÐÐ¸Ð´ÐµÐ¾ ÐºÐ¾Ð´ÐµÑ-Ð´ÐµÐºÐ¾Ð´ÐµÑ Cinepak" + IDS_DESCRIPTION "ÐÐ¸Ð´ÐµÐ¾ ÐºÐ¾Ð´ÐµÑ-Ð´ÐµÐºÐ¾Ð´ÐµÑ Cinepak" } Modified: trunk/reactos/dll/win32/iccvid/iccvid_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Si… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Si.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -25,5 +27,3 @@ IDS_NAME "Cinepak Video kodek" IDS_DESCRIPTION "Cinepak Video kodek" } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/iccvid/iccvid_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Sv… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Sv.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Tr… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_Tr.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/iccvid/iccvid_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_pr… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid_private.h [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -19,6 +19,8 @@ #ifndef __ICCVID_PRIVATE_H #define __ICCVID_PRIVATE_H +#include <windef.h> + #define IDS_NAME 100 #define IDS_DESCRIPTION 101 Modified: trunk/reactos/dll/win32/iccvid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/iccvid/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/rsrc.rc [iso-8859-1] Sun Mar 7 12:20:29 2010 @@ -20,17 +20,23 @@ #include "iccvid_private.h" #include "iccvid_Da.rc" -#include "iccvid_De.rc" #include "iccvid_En.rc" -#include "iccvid_Fr.rc" #include "iccvid_Hu.rc" #include "iccvid_Ko.rc" #include "iccvid_Nl.rc" #include "iccvid_No.rc" #include "iccvid_Pl.rc" #include "iccvid_Pt.rc" +#include "iccvid_Sv.rc" +#include "iccvid_Tr.rc" + +/* UTF-8 */ +#include "iccvid_De.rc" +#include "iccvid_Es.rc" +#include "iccvid_Fr.rc" +#include "iccvid_Ja.rc" +#include "iccvid_Lt.rc" #include "iccvid_Ro.rc" #include "iccvid_Ru.rc" #include "iccvid_Si.rc" -#include "iccvid_Sv.rc" -#include "iccvid_Tr.rc" +

14 years, 9 months

[cwittich] 45984: [CLUSAPI] sync clusapi to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 12:15:16 2010 New Revision: 45984 URL: http://svn.reactos.org/svn/reactos?rev=45984&view=rev Log: [CLUSAPI] sync clusapi to wine 1.1.40 Modified: trunk/reactos/dll/win32/clusapi/clusapi.c Modified: trunk/reactos/dll/win32/clusapi/clusapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] Sun Mar 7 12:15:16 2010 @@ -40,7 +40,7 @@ */ DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState) { - FIXME("(%s,%p,%u) stub!\n",debugstr_w(lpszNodeName),pdwClusterState, *pdwClusterState); + FIXME("(%s,%p) stub!\n",debugstr_w(lpszNodeName),pdwClusterState); *pdwClusterState = 0; @@ -97,7 +97,7 @@ */ DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName) { - FIXME("(%p, %u, %u, %p, %u) stub!\n", hEnum, dwIndex, *lpdwType, lpszName, *lpcchName); + FIXME("(%p, %u, %p, %p, %u) stub!\n", hEnum, dwIndex, lpdwType, lpszName, *lpcchName); return ERROR_NO_MORE_ITEMS; }

14 years, 9 months

[cwittich] 45983: [PSDK] sync xmldom.idl to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 12:10:18 2010 New Revision: 45983 URL: http://svn.reactos.org/svn/reactos?rev=45983&view=rev Log: [PSDK] sync xmldom.idl to wine 1.1.40 Modified: trunk/reactos/include/psdk/xmldom.idl Modified: trunk/reactos/include/psdk/xmldom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldom.idl?re… ============================================================================== --- trunk/reactos/include/psdk/xmldom.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xmldom.idl [iso-8859-1] Sun Mar 7 12:10:18 2010 @@ -20,10 +20,6 @@ #include <idispids.h> import "ocidl.idl"; - -cpp_quote("#ifndef __xmldom_h__") -cpp_quote("#define __xmldom_h__") -cpp_quote("#endif") interface IXMLDOMImplementation; interface IXMLDOMNode; @@ -268,7 +264,7 @@ [out,retval] VARIANT_BOOL *isSuccessful ); [propget, id(DISPID_READYSTATE)] - HRESULT readyState( [out,retval] long *value ); + HRESULT readyState( [out,retval] LONG *value ); [propget, id(DISPID_XMLDOM_DOCUMENT_PARSEERROR)] HRESULT parseError( [out,retval] IXMLDOMParseError **errorObj ); @@ -334,11 +330,11 @@ interface IXMLDOMNodeList : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT item( [in] long index, + HRESULT item( [in] LONG index, [out,retval] IXMLDOMNode **listItem ); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length( [out,retval] long *listLength ); + HRESULT length( [out,retval] LONG *listLength ); [id(DISPID_XMLDOM_NODELIST_NEXTNODE)] HRESULT nextNode( [out,retval] IXMLDOMNode **nextItem ); @@ -375,11 +371,11 @@ [out,retval] IXMLDOMNode **namedItem ); [propget, id(DISPID_VALUE)] - HRESULT item( [in] long index, + HRESULT item( [in] LONG index, [out,retval] IXMLDOMNode **listItem ); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length( [out,retval] long *listLength ); + HRESULT length( [out,retval] LONG *listLength ); [id(DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM)] HRESULT getQualifiedItem( [in] BSTR baseName, @@ -435,27 +431,27 @@ HRESULT data( [in] BSTR data ); [propget, id(DISPID_DOM_DATA_LENGTH)] - HRESULT length( [out,retval] long *dataLength ); + HRESULT length( [out,retval] LONG *dataLength ); [id(DISPID_DOM_DATA_SUBSTRING)] - HRESULT substringData( [in] long offset, - [in] long count, + HRESULT substringData( [in] LONG offset, + [in] LONG count, [out,retval] BSTR *data ); [id(DISPID_DOM_DATA_APPEND)] HRESULT appendData( [in] BSTR data ); [id(DISPID_DOM_DATA_INSERT)] - HRESULT insertData( [in] long offset, + HRESULT insertData( [in] LONG offset, [in] BSTR data ); [id(DISPID_DOM_DATA_DELETE)] - HRESULT deleteData( [in] long offset, - [in] long count ); + HRESULT deleteData( [in] LONG offset, + [in] LONG count ); [id(DISPID_DOM_DATA_REPLACE)] - HRESULT replaceData( [in] long offset, - [in] long count, + HRESULT replaceData( [in] LONG offset, + [in] LONG count, [in] BSTR data ); } @@ -540,7 +536,7 @@ interface IXMLDOMText : IXMLDOMCharacterData { [id(DISPID_DOM_TEXT_SPLITTEXT)] - HRESULT splitText( [in] long offset, + HRESULT splitText( [in] LONG offset, [out,retval] IXMLDOMText **rightHandTextNode ); } @@ -703,7 +699,7 @@ interface IXMLDOMParseError : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT errorCode([retval, out] long *errCode); + HRESULT errorCode([retval, out] LONG *errCode); [propget, id(DISPID_DOM_ERROR_URL)] HRESULT url([retval, out] BSTR *p); @@ -715,13 +711,13 @@ HRESULT srcText([retval, out] BSTR *p); [propget, id(DISPID_DOM_ERROR_LINE)] - HRESULT line([retval, out] long *lineNo); + HRESULT line([retval, out] LONG *lineNo); [propget, id(DISPID_DOM_ERROR_LINEPOS)] - HRESULT linepos([retval, out] long * linePos); + HRESULT linepos([retval, out] LONG * linePos); [propget, id(DISPID_DOM_ERROR_FILEPOS)] - HRESULT filepos([retval, out] long * filePos); + HRESULT filepos([retval, out] LONG * filePos); } [ @@ -788,7 +784,7 @@ HRESULT abort(); [propget, id(7)] - HRESULT status([out, retval] long *plStatus); + HRESULT status([out, retval] LONG *plStatus); [propget, id(8)] HRESULT statusText([out, retval] BSTR *bstrStatus); @@ -806,7 +802,7 @@ HRESULT responseStream([out, retval] VARIANT *pvarBody); [propget, id(13)] - HRESULT readyState([out, retval] long *plState); + HRESULT readyState([out, retval] LONG *plState); [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink);

14 years, 9 months

[cwittich] 45982: [MSCTF] sync msctf to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 10:48:42 2010 New Revision: 45982 URL: http://svn.reactos.org/svn/reactos?rev=45982&view=rev Log: [MSCTF] sync msctf to wine 1.1.40 Added: trunk/reactos/dll/win32/msctf/langbarmgr.c (with props) trunk/reactos/include/psdk/ctfutb.idl (with props) Removed: trunk/reactos/dll/win32/msctf/msctf_local.idl trunk/reactos/dll/win32/msctf/textstor_local.idl Modified: trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf.rbuild trunk/reactos/dll/win32/msctf/msctf.spec trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/dll/win32/msctf/regsvr.c trunk/reactos/dll/win32/msctf/threadmgr.c trunk/reactos/include/psdk/msctf.idl trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/lib/sdk/uuid/uuid.c Added: trunk/reactos/dll/win32/msctf/langbarmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/langbarmgr… ============================================================================== --- trunk/reactos/dll/win32/msctf/langbarmgr.c (added) +++ trunk/reactos/dll/win32/msctf/langbarmgr.c [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -1,0 +1,193 @@ +/* + * ITfLangBarMgr implementation + * + * Copyright 2010 Justin Chevrier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" +#include "msctf_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagLangBarMgr { + const ITfLangBarMgrVtbl *LangBarMgrVtbl; + + LONG refCount; + +} LangBarMgr; + +static void LangBarMgr_Destructor(LangBarMgr *This) +{ + TRACE("destroying %p\n", This); + + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI LangBarMgr_QueryInterface(ITfLangBarMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + LangBarMgr *This = (LangBarMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfLangBarMgr)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI LangBarMgr_AddRef(ITfLangBarMgr *iface) +{ + LangBarMgr *This = (LangBarMgr *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI LangBarMgr_Release(ITfLangBarMgr *iface) +{ + LangBarMgr *This = (LangBarMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + LangBarMgr_Destructor(This); + return ret; +} + +/***************************************************** + * ITfLangBarMgr functions + *****************************************************/ + +static HRESULT WINAPI LangBarMgr_AdviseEventSink( ITfLangBarMgr* iface, ITfLangBarEventSink *pSink, HWND hwnd, DWORD dwflags, DWORD *pdwCookie) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_UnAdviseEventSink( ITfLangBarMgr* iface, DWORD dwCookie) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetThreadMarshalInterface( ITfLangBarMgr* iface, DWORD dwThreadId, DWORD dwType, REFIID riid, IUnknown **ppunk) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetThreadLangBarItemMgr( ITfLangBarMgr* iface, DWORD dwThreadId, ITfLangBarItemMgr **pplbi, DWORD *pdwThreadid) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetInputProcessorProfiles( ITfLangBarMgr* iface, DWORD dwThreadId, ITfInputProcessorProfiles **ppaip, DWORD *pdwThreadid) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_RestoreLastFocus( ITfLangBarMgr* iface, DWORD *dwThreadId, BOOL fPrev) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_SetModalInput( ITfLangBarMgr* iface, ITfLangBarEventSink *pSink, DWORD dwThreadId, DWORD dwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_ShowFloating( ITfLangBarMgr* iface, DWORD dwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetShowFloatingStatus( ITfLangBarMgr* iface, DWORD *pdwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfLangBarMgrVtbl LangBarMgr_LangBarMgrVtbl = +{ + LangBarMgr_QueryInterface, + LangBarMgr_AddRef, + LangBarMgr_Release, + + LangBarMgr_AdviseEventSink, + LangBarMgr_UnAdviseEventSink, + LangBarMgr_GetThreadMarshalInterface, + LangBarMgr_GetThreadLangBarItemMgr, + LangBarMgr_GetInputProcessorProfiles, + LangBarMgr_RestoreLastFocus, + LangBarMgr_SetModalInput, + LangBarMgr_ShowFloating, + LangBarMgr_GetShowFloatingStatus +}; + +HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + LangBarMgr *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),0,sizeof(LangBarMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->LangBarMgrVtbl= &LangBarMgr_LangBarMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + return S_OK; +} Propchange: trunk/reactos/dll/win32/msctf/langbarmgr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -87,6 +87,7 @@ {&CLSID_TF_ThreadMgr, ThreadMgr_Constructor}, {&CLSID_TF_InputProcessorProfiles, InputProcessorProfiles_Constructor}, {&CLSID_TF_CategoryMgr, CategoryMgr_Constructor}, + {&CLSID_TF_LangBarMgr, LangBarMgr_Constructor}, {NULL, NULL} }; @@ -351,7 +352,7 @@ ActivatedTextService *actsvr; ITfCategoryMgr *catmgr; AtsEntry *entry; - ITfThreadMgr *tm = (ITfThreadMgr*)TlsGetValue(tlsIndex); + ITfThreadMgr *tm = TlsGetValue(tlsIndex); ITfClientId *clientid; if (!tm) return E_UNEXPECTED; @@ -608,3 +609,21 @@ { return InputProcessorProfiles_Constructor(NULL,(IUnknown**)ppipr); } + +/*********************************************************************** + * TF_InvalidAssemblyListCacheIfExist(MSCTF.@) + */ +HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void) +{ + FIXME("Stub\n"); + return S_OK; +} + +/*********************************************************************** + * TF_CreateLangBarMgr (MSCTF.@) + */ +HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm) +{ + TRACE("\n"); + return LangBarMgr_Constructor(NULL,(IUnknown**)pppbm); +} Modified: trunk/reactos/dll/win32/msctf/msctf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.rbui… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.rbuild [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -13,6 +13,7 @@ <file>context.c</file> <file>documentmgr.c</file> <file>inputprocessor.c</file> + <file>langbarmgr.c</file> <file>msctf.c</file> <file>range.c</file> <file>regsvr.c</file> @@ -24,14 +25,6 @@ <library>oleaut32</library> <library>user32</library> <library>advapi32</library> - <library>msctf_local_interface</library> - <library>textstor_local_interface</library> <library>ntdll</library> </module> -<module name="msctf_local_interface" type="idlinterface"> - <file>msctf_local.idl</file> -</module> -<module name="textstor_local_interface" type="idlinterface"> - <file>textstor_local.idl</file> -</module> </group> Modified: trunk/reactos/dll/win32/msctf/msctf.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.spec… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.spec [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -13,7 +13,7 @@ @ stub TF_CreateDisplayAttributeMgr @ stdcall TF_CreateInputProcessorProfiles(ptr) @ stub TF_CreateLangBarItemMgr -@ stub TF_CreateLangBarMgr +@ stdcall TF_CreateLangBarMgr(ptr) @ stdcall TF_CreateThreadMgr(ptr) @ stub TF_DllDetachInOther @ stub TF_GetGlobalCompartment @@ -27,7 +27,7 @@ @ stub TF_InitMlngInfo @ stub TF_InitSystem @ stub TF_InvalidAssemblyListCache -@ stub TF_InvalidAssemblyListCacheIfExist +@ stdcall TF_InvalidAssemblyListCacheIfExist() @ stub TF_IsCtfmonRunning @ stub TF_IsInMarshaling @ stub TF_MlngInfoCount Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -40,6 +40,7 @@ extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); +extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); extern HRESULT Context_Uninitialize(ITfContext *cxt); Removed: trunk/reactos/dll/win32/msctf/msctf_local.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_loca… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_local.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_local.idl (removed) @@ -1,2 +1,0 @@ - -#include "msctf.idl" Modified: trunk/reactos/dll/win32/msctf/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/regsvr.c?r… ============================================================================== --- trunk/reactos/dll/win32/msctf/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/regsvr.c [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -462,6 +462,13 @@ "msctf.dll", "Apartment" }, + { + &CLSID_TF_LangBarMgr, + "TF_LangBarMgr", + NULL, + "msctf.dll", + "Apartment" + }, { NULL } /* list terminator */ }; @@ -474,7 +481,7 @@ }; /*********************************************************************** - * DllRegisterServer (HHCTRL.@) + * DllRegisterServer (MSCTF.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -489,7 +496,7 @@ } /*********************************************************************** - * DllUnregisterServer (HHCTRL.@) + * DllUnregisterServer (MSCTF.@) */ HRESULT WINAPI DllUnregisterServer(void) { Removed: trunk/reactos/dll/win32/msctf/textstor_local.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/textstor_l… ============================================================================== --- trunk/reactos/dll/win32/msctf/textstor_local.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/textstor_local.idl (removed) @@ -1,2 +1,0 @@ - -#include "textstor.idl" Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -88,7 +88,7 @@ /* const ITfConfigureSystemKeystrokeFeedVtbl *ConfigureSystemKeystrokeFeedVtbl; */ /* const ITfLangBarItemMgrVtbl *LangBarItemMgrVtbl; */ /* const ITfUIElementMgrVtbl *UIElementMgrVtbl; */ - /* const ITfSourceSingleVtbl *SourceSingleVtbl; */ + const ITfSourceSingleVtbl *SourceSingleVtbl; LONG refCount; /* Aggregation */ @@ -126,7 +126,6 @@ } EnumTfDocumentMgr; static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentMgrs **ppOut); -LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam); static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) { @@ -151,6 +150,324 @@ static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); +} + +static inline ThreadMgr *impl_from_ITfSourceSingleVtbl(ITfSourceSingle* iface) + +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceSingleVtbl)); +} + +static void free_sink(ThreadMgrSink *sink) +{ + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(),0,sink); +} + +static void ThreadMgr_Destructor(ThreadMgr *This) +{ + struct list *cursor, *cursor2; + + /* unhook right away */ + if (This->focusHook) + UnhookWindowsHookEx(This->focusHook); + + TlsSetValue(tlsIndex,NULL); + TRACE("destroying %p\n", This); + if (This->focus) + ITfDocumentMgr_Release(This->focus); + + /* free sinks */ + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,key->description); + HeapFree(GetProcessHeap(),0,key); + } + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CreatedDocumentMgrs) + { + DocumentMgrEntry *mgr = LIST_ENTRY(cursor,DocumentMgrEntry,entry); + list_remove(cursor); + FIXME("Left Over ITfDocumentMgr. Should we do something with it?\n"); + HeapFree(GetProcessHeap(),0,mgr); + } + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,wnd); + } + + CompartmentMgr_Destructor(This->CompartmentMgr); + + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = (ThreadMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfThreadMgr)) + { + *ppvOut = This; + } + else if (IsEqualIID(iid, &IID_ITfSource)) + { + *ppvOut = &This->SourceVtbl; + } + else if (IsEqualIID(iid, &IID_ITfKeystrokeMgr)) + { + *ppvOut = &This->KeystrokeMgrVtbl; + } + else if (IsEqualIID(iid, &IID_ITfMessagePump)) + { + *ppvOut = &This->MessagePumpVtbl; + } + else if (IsEqualIID(iid, &IID_ITfClientId)) + { + *ppvOut = &This->ClientIdVtbl; + } + else if (IsEqualIID(iid, &IID_ITfCompartmentMgr)) + { + *ppvOut = This->CompartmentMgr; + } + else if (IsEqualIID(iid, &IID_ITfSourceSingle)) + { + *ppvOut = &This->SourceSingleVtbl; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ThreadMgr_AddRef(ITfThreadMgr *iface) +{ + ThreadMgr *This = (ThreadMgr *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI ThreadMgr_Release(ITfThreadMgr *iface) +{ + ThreadMgr *This = (ThreadMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + ThreadMgr_Destructor(This); + return ret; +} + +/***************************************************** + * ITfThreadMgr functions + *****************************************************/ + +static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *ptid) +{ + ThreadMgr *This = (ThreadMgr *)iface; + + TRACE("(%p) %p\n",This, ptid); + + if (!ptid) + return E_INVALIDARG; + + if (!processId) + { + GUID guid; + CoCreateGuid(&guid); + ITfClientId_GetClientId((ITfClientId*)&This->ClientIdVtbl,&guid,&processId); + } + + activate_textservices(iface); + This->activationCount++; + *ptid = processId; + return S_OK; +} + +static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface) +{ + ThreadMgr *This = (ThreadMgr *)iface; + TRACE("(%p)\n",This); + + if (This->activationCount == 0) + return E_UNEXPECTED; + + This->activationCount --; + + if (This->activationCount == 0) + { + if (This->focus) + { + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); + ITfDocumentMgr_Release(This->focus); + This->focus = 0; + } + } + + deactivate_textservices(); + + return S_OK; +} + +static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr +**ppdim) +{ + ThreadMgr *This = (ThreadMgr *)iface; + DocumentMgrEntry *mgrentry; + HRESULT hr; + + TRACE("(%p)\n",iface); + mgrentry = HeapAlloc(GetProcessHeap(),0,sizeof(DocumentMgrEntry)); + if (mgrentry == NULL) + return E_OUTOFMEMORY; + + hr = DocumentMgr_Constructor((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, ppdim); + + if (SUCCEEDED(hr)) + { + mgrentry->docmgr = *ppdim; + list_add_head(&This->CreatedDocumentMgrs,&mgrentry->entry); + } + else + HeapFree(GetProcessHeap(),0,mgrentry); + + return hr; +} + +static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs +**ppEnum) +{ + ThreadMgr *This = (ThreadMgr *)iface; + TRACE("(%p) %p\n",This,ppEnum); + + if (!ppEnum) + return E_INVALIDARG; + + return EnumTfDocumentMgr_Constructor(&This->CreatedDocumentMgrs, ppEnum); +} + +static HRESULT WINAPI ThreadMgr_GetFocus( ITfThreadMgr* iface, ITfDocumentMgr +**ppdimFocus) +{ + ThreadMgr *This = (ThreadMgr *)iface; + TRACE("(%p)\n",This); + + if (!ppdimFocus) + return E_INVALIDARG; + + *ppdimFocus = This->focus; + + TRACE("->%p\n",This->focus); + + if (This->focus == NULL) + return S_FALSE; + + ITfDocumentMgr_AddRef(This->focus); + + return S_OK; +} + +static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *pdimFocus) +{ + ITfDocumentMgr *check; + ThreadMgr *This = (ThreadMgr *)iface; + + TRACE("(%p) %p\n",This,pdimFocus); + + if (!pdimFocus) + check = NULL; + else if (FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) + return E_INVALIDARG; + + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus); + + if (This->focus) + ITfDocumentMgr_Release(This->focus); + + This->focus = check; + return S_OK; +} + +static LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + ThreadMgr *This; + + This = TlsGetValue(tlsIndex); + if (!This) + { + ERR("Hook proc but no ThreadMgr for this thread. Serious Error\n"); + return 0; + } + if (!This->focusHook) + { + ERR("Hook proc but no ThreadMgr focus Hook. Serious Error\n"); + return 0; + } + + if (nCode == HCBT_SETFOCUS) /* focus change within our thread */ + { + struct list *cursor; + + LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + if (wnd->hwnd == (HWND)wParam) + { + TRACE("Triggering Associated window focus\n"); + if (This->focus != wnd->docmgr) + ThreadMgr_SetFocus((ITfThreadMgr*)This, wnd->docmgr); + break; + } + } + } + + return CallNextHookEx(This->focusHook, nCode, wParam, lParam); } static HRESULT SetupWindowsHook(ThreadMgr *This) @@ -167,278 +484,6 @@ return S_OK; } return S_FALSE; -} - -static void free_sink(ThreadMgrSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - -static void ThreadMgr_Destructor(ThreadMgr *This) -{ - struct list *cursor, *cursor2; - - /* unhook right away */ - if (This->focusHook) - UnhookWindowsHookEx(This->focusHook); - - TlsSetValue(tlsIndex,NULL); - TRACE("destroying %p\n", This); - if (This->focus) - ITfDocumentMgr_Release(This->focus); - - /* free sinks */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) - { - PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); - list_remove(cursor); - HeapFree(GetProcessHeap(),0,key->description); - HeapFree(GetProcessHeap(),0,key); - } - - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CreatedDocumentMgrs) - { - DocumentMgrEntry *mgr = LIST_ENTRY(cursor,DocumentMgrEntry,entry); - list_remove(cursor); - FIXME("Left Over ITfDocumentMgr. Should we do something with it?\n"); - HeapFree(GetProcessHeap(),0,mgr); - } - - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->AssociatedFocusWindows) - { - AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); - list_remove(cursor); - HeapFree(GetProcessHeap(),0,wnd); - } - - CompartmentMgr_Destructor(This->CompartmentMgr); - - HeapFree(GetProcessHeap(),0,This); -} - -static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, LPVOID *ppvOut) -{ - ThreadMgr *This = (ThreadMgr *)iface; - *ppvOut = NULL; - - if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfThreadMgr)) - { - *ppvOut = This; - } - else if (IsEqualIID(iid, &IID_ITfSource)) - { - *ppvOut = &This->SourceVtbl; - } - else if (IsEqualIID(iid, &IID_ITfKeystrokeMgr)) - { - *ppvOut = &This->KeystrokeMgrVtbl; - } - else if (IsEqualIID(iid, &IID_ITfMessagePump)) - { - *ppvOut = &This->MessagePumpVtbl; - } - else if (IsEqualIID(iid, &IID_ITfClientId)) - { - *ppvOut = &This->ClientIdVtbl; - } - else if (IsEqualIID(iid, &IID_ITfCompartmentMgr)) - { - *ppvOut = This->CompartmentMgr; - } - - if (*ppvOut) - { - IUnknown_AddRef(iface); - return S_OK; - } - - WARN("unsupported interface: %s\n", debugstr_guid(iid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI ThreadMgr_AddRef(ITfThreadMgr *iface) -{ - ThreadMgr *This = (ThreadMgr *)iface; - return InterlockedIncrement(&This->refCount); -} - -static ULONG WINAPI ThreadMgr_Release(ITfThreadMgr *iface) -{ - ThreadMgr *This = (ThreadMgr *)iface; - ULONG ret; - - ret = InterlockedDecrement(&This->refCount); - if (ret == 0) - ThreadMgr_Destructor(This); - return ret; -} - -/***************************************************** - * ITfThreadMgr functions - *****************************************************/ - -static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *ptid) -{ - ThreadMgr *This = (ThreadMgr *)iface; - - TRACE("(%p) %p\n",This, ptid); - - if (!ptid) - return E_INVALIDARG; - - if (!processId) - { - GUID guid; - CoCreateGuid(&guid); - ITfClientId_GetClientId((ITfClientId*)&This->ClientIdVtbl,&guid,&processId); - } - - activate_textservices(iface); - This->activationCount++; - *ptid = processId; - return S_OK; -} - -static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface) -{ - ThreadMgr *This = (ThreadMgr *)iface; - TRACE("(%p)\n",This); - - if (This->activationCount == 0) - return E_UNEXPECTED; - - This->activationCount --; - - if (This->activationCount == 0) - { - if (This->focus) - { - ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); - ITfDocumentMgr_Release(This->focus); - This->focus = 0; - } - } - - deactivate_textservices(); - - return S_OK; -} - -static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr -**ppdim) -{ - ThreadMgr *This = (ThreadMgr *)iface; - DocumentMgrEntry *mgrentry; - HRESULT hr; - - TRACE("(%p)\n",iface); - mgrentry = HeapAlloc(GetProcessHeap(),0,sizeof(DocumentMgrEntry)); - if (mgrentry == NULL) - return E_OUTOFMEMORY; - - hr = DocumentMgr_Constructor((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, ppdim); - - if (SUCCEEDED(hr)) - { - mgrentry->docmgr = *ppdim; - list_add_head(&This->CreatedDocumentMgrs,&mgrentry->entry); - } - else - HeapFree(GetProcessHeap(),0,mgrentry); - - return hr; -} - -static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs -**ppEnum) -{ - ThreadMgr *This = (ThreadMgr *)iface; - TRACE("(%p) %p\n",This,ppEnum); - - if (!ppEnum) - return E_INVALIDARG; - - return EnumTfDocumentMgr_Constructor(&This->CreatedDocumentMgrs, ppEnum); -} - -static HRESULT WINAPI ThreadMgr_GetFocus( ITfThreadMgr* iface, ITfDocumentMgr -**ppdimFocus) -{ - ThreadMgr *This = (ThreadMgr *)iface; - TRACE("(%p)\n",This); - - if (!ppdimFocus) - return E_INVALIDARG; - - *ppdimFocus = This->focus; - - TRACE("->%p\n",This->focus); - - if (This->focus == NULL) - return S_FALSE; - - ITfDocumentMgr_AddRef(This->focus); - - return S_OK; -} - -static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *pdimFocus) -{ - ITfDocumentMgr *check; - ThreadMgr *This = (ThreadMgr *)iface; - - TRACE("(%p) %p\n",This,pdimFocus); - - if (!pdimFocus) - check = NULL; - else if (FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) - return E_INVALIDARG; - - ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus); - - if (This->focus) - ITfDocumentMgr_Release(This->focus); - - This->focus = check; - return S_OK; } static HRESULT WINAPI ThreadMgr_AssociateFocus( ITfThreadMgr* iface, HWND hwnd, @@ -838,6 +883,7 @@ newkey->guid = *rguid; newkey->prekey = *prekey; newkey->tid = tid; + newkey->description = NULL; if (cchDesc) { newkey->description = HeapAlloc(GetProcessHeap(),0,cchDesc * sizeof(WCHAR)); @@ -1172,6 +1218,53 @@ ThreadMgrEventSink_OnPopContext }; +/***************************************************** + * ITfSourceSingle functions + *****************************************************/ +static HRESULT WINAPI ThreadMgrSourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI ThreadMgrSourceSingle_AddRef(ITfSourceSingle *iface) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr *)This); +} + +static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface, + TfClientId tid, REFIID riid, IUnknown *punk) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + FIXME("STUB:(%p) %i %s %p\n",This, tid, debugstr_guid(riid),punk); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, + TfClientId tid, REFIID riid) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + FIXME("STUB:(%p) %i %s\n",This, tid, debugstr_guid(riid)); + return E_NOTIMPL; +} + +static const ITfSourceSingleVtbl ThreadMgr_SourceSingleVtbl = +{ + ThreadMgrSourceSingle_QueryInterface, + ThreadMgrSourceSingle_AddRef, + ThreadMgrSourceSingle_Release, + + ThreadMgrSourceSingle_AdviseSingleSink, + ThreadMgrSourceSingle_UnadviseSingleSink, +}; + HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ThreadMgr *This; @@ -1197,6 +1290,7 @@ This->MessagePumpVtbl= &ThreadMgr_MessagePumpVtbl; This->ClientIdVtbl = &ThreadMgr_ClientIdVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; + This->SourceSingleVtbl = &ThreadMgr_SourceSingleVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); @@ -1378,39 +1472,3 @@ } FIXME("ITfDocumenMgr %p not found in this thread\n",mgr); } - -LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam) -{ - ThreadMgr *This; - - This = TlsGetValue(tlsIndex); - if (!This) - { - ERR("Hook proc but no ThreadMgr for this thread. Serious Error\n"); - return 0; - } - if (!This->focusHook) - { - ERR("Hook proc but no ThreadMgr focus Hook. Serious Error\n"); - return 0; - } - - if (nCode == HCBT_SETFOCUS) /* focus change within our thread */ - { - struct list *cursor; - - LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) - { - AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); - if (wnd->hwnd == (HWND)wParam) - { - TRACE("Triggering Associated window focus\n"); - if (This->focus != wnd->docmgr) - ThreadMgr_SetFocus((ITfThreadMgr*)This, wnd->docmgr); - break; - } - } - } - - return CallNextHookEx(This->focusHook, nCode, wParam, lParam); -} Added: trunk/reactos/include/psdk/ctfutb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ctfutb.idl?re… ============================================================================== --- trunk/reactos/include/psdk/ctfutb.idl (added) +++ trunk/reactos/include/psdk/ctfutb.idl [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -1,0 +1,73 @@ +/* + * Copyright 2010 Justin Chevrier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "oaidl.idl"; +#endif + +interface ITfLangBarEventSink; +interface ITfLangBarItemMgr; +interface ITfInputProcessorProfiles; + +[ + object, + uuid(87955690-e627-11d2-8ddb-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarMgr: IUnknown +{ + HRESULT AdviseEventSink( + [in] ITfLangBarEventSink *pSink, + [in] HWND hwnd, + [in] DWORD dwflags, + [in] DWORD *pdwCookie); + + HRESULT UnAdviseEventSink( + [in] DWORD dwCookie); + + HRESULT GetThreadMarshalInterface( + [in] DWORD dwThreadId, + [in] DWORD dwType, + [in] REFIID riid, + [out] IUnknown **ppunk); + + HRESULT GetThreadLangBarItemMgr( + [in] DWORD dwThreadId, + [out] ITfLangBarItemMgr **pplbie, + [out] DWORD *pdwThreadid); + + HRESULT GetInputProcessorProfiles( + [in] DWORD dwThreadId, + [out] ITfInputProcessorProfiles **ppaip, + [out] DWORD *pdwThreadid); + + HRESULT RestoreLastFocus( + [out] DWORD *dwThreadId, + [in] BOOL fPrev); + + HRESULT SetModalInput( + [in] ITfLangBarEventSink *pSink, + [in] DWORD dwThreadId, + [in] DWORD dwFlags); + + HRESULT ShowFloating( + [in] DWORD dwFlags); + + HRESULT GetShowFloatingStatus( + [out] DWORD *pdwFlags); +}; Propchange: trunk/reactos/include/psdk/ctfutb.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -20,7 +20,7 @@ import "oaidl.idl"; import "comcat.idl"; import "textstor.idl"; -/* import "ctfutb.idl"; */ +import "ctfutb.idl"; #endif cpp_quote("#include <winuser.h>") @@ -37,6 +37,7 @@ cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);") +cpp_quote("HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("DEFINE_GUID(GUID_PROP_ATTRIBUTE,0x34b45670,0x7526,0x11d2,0xa1,0x47,0x00,0x10,0x5a,0x27,0x99,0xb5);") @@ -46,6 +47,7 @@ cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") +cpp_quote("EXTERN_C const CLSID CLSID_TF_LangBarMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") cpp_quote("DEFINE_GUID(CLSID_TF_DisplayAttributeMgr,0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53);") @@ -1349,3 +1351,16 @@ [in] TfClientId tid, [in] REFIID riid); }; + +[ + object, + local, + uuid(c0f1db0c-3a20-405c-a303-96b6010a885f), + pointer_default(unique) +] +interface ITfThreadFocusSink : IUnknown +{ + HRESULT OnSetThreadFocus(); + + HRESULT OnKillThreadFocus(); +}; Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -10,6 +10,7 @@ <file>bits.idl</file> <file>commoncontrols.idl</file> <file>control.idl</file> + <file>ctfutb.idl</file> <file>ctxtcall.idl</file> <file>dimm.idl</file> <file>dispex.idl</file> Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=45… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sun Mar 7 10:48:42 2010 @@ -155,6 +155,7 @@ DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); +DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14);

14 years, 10 months

[fireball] 45981: Maarten Kroese - Apply same Marlett-font charset fix to the system menu drawing. - Also slightly adjust symbol's position. (Should be sent upstream).

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 7 10:44:18 2010 New Revision: 45981 URL: http://svn.reactos.org/svn/reactos?rev=45981&view=rev Log: Maarten Kroese - Apply same Marlett-font charset fix to the system menu drawing. - Also slightly adjust symbol's position. (Should be sent upstream). Modified: branches/arwinss/reactos/dll/win32/user32/menu.c Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Sun Mar 7 10:44:18 2010 @@ -954,14 +954,14 @@ /* draw the magic bitmaps using marlett font characters */ /* FIXME: fontsize and the position (x,y) could probably be better */ HFONT hfont, hfontsav; - LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, - 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0, + LOGFONTW logfont = { 0, 0, 0, 0, FW_DONTCARE, + 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, { 'M','a','r','l','e','t','t',0 } }; logfont.lfHeight = min( h, w) - 5 ; TRACE(" height %d rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); hfont = CreateFontIndirectW( &logfont); hfontsav = SelectObject(hdc, hfont); - TextOutW( hdc, rect->left, rect->top + 2, &bmchr, 1); + TextOutW( hdc, rect->left, rect->top + 4, &bmchr, 1); SelectObject(hdc, hfontsav); DeleteObject( hfont); }

14 years, 10 months

[cwittich] 45980: [PSAPI_WINETEST] sync psapi_winetest to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 10:34:40 2010 New Revision: 45980 URL: http://svn.reactos.org/svn/reactos?rev=45980&view=rev Log: [PSAPI_WINETEST] sync psapi_winetest to wine 1.1.40 Modified: trunk/rostests/winetests/psapi/psapi_main.c Modified: trunk/rostests/winetests/psapi/psapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_mai… ============================================================================== --- trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] Sun Mar 7 10:34:40 2010 @@ -157,8 +157,12 @@ w32_err(pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)), ERROR_INVALID_HANDLE); w32_err(pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)), ERROR_ACCESS_DENIED); - if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)))) - return; + + SetLastError( 0xdeadbeef ); + ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); + ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ + "GetMappedFileNameA failed with error %u\n", GetLastError() ); + if (!ret) return; ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */

14 years, 10 months

[cwittich] 45979: [ITSS] sync itss to wine 1.1.40

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 7 10:32:58 2010 New Revision: 45979 URL: http://svn.reactos.org/svn/reactos?rev=45979&view=rev Log: [ITSS] sync itss to wine 1.1.40 Modified: trunk/reactos/dll/win32/itss/chm_lib.c trunk/reactos/dll/win32/itss/chm_lib.h trunk/reactos/dll/win32/itss/itss.inf trunk/reactos/dll/win32/itss/storage.c Modified: trunk/reactos/dll/win32/itss/chm_lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/chm_lib.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/chm_lib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/chm_lib.c [iso-8859-1] Sun Mar 7 10:32:58 2010 @@ -829,6 +829,38 @@ return newHandle; } +/* Duplicate an ITS archive handle */ +struct chmFile *chm_dup(struct chmFile *oldHandle) +{ + struct chmFile *newHandle=NULL; + + newHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(struct chmFile)); + memcpy(newHandle, oldHandle, sizeof(struct chmFile)); + + /* duplicate fd handle */ + DuplicateHandle(GetCurrentProcess(), oldHandle->fd, + GetCurrentProcess(), &(newHandle->fd), + 0, FALSE, DUPLICATE_SAME_ACCESS); + newHandle->lzx_state = NULL; + newHandle->cache_blocks = NULL; + newHandle->cache_block_indices = NULL; + newHandle->cache_num_blocks = 0; + + /* initialize mutexes, if needed */ + InitializeCriticalSection(&newHandle->mutex); + newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex"); + InitializeCriticalSection(&newHandle->lzx_mutex); + newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex"); + InitializeCriticalSection(&newHandle->cache_mutex); + newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex"); + + /* initialize cache */ + chm_set_param(newHandle, CHM_PARAM_MAX_BLOCKS_CACHED, + CHM_MAX_BLOCKS_CACHED); + + return newHandle; +} + /* close an ITS archive */ void chm_close(struct chmFile *h) { Modified: trunk/reactos/dll/win32/itss/chm_lib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/chm_lib.h?r… ============================================================================== --- trunk/reactos/dll/win32/itss/chm_lib.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/chm_lib.h [iso-8859-1] Sun Mar 7 10:32:58 2010 @@ -73,6 +73,7 @@ }; struct chmFile* chm_openW(const WCHAR *filename); +struct chmFile *chm_dup(struct chmFile *oldHandle); /* close an ITS archive */ void chm_close(struct chmFile *h); Modified: trunk/reactos/dll/win32/itss/itss.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.inf?re… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.inf [iso-8859-1] Sun Mar 7 10:32:58 2010 @@ -16,7 +16,7 @@ HKCR,"CLSID\%CLSID_ITStorage%",,,"Microsoft InfoTech IStorage System" HKCR,"CLSID\%CLSID_ITStorage%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_ITStorage%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_ITStorage%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_ITStorage%\NotInsertable",,16 HKCR,"CLSID\%CLSID_ITStorage%\ProgID",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_ITStorage%\VersionIndependentProgID",,,"MSITFS" @@ -28,7 +28,7 @@ HKCR,"CLSID\%CLSID_MSITStore%",,,"Microsoft InfoTech Protocol for IE 3.0" HKCR,"CLSID\%CLSID_MSITStore%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_MSITStore%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_MSITStore%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_MSITStore%\NotInsertable",,16 HKCR,"CLSID\%CLSID_MSITStore%\ProgID",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_MSITStore%\VersionIndependentProgID",,,"MSITFS" @@ -41,9 +41,9 @@ HKCR,"CLSID\%CLSID_ITSProtocol%",,,"Microsoft InfoTech Protocol for IE 4.0" HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_ITSProtocol%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_ITSProtocol%\NotInsertable",,16 HKCR,"CLSID\%CLSID_ITSProtocol%\ProgID",,,"MSITFS1.0" -HKCR,"CLSID\%CLSID_ITSProtocol%%\VersionIndependentProgID",,,"MSITFS" +HKCR,"CLSID\%CLSID_ITSProtocol%\VersionIndependentProgID",,,"MSITFS" HKCR,"ITSProtocol","Microsoft InfoTech Protocols for IE 4.0" HKCR,"ITSProtocol\CLSID",,,"%CLSID_ITSProtocol%" @@ -54,7 +54,7 @@ HKCR,"CLSID\%CLSID_MSFSStore%",,,"Microsoft InfoTech IStorage for Win32 Files" HKCR,"CLSID\%CLSID_MSFSStore%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_MSFSStore%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_MSFSStore%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_MSFSStore%\NotInsertable",,16 HKCR,"CLSID\%CLSID_MSFSStore%\ProgID",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_MSFSStore%\VersionIndependentProgID",,,"MSITFS" Modified: trunk/reactos/dll/win32/itss/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/storage.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] Sun Mar 7 10:32:58 2010 @@ -391,10 +391,43 @@ IStorage** ppstg) { ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; - - FIXME("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), + static const WCHAR szRoot[] = { '/', 0 }; + struct chmFile *chmfile; + WCHAR *path, *p; + DWORD len; + + TRACE("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstg); - return E_NOTIMPL; + + chmfile = chm_dup( This->chmfile ); + if( !chmfile ) + return E_FAIL; + + len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; + path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + strcpyW( path, This->dir ); + + if( pwcsName[0] == '/' || pwcsName[0] == '\\' ) + { + p = &path[strlenW( path ) - 1]; + while( ( path <= p ) && ( *p == '/' ) ) + *p-- = 0; + } + strcatW( path, pwcsName ); + + for(p=path; *p; p++) { + if(*p == '\\') + *p = '/'; + } + + if(*--p == '/') + *p = 0; + + strcatW( path, szRoot ); + + TRACE("Resolving %s\n", debugstr_w(path)); + + return ITSS_create_chm_storage(chmfile, path, ppstg); } static HRESULT WINAPI ITSS_IStorageImpl_CopyTo(

14 years, 10 months

← Newer
1
...
62
63
64
65
66
67
68
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010