Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 67321: [FAST486] (Addendum to r67320) ... and that goes for POP too...
by aandrejevic＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: aandrejevic Date: Mon Apr 20 01:25:04 2015 New Revision: 67321 URL: http://svn.reactos.org/svn/reactos?rev=67321&view=rev Log: [FAST486] (Addendum to r67320) ... and that goes for POP too... Modified: trunk/reactos/lib/fast486/common.inl Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Mon Apr 20 01:25:04 2015 @@ -408,7 +408,9 @@ /* Read the value from SS:ESP */ if (!Fast486ReadMemory(State, FAST486_REG_SS, - State->GeneralRegs[FAST486_REG_ESP].Long, + State->SegmentRegs[FAST486_REG_SS].Size + ? State->GeneralRegs[FAST486_REG_ESP].Long + : State->GeneralRegs[FAST486_REG_ESP].LowWord, FALSE, &LongValue, sizeof(LongValue))) @@ -417,8 +419,16 @@ return FALSE; } - /* Increment ESP by 4 */ - State->GeneralRegs[FAST486_REG_ESP].Long += sizeof(ULONG); + if (State->SegmentRegs[FAST486_REG_SS].Size) + { + /* Increment ESP by 4 */ + State->GeneralRegs[FAST486_REG_ESP].Long += sizeof(ULONG); + } + else + { + /* Increment SP by 4 */ + State->GeneralRegs[FAST486_REG_ESP].LowWord += sizeof(ULONG); + } /* Store the value in the result */ *Value = LongValue; @@ -438,7 +448,9 @@ /* Read the value from SS:SP */ if (!Fast486ReadMemory(State, FAST486_REG_SS, - State->GeneralRegs[FAST486_REG_ESP].LowWord, + State->SegmentRegs[FAST486_REG_SS].Size + ? State->GeneralRegs[FAST486_REG_ESP].Long + : State->GeneralRegs[FAST486_REG_ESP].LowWord, FALSE, &ShortValue, sizeof(ShortValue))) @@ -447,8 +459,16 @@ return FALSE; } - /* Increment SP by 2 */ - State->GeneralRegs[FAST486_REG_ESP].LowWord += sizeof(USHORT); + if (State->SegmentRegs[FAST486_REG_SS].Size) + { + /* Increment ESP by 2 */ + State->GeneralRegs[FAST486_REG_ESP].Long += sizeof(USHORT); + } + else + { + /* Increment SP by 2 */ + State->GeneralRegs[FAST486_REG_ESP].LowWord += sizeof(USHORT); + } /* Store the value in the result */ *Value = ShortValue;

1 0

[aandrejevic] 67320: [FAST486] Whether stack operations use ESP or SP depends on the size of the stack segment.
by aandrejevic＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: aandrejevic Date: Mon Apr 20 00:36:46 2015 New Revision: 67320 URL: http://svn.reactos.org/svn/reactos?rev=67320&view=rev Log: [FAST486] Whether stack operations use ESP or SP depends on the size of the stack segment. Modified: trunk/reactos/lib/fast486/common.inl Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Mon Apr 20 00:36:46 2015 @@ -301,6 +301,7 @@ ULONG Value) { BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; + ULONG StackPointer = State->GeneralRegs[FAST486_REG_ESP].Long; /* The OPSIZE prefix toggles the size */ TOGGLE_OPSIZE(Size); @@ -320,7 +321,9 @@ /* Store the value in SS:[ESP - 4] */ if (!Fast486WriteMemory(State, FAST486_REG_SS, - State->GeneralRegs[FAST486_REG_ESP].Long - sizeof(ULONG), + State->SegmentRegs[FAST486_REG_SS].Size + ? StackPointer - sizeof(ULONG) + : LOWORD(StackPointer - sizeof(ULONG)), &Value, sizeof(ULONG))) { @@ -328,8 +331,16 @@ return FALSE; } - /* Subtract ESP by 4 */ - State->GeneralRegs[FAST486_REG_ESP].Long -= sizeof(ULONG); + if (State->SegmentRegs[FAST486_REG_SS].Size) + { + /* Subtract ESP by 4 */ + State->GeneralRegs[FAST486_REG_ESP].Long -= sizeof(ULONG); + } + else + { + /* Subtract SP by 4 */ + State->GeneralRegs[FAST486_REG_ESP].LowWord -= sizeof(ULONG); + } } else { @@ -346,7 +357,9 @@ /* Store the value in SS:[SP - 2] */ if (!Fast486WriteMemory(State, FAST486_REG_SS, - LOWORD(State->GeneralRegs[FAST486_REG_ESP].LowWord - sizeof(USHORT)), + State->SegmentRegs[FAST486_REG_SS].Size + ? StackPointer - sizeof(USHORT) + : LOWORD(StackPointer - sizeof(USHORT)), &ShortValue, sizeof(USHORT))) { @@ -354,8 +367,16 @@ return FALSE; } - /* Subtract SP by 2 */ - State->GeneralRegs[FAST486_REG_ESP].LowWord -= sizeof(USHORT); + if (State->SegmentRegs[FAST486_REG_SS].Size) + { + /* Subtract ESP by 2 */ + State->GeneralRegs[FAST486_REG_ESP].Long -= sizeof(USHORT); + } + else + { + /* Subtract SP by 2 */ + State->GeneralRegs[FAST486_REG_ESP].LowWord -= sizeof(USHORT); + } } return TRUE;

1 0

[dreimer] 67319: [FRAGINATOR] Make the GUI version actually work by disabling wmain per ifdef which will be set only at CUI build. Fix resources to make the text fit nicely and get rid of the RLEXT...
by dreimer＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: dreimer Date: Mon Apr 20 00:08:02 2015 New Revision: 67319 URL: http://svn.reactos.org/svn/reactos?rev=67319&view=rev Log: [FRAGINATOR] Make the GUI version actually work by disabling wmain per ifdef which will be set only at CUI build. Fix resources to make the text fit nicely and get rid of the RLEXT/LTEXT mess Add German translation Added: trunk/rosapps/applications/fraginator/lang/de-DE.rc (with props) Modified: trunk/rosapps/applications/fraginator/CMakeLists.txt trunk/rosapps/applications/fraginator/Fraginator.rc trunk/rosapps/applications/fraginator/Unfrag.cpp trunk/rosapps/applications/fraginator/lang/en-US.rc trunk/rosapps/applications/fraginator/lang/es-ES.rc trunk/rosapps/applications/fraginator/lang/fr-FR.rc trunk/rosapps/applications/fraginator/lang/no-NO.rc trunk/rosapps/applications/fraginator/lang/ro-RO.rc trunk/rosapps/applications/fraginator/lang/sk-SK.rc trunk/rosapps/applications/fraginator/lang/uk-UA.rc Modified: trunk/rosapps/applications/fraginator/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/CM… ============================================================================== --- trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -19,6 +19,7 @@ add_cd_file(TARGET frag DESTINATION reactos/system32 FOR all) add_executable(unfrag ${UNFRAG_SOURCE}) +add_target_compile_definitions(unfrag "_CUI_") set_module_type(unfrag win32cui UNICODE) add_importlibs(unfrag advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET unfrag DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/fraginator/Fraginator.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/Fr… ============================================================================== --- trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -47,6 +47,9 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif Modified: trunk/rosapps/applications/fraginator/Unfrag.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/Un… ============================================================================== --- trunk/rosapps/applications/fraginator/Unfrag.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/Unfrag.cpp [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -141,7 +141,7 @@ return (Defragger); } - +#ifdef _CUI_ // Main Initialization extern "C" int wmain (int argc, wchar_t **argv) { @@ -160,7 +160,7 @@ Drives.push_back (_wcsupr(argv[c])); } else - if (argv[c][0] == L'-' || (argv[c][0] == L'/' && wcslen(argv[c]) == 2)) + if ((argv[c][0] == L'-' || argv[c][0] == L'/') && wcslen(argv[c]) == 2) { switch (tolower(argv[c][1])) { @@ -461,3 +461,4 @@ return (0); } +#endif Added: trunk/rosapps/applications/fraginator/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/de-DE.rc (added) +++ trunk/rosapps/applications/fraginator/lang/de-DE.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -0,0 +1,84 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_MAIN DIALOGEX 0, 0, 375, 103 +STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Start",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "Hilfe",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "Beenden",IDC_QUIT,322,51,45,15 + CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | + WS_BORDER,7,7,78,58 + LTEXT "Laufwerk wÃ¤hlen:",-1,78,40,73,8 + LTEXT "Aufgabe wÃ¤hlen:",-1,159,40,73,8 + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | + 0x1,7,71,320,10 + CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "Ich bin ein Affe, hÃ¶r mich schreien",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "ProzessprioritÃ¤t:",-1,241,40,73,8 +END + +IDD_REPORT DIALOGEX 0, 0, 405, 169 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "Report" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bytes",IDC_BYTES,7,148,50,14 + DEFPUSHBUTTON "Kilobytes",IDC_KILOBYTES,61,148,50,14 + DEFPUSHBUTTON "Megabytes",IDC_MEGABYTES,115,148,50,14 + DEFPUSHBUTTON "Gigabytes",IDC_GIGABYTES,169,148,50,14 + DEFPUSHBUTTON "OK",IDC_REPORTOK,348,148,50,14 + LTEXT "Laufwerk",-1,7,7,75,8 + LTEXT "KapazitÃ¤t",-1,7,51,75,8 + LTEXT "(Laufwerkbuchstabe)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(PlattengrÃ¶Ãe, Bytes)",IDC_DISKSIZEBYTES,83,51,117,10, + SS_SUNKEN + LTEXT "(PlattengrÃ¶Ãe, Cluster)",IDC_DISKSIZECLUSTERS,83,73,117, + 10,SS_SUNKEN + LTEXT "Anzahl Cluster",-1,7,73,75,8 + LTEXT "(ClustergrÃ¶Ãe)",IDC_DISKCLUSTERSIZE,83,84,117,10, + SS_SUNKEN + LTEXT "ClustergrÃ¶Ãe",-1,7,84,75,8 + LTEXT "(Anzahl Dateien)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(GrÃ¶Ãe Dateien, Bytes)",IDC_FILESSIZEBYTES,281,29,117,10, + SS_SUNKEN + LTEXT "# an Dateien",-1,205,18,75,8 + LTEXT "GesamtgrÃ¶Ãe",-1,205,29,75,8 + LTEXT "GrÃ¶Ãe auf HDD",-1,205,40,75,8 + LTEXT "(GesamtgrÃ¶Ãe, Bytes)",IDC_FILESSIZEONDISK,281,40,117,10, + SS_SUNKEN + LTEXT "(Dateien vergeuden Bytes)",IDC_FILESSLACKBYTES,281,51,117,10, + SS_SUNKEN + LTEXT "Vergeudeter Speicher",-1,205,51,75,8 + LTEXT "(Freier Speicher, Bytes)",IDC_DISKFREEBYTES,83,62,117,10, + SS_SUNKEN + LTEXT "Freier Speicher",-1,7,62,75,8 + LTEXT "(Fragmentierte Dateien, Anzahl)",IDC_FILESFRAGGED,281,62,117, + 10,SS_SUNKEN + LTEXT "Fragmentierte Dateien",-1,205,62,75,8 + LTEXT "(Anzahl Ordner)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# an Ordnern",-1,205,7,75,8 + LTEXT "Dateisystem",-1,7,40,75,8 + LTEXT "(Dateisystemname)",IDC_FILESYSTEM,83,40,117,10, + SS_SUNKEN + LTEXT "Volumenbezeichnung",-1,7,18,75,8 + LTEXT "(Volumenbezeichnung)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "Seriennummer",-1,7,29,75,8 + LTEXT "(Seriennummer)",IDC_VOLUMESERIAL,83,29,117,10, + SS_SUNKEN + LTEXT "(Ã - Fragmentierung pro Datei)",IDC_AVERAGEFRAGS,281,73,117, + 10,SS_SUNKEN + LTEXT "Ã - Fragmentierung pro Datei",-1,205,73,75,20 + LTEXT "XX.X% der Dateien auf diesem Laufwerk sind fragmentiert. Es wird empfohlen, dass Sie eine SSSSSSS Defragmentierung durchzufÃ¼hren.", + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN + LTEXT "Empfehlungen:",-1,7,96,75,8 +END Propchange: trunk/rosapps/applications/fraginator/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/fraginator/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/en-US.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -1,33 +1,33 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MAIN DIALOGEX 0, 0, 346, 103 +IDD_MAIN DIALOGEX 0, 0, 375, 103 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Start",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "Help",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "Exit",IDC_QUIT,294,49,45,15 + PUSHBUTTON "Start",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "Help",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "Exit",IDC_QUIT,322,51,45,15 CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "Choose a drive:",-1,78,40,50,8 - LTEXT "Choose an action:",-1,135,40,58,8 + WS_BORDER,7,7,78,58 + LTEXT "Choose a drive:",-1,78,40,73,8 + LTEXT "Choose an action:",-1,159,40,73,8 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 + 0x1,7,71,320,10 CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "Process Priority:",-1,223,40,51,8 + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "Process Priority:",-1,241,40,73,8 END -IDD_REPORT DIALOGEX 0, 0, 391, 169 +IDD_REPORT DIALOGEX 0, 0, 405, 169 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Report" FONT 8, "MS Shell Dlg" @@ -36,49 +36,49 @@ DEFPUSHBUTTON "Kilobytes",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "Megabytes",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "Gigabytes",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 - RTEXT "Volume",-1,7,7,24,8 - LTEXT "Capacity",-1,7,51,28,8 - RTEXT "(Drive Letter)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(Disk Size, Bytes)",IDC_DISKSIZEBYTES,63,51,117,10, + DEFPUSHBUTTON "OK",IDC_REPORTOK,348,148,50,14 + LTEXT "Volume",-1,7,7,75,8 + LTEXT "Capacity",-1,7,51,75,8 + LTEXT "(Drive Letter)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(Disk Size, Bytes)",IDC_DISKSIZEBYTES,83,51,117,10, SS_SUNKEN - RTEXT "(Disk Size, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + LTEXT "(Disk Size, Clusters)",IDC_DISKSIZECLUSTERS,83,73,117, 10,SS_SUNKEN - LTEXT "Total clusters",-1,7,73,43,8 - RTEXT "(Cluster size)",IDC_DISKCLUSTERSIZE,63,84,117,10, + LTEXT "Total clusters",-1,7,73,75,8 + LTEXT "(Cluster size)",IDC_DISKCLUSTERSIZE,83,84,117,10, SS_SUNKEN - LTEXT "Cluster size",-1,7,84,36,8 - RTEXT "(Files count)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(Files size, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, + LTEXT "Cluster size",-1,7,84,75,8 + LTEXT "(Files count)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(Files size, Bytes)",IDC_FILESSIZEBYTES,281,29,117,10, SS_SUNKEN - LTEXT "# of files",-1,194,18,28,8 - LTEXT "Total size",-1,194,29,31,8 - LTEXT "Size on disk",-1,194,40,39,8 - RTEXT "(Total size, bytes)",IDC_FILESSIZEONDISK,267,40,117,10, + LTEXT "# of files",-1,205,18,75,8 + LTEXT "Total size",-1,205,29,75,8 + LTEXT "Size on disk",-1,205,40,75,8 + LTEXT "(Total size, Bytes)",IDC_FILESSIZEONDISK,281,40,117,10, SS_SUNKEN - RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + LTEXT "(Files slack Bytes)",IDC_FILESSLACKBYTES,281,51,117,10, SS_SUNKEN - LTEXT "Wasted slack",-1,194,51,44,8 - RTEXT "(Disk Free, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + LTEXT "Wasted slack",-1,205,51,75,8 + LTEXT "(Disk Free, Bytes)",IDC_DISKFREEBYTES,83,62,117,10, SS_SUNKEN - LTEXT "Free space",-1,7,62,36,8 - RTEXT "(Files fragmented, count)",IDC_FILESFRAGGED,267,62,117, + LTEXT "Free space",-1,7,62,75,8 + LTEXT "(Files fragmented, count)",IDC_FILESFRAGGED,281,62,117, 10,SS_SUNKEN - LTEXT "Fragmented files",-1,194,62,52,8 - RTEXT "(Dirs count)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# of directories",-1,194,7,48,8 - RTEXT "File System",-1,7,40,36,8 - RTEXT "(File System Name)",IDC_FILESYSTEM,63,40,117,10, + LTEXT "Fragmented files",-1,205,62,75,8 + LTEXT "(Dirs count)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# of directories",-1,205,7,75,8 + LTEXT "File System",-1,7,40,75,8 + LTEXT "(File System Name)",IDC_FILESYSTEM,83,40,117,10, SS_SUNKEN - RTEXT "Volume Label",-1,7,18,44,8 - RTEXT "(Volume Name)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "Serial",-1,7,29,18,8 - RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, + LTEXT "Volume Label",-1,7,18,75,8 + LTEXT "(Volume Name)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "Serial",-1,7,29,75,8 + LTEXT "(Volume Serial)",IDC_VOLUMESERIAL,83,29,117,10, SS_SUNKEN - RTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,267,73,117, + LTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,281,73,117, 10,SS_SUNKEN - LTEXT "Average fragments per file",-1,194,73,60,20 + LTEXT "Average fragments per file",-1,205,73,75,20 LTEXT "XX.X% of the files on this drive are fragmented. It is recommended that you perform a SSSSSSS defragmentation.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "Recommendations:",-1,7,96,62,8 + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN + LTEXT "Recommendations:",-1,7,96,75,8 END Modified: trunk/rosapps/applications/fraginator/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/es-ES.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -1,33 +1,33 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_MAIN DIALOGEX 0, 0, 346, 103 +IDD_MAIN DIALOGEX 0, 0, 375, 103 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Comenzar",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "Ayuda",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "Salir",IDC_QUIT,294,49,45,15 + PUSHBUTTON "Comenzar",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "Ayuda",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "Salir",IDC_QUIT,322,51,45,15 CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "Seleccione una unidad:",-1,78,40,50,8 - LTEXT "Seleccione una acciÃ³n:",-1,135,40,58,8 + WS_BORDER,7,7,78,58 + LTEXT "Seleccione una unidad:",-1,78,40,73,8 + LTEXT "Seleccione una acciÃ³n:",-1,159,40,73,8 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 + 0x1,7,71,320,10 CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "Prioridad del proceso:",-1,223,40,51,8 + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "Prioridad del proceso:",-1,241,40,73,8 END -IDD_REPORT DIALOGEX 0, 0, 391, 169 +IDD_REPORT DIALOGEX 0, 0, 405, 169 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Informe" FONT 8, "MS Shell Dlg" @@ -36,49 +36,49 @@ DEFPUSHBUTTON "Kilobytes",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "Megabytes",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "Gigabytes",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "Aceptar",IDC_REPORTOK,334,148,50,14 - RTEXT "Volumen",-1,7,7,24,8 - LTEXT "Capacidad",-1,7,51,28,8 - RTEXT "(Letra de la unidad)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(TamaÃ±o del disco, Bytes)",IDC_DISKSIZEBYTES,63,51,117,10, + DEFPUSHBUTTON "Aceptar",IDC_REPORTOK,348,148,50,14 + LTEXT "Volumen",-1,7,7,75,8 + LTEXT "Capacidad",-1,7,51,75,8 + LTEXT "(Letra de la unidad)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(TamaÃ±o del disco, Bytes)",IDC_DISKSIZEBYTES,83,51,117,10, SS_SUNKEN - RTEXT "(TamaÃ±o del disco, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + LTEXT "(TamaÃ±o del disco, Clusters)",IDC_DISKSIZECLUSTERS,83,73,117, 10,SS_SUNKEN - LTEXT "Clusters totales",-1,7,73,43,8 - RTEXT "(TamaÃ±o del Cluster)",IDC_DISKCLUSTERSIZE,63,84,117,10, + LTEXT "Clusters totales",-1,7,73,75,8 + LTEXT "(TamaÃ±o del Cluster)",IDC_DISKCLUSTERSIZE,83,84,117,10, SS_SUNKEN - LTEXT "TamaÃ±o del Cluster",-1,7,84,36,8 - RTEXT "(Cantidad de archivos)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(TamaÃ±o de archivos, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, + LTEXT "TamaÃ±o del Cluster",-1,7,84,75,8 + LTEXT "(Cantidad de archivos)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(TamaÃ±o de archivos, Bytes)",IDC_FILESSIZEBYTES,281,29,117,10, SS_SUNKEN - LTEXT "# de archivos",-1,194,18,28,8 - LTEXT "TamaÃ±o total",-1,194,29,31,8 - LTEXT "TamaÃ±o en disco",-1,194,40,39,8 - RTEXT "(TamaÃ±o total, bytes)",IDC_FILESSIZEONDISK,267,40,117,10, + LTEXT "# de archivos",-1,205,18,75,8 + LTEXT "TamaÃ±o total",-1,205,29,75,8 + LTEXT "TamaÃ±o en disco",-1,205,40,75,8 + LTEXT "(TamaÃ±o total, Bytes)",IDC_FILESSIZEONDISK,281,40,117,10, SS_SUNKEN - RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + LTEXT "(Files slack Bytes)",IDC_FILESSLACKBYTES,281,51,117,10, SS_SUNKEN - LTEXT "Wasted slack",-1,194,51,44,8 - RTEXT "(Espacio libre, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + LTEXT "Wasted slack",-1,205,51,75,8 + LTEXT "(Espacio libre, Bytes)",IDC_DISKFREEBYTES,83,62,117,10, SS_SUNKEN - LTEXT "Espacio libre",-1,7,62,36,8 - RTEXT "(Archivos fragmentados, cantidad)",IDC_FILESFRAGGED,267,62,117, + LTEXT "Espacio libre",-1,7,62,75,8 + LTEXT "(Archivos fragmentados, cantidad)",IDC_FILESFRAGGED,281,62,117, 10,SS_SUNKEN - LTEXT "Archivos fragmentados",-1,194,62,52,8 - RTEXT "(Cantidad de directorios)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# de directorios",-1,194,7,48,8 - RTEXT "Sistema de archivos",-1,7,40,36,8 - RTEXT "(Nombre del sistema de archivos)",IDC_FILESYSTEM,63,40,117,10, + LTEXT "Archivos fragmentados",-1,205,62,75,8 + LTEXT "(Cantidad de directorios)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# de directorios",-1,205,7,75,8 + LTEXT "Sistema de archivos",-1,7,40,75,8 + LTEXT "(Nombre del sistema de archivos)",IDC_FILESYSTEM,83,40,117,10, SS_SUNKEN - RTEXT "Etiqueta del volumen",-1,7,18,44,8 - RTEXT "(Etiqueta del volumen)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "Serie",-1,7,29,18,8 - RTEXT "(Serie del volumen)",IDC_VOLUMESERIAL,63,29,117,10, + LTEXT "Etiqueta del volumen",-1,7,18,75,8 + LTEXT "(Etiqueta del volumen)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "Serie",-1,7,29,75,8 + LTEXT "(Serie del volumen)",IDC_VOLUMESERIAL,83,29,117,10, SS_SUNKEN - RTEXT "(Media de fragmentos por archivo)",IDC_AVERAGEFRAGS,267,73,117, + LTEXT "(Media de fragmentos por archivo)",IDC_AVERAGEFRAGS,281,73,117, 10,SS_SUNKEN - LTEXT "Media de fragmentos por archivo",-1,194,73,60,20 + LTEXT "Media de fragmentos por archivo",-1,205,73,75,20 LTEXT "XX.X% de los archivos de esta unidad estÃ¡n fragmentados. Es recomendable que realice una SSSSSSS defragmentaciÃ³n.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "Recomendaciones:",-1,7,96,62,8 + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN + LTEXT "Recomendaciones:",-1,7,96,75,8 END Modified: trunk/rosapps/applications/fraginator/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/fr-FR.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -1,33 +1,33 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_MAIN DIALOGEX 0, 0, 346, 103 +IDD_MAIN DIALOGEX 0, 0, 375, 103 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "DÃ©marrer",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "Aide",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "Quitter",IDC_QUIT,294,49,45,15 + PUSHBUTTON "DÃ©marrer",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "Aide",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "Quitter",IDC_QUIT,322,51,45,15 CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "Choisissez un lecteur :",-1,78,40,50,8 - LTEXT "Choisissez une action :",-1,135,40,58,8 + WS_BORDER,7,7,78,58 + LTEXT "Choisissez un lecteur:",-1,78,40,73,8 + LTEXT "Choisissez une action:",-1,159,40,73,8 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 + 0x1,7,71,320,10 CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "Je suis un singe, ententez-moi eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "PrioritÃ© du processus :",-1,223,40,51,8 + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "Je suis un singe, ententez-moi eeK",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "PrioritÃ© du processus:",-1,241,40,73,8 END -IDD_REPORT DIALOGEX 0, 0, 391, 169 +IDD_REPORT DIALOGEX 0, 0, 405, 169 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Rapport" FONT 8, "MS Shell Dlg" @@ -36,49 +36,49 @@ DEFPUSHBUTTON "Kilooctets",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "MÃ©gaoctets",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "Gigaoctets",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 - RTEXT "Volume",-1,7,7,24,8 - LTEXT "CapacitÃ©",-1,7,51,28,8 - RTEXT "(Lettre du lecteur)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(Taille du disque, Octets)",IDC_DISKSIZEBYTES,63,51,117,10, + DEFPUSHBUTTON "OK",IDC_REPORTOK,348,148,50,14 + LTEXT "Volume",-1,7,7,75,8 + LTEXT "CapacitÃ©",-1,7,51,75,8 + LTEXT "(Lettre du lecteur)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(Taille du disque, Octets)",IDC_DISKSIZEBYTES,83,51,117,10, SS_SUNKEN - RTEXT "(Taille du disque, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + LTEXT "(Taille du disque, Clusters)",IDC_DISKSIZECLUSTERS,83,73,117, 10,SS_SUNKEN - LTEXT "Nombre de clusters",-1,7,73,43,8 - RTEXT "(Taille d'un Cluster)",IDC_DISKCLUSTERSIZE,63,84,117,10, + LTEXT "Nombre de clusters",-1,7,73,75,8 + LTEXT "(Taille d'un Cluster)",IDC_DISKCLUSTERSIZE,83,84,117,10, SS_SUNKEN - LTEXT "Taille d'un cluster",-1,7,84,36,8 - RTEXT "(Nombre de fichiers)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(Taille des fichiers, octets)",IDC_FILESSIZEBYTES,267,29,117,10, + LTEXT "Taille d'un cluster",-1,7,84,75,8 + LTEXT "(Nombre de fichiers)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(Taille des fichiers, octets)",IDC_FILESSIZEBYTES,281,29,117,10, SS_SUNKEN - LTEXT "# des fichiers",-1,194,18,28,8 - LTEXT "Taille totale",-1,194,29,31,8 - LTEXT "Taille sur le disque",-1,194,40,39,8 - RTEXT "(Taille totale, octets)",IDC_FILESSIZEONDISK,267,40,117,10, + LTEXT "# des fichiers",-1,205,18,75,8 + LTEXT "Taille totale",-1,205,29,75,8 + LTEXT "Taille sur le disque",-1,205,40,75,8 + LTEXT "(Taille totale, octets)",IDC_FILESSIZEONDISK,281,40,117,10, SS_SUNKEN - RTEXT "(Octets perdus par les fichiers)",IDC_FILESSLACKBYTES,267,51,117,10, + LTEXT "(Octets perdus par les fichiers)",IDC_FILESSLACKBYTES,281,51,117,10, SS_SUNKEN - LTEXT "Espace perdu",-1,194,51,44,8 - RTEXT "(Espace libre, octets)",IDC_DISKFREEBYTES,63,62,117,10, + LTEXT "Espace perdu",-1,205,51,75,8 + LTEXT "(Espace libre, octets)",IDC_DISKFREEBYTES,83,62,117,10, SS_SUNKEN - LTEXT "Espace libre",-1,7,62,36,8 - RTEXT "(Fichiers fragmentÃ©s, nombre)",IDC_FILESFRAGGED,267,62,117, + LTEXT "Espace libre",-1,7,62,75,8 + LTEXT "(Fichiers fragmentÃ©s, nombre)",IDC_FILESFRAGGED,281,62,117, 10,SS_SUNKEN - LTEXT "Fichiers fragmentÃ©s",-1,194,62,52,8 - RTEXT "(Nombre de rÃ©pertoires)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# rÃ©pertoires",-1,194,7,48,8 - RTEXT "SystÃ¨me de fichiers",-1,7,40,36,8 - RTEXT "(Nom du systÃ¨me de fichiers)",IDC_FILESYSTEM,63,40,117,10, + LTEXT "Fichiers fragmentÃ©s",-1,205,62,75,8 + LTEXT "(Nombre de rÃ©pertoires)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# rÃ©pertoires",-1,205,7,75,8 + LTEXT "SystÃ¨me de fichiers",-1,7,40,75,8 + LTEXT "(Nom du systÃ¨me de fichiers)",IDC_FILESYSTEM,83,40,117,10, SS_SUNKEN - RTEXT "Nom du volume",-1,7,18,44,8 - RTEXT "(Nom du volume)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "NumÃ©ro de sÃ©rie",-1,7,29,18,8 - RTEXT "(NumÃ©ro de sÃ©rie du volume)",IDC_VOLUMESERIAL,63,29,117,10, + LTEXT "Nom du volume",-1,7,18,75,8 + LTEXT "(Nom du volume)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "NumÃ©ro de sÃ©rie",-1,7,29,75,8 + LTEXT "(NumÃ©ro de sÃ©rie du volume)",IDC_VOLUMESERIAL,83,29,117,10, SS_SUNKEN - RTEXT "(Fragements par fichier en moyenne)",IDC_AVERAGEFRAGS,267,73,117, + LTEXT "(Fragements par fichier en moyenne)",IDC_AVERAGEFRAGS,281,73,117, 10,SS_SUNKEN - LTEXT "Fragements par fichier en moyenne",-1,194,73,60,20 + LTEXT "Fragements par fichier en moyenne",-1,205,73,75,20 LTEXT "XX.X% des fichiers sur ce lecteur sont fragmentÃ©s. Il est recommandÃ© que vous effectuiez une dÃ©fragmentation.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "Recommandations :",-1,7,96,62,8 + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN + LTEXT "Recommandations :",-1,7,96,75,8 END Modified: trunk/rosapps/applications/fraginator/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/no-NO.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -1,33 +1,33 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_MAIN DIALOGEX 0, 0, 346, 103 +IDD_MAIN DIALOGEX 0, 0, 375, 103 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Start",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "Hjelp",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "Avslutt",IDC_QUIT,294,49,45,15 + PUSHBUTTON "Start",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "Hjelp",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "Avslutt",IDC_QUIT,322,51,45,15 CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "Velg en stasjon:",-1,78,40,50,8 - LTEXT "Velg en handling:",-1,135,40,58,8 + WS_BORDER,7,7,78,58 + LTEXT "Velg en stasjon:",-1,78,40,73,8 + LTEXT "Velg en handling:",-1,159,40,73,8 CONTROL "Prosess1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 + 0x1,7,71,320,10 CONTROL "Statisk",IDC_STATUS,"Statisk",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "Jeg er en ape, hÃ¸r meg eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "Prosess proritet:",-1,223,40,51,8 + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "Jeg er en ape, hÃ¸r meg eeK",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "Prosess proritet:",-1,241,40,73,8 END -IDD_REPORT DIALOGEX 0, 0, 391, 169 +IDD_REPORT DIALOGEX 0, 0, 405, 169 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Rapport" FONT 8, "MS Shell Dlg" @@ -36,49 +36,49 @@ DEFPUSHBUTTON "KB",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "MB",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "GB",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 - RTEXT "Stasjon",-1,7,7,24,8 - LTEXT "Kapasitet",-1,7,51,28,8 - RTEXT "(Stasjon bokstav)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(Disk stÃ¸rrelse, Byte)",IDC_DISKSIZEBYTES,63,51,117,10, + DEFPUSHBUTTON "OK",IDC_REPORTOK,348,148,50,14 + LTEXT "Stasjon",-1,7,7,75,8 + LTEXT "Kapasitet",-1,7,51,75,8 + LTEXT "(Stasjon bokstav)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(Disk stÃ¸rrelse, Byte)",IDC_DISKSIZEBYTES,83,51,117,10, SS_SUNKEN - RTEXT "(Disk stÃ¸rrelse, Cluster)",IDC_DISKSIZECLUSTERS,63,73,117, + LTEXT "(Disk stÃ¸rrelse, Cluster)",IDC_DISKSIZECLUSTERS,83,73,117, 10,SS_SUNKEN - LTEXT "Total clusters",-1,7,73,43,8 - RTEXT "(Cluster stÃ¸rrelse)",IDC_DISKCLUSTERSIZE,63,84,117,10, + LTEXT "Total clusters",-1,7,73,75,8 + LTEXT "(Cluster stÃ¸rrelse)",IDC_DISKCLUSTERSIZE,83,84,117,10, SS_SUNKEN - LTEXT "Cluster stÃ¸rrelse",-1,7,84,36,8 - RTEXT "(Files count)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(Fil stÃ¸rrelse, byte)",IDC_FILESSIZEBYTES,267,29,117,10, + LTEXT "Cluster stÃ¸rrelse",-1,7,84,75,8 + LTEXT "(Files count)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(Fil stÃ¸rrelse, Byte)",IDC_FILESSIZEBYTES,281,29,117,10, SS_SUNKEN - LTEXT "# filer",-1,194,18,28,8 - LTEXT "Total stÃ¸rrelse",-1,194,29,31,8 - LTEXT "diskstÃ¸rrelse",-1,194,40,39,8 - RTEXT "(Total stÃ¸rrelse, byte)",IDC_FILESSIZEONDISK,267,40,117,10, + LTEXT "# filer",-1,205,18,75,8 + LTEXT "Total stÃ¸rrelse",-1,205,29,75,8 + LTEXT "diskstÃ¸rrelse",-1,205,40,75,8 + LTEXT "(Total stÃ¸rrelse, Byte)",IDC_FILESSIZEONDISK,281,40,117,10, SS_SUNKEN - RTEXT "(Fil slack byte)",IDC_FILESSLACKBYTES,267,51,117,10, + LTEXT "(Fil slack Byte)",IDC_FILESSLACKBYTES,281,51,117,10, SS_SUNKEN - LTEXT "Wasted slack",-1,194,51,44,8 - RTEXT "(Ledig plass, Byte)",IDC_DISKFREEBYTES,63,62,117,10, + LTEXT "Wasted slack",-1,205,51,75,8 + LTEXT "(Ledig plass, Byte)",IDC_DISKFREEBYTES,83,62,117,10, SS_SUNKEN - LTEXT "Ledig plass",-1,7,62,36,8 - RTEXT "(Filer fragmentert, count)",IDC_FILESFRAGGED,267,62,117, + LTEXT "Ledig plass",-1,7,62,75,8 + LTEXT "(Filer fragmentert, count)",IDC_FILESFRAGGED,281,62,117, 10,SS_SUNKEN - LTEXT "Fragmenterte filer",-1,194,62,52,8 - RTEXT "(Dirs count)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# mapper",-1,194,7,48,8 - RTEXT "Filsystem",-1,7,40,36,8 - RTEXT "(Filsystem navn)",IDC_FILESYSTEM,63,40,117,10, + LTEXT "Fragmenterte filer",-1,205,62,75,8 + LTEXT "(Dirs count)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# mapper",-1,205,7,75,8 + LTEXT "Filsystem",-1,7,40,75,8 + LTEXT "(Filsystem navn)",IDC_FILESYSTEM,83,40,117,10, SS_SUNKEN - RTEXT "Volume Label",-1,7,18,44,8 - RTEXT "(Stasjon navn)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "Serial",-1,7,29,18,8 - RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, + LTEXT "Volume Label",-1,7,18,75,8 + LTEXT "(Stasjon navn)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "Serial",-1,7,29,75,8 + LTEXT "(Volume Serial)",IDC_VOLUMESERIAL,83,29,117,10, SS_SUNKEN - RTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,267,73,117, + LTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,281,73,117, 10,SS_SUNKEN - LTEXT "Average fragments per file",-1,194,73,60,20 + LTEXT "Average fragments per file",-1,205,73,75,20 LTEXT "XX.X% av disse filene pÃ¥ denne stasjonen er fragmentert. Det er anbefalt at du utfÃ¸rer en SSSSSSS defragmentasjon.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN LTEXT "Anbefalinger:",-1,7,96,62,8 END Modified: trunk/rosapps/applications/fraginator/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/ro-RO.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -1,33 +1,33 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_MAIN DIALOGEX 0, 0, 346, 103 +IDD_MAIN DIALOGEX 0, 0, 375, 103 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Pornire",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "Manual",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "I&eÈire",IDC_QUIT,294,49,45,15 + PUSHBUTTON "Pornire",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "Manual",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "I&eÈire",IDC_QUIT,322,51,45,15 CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "AlegeÈi o unitate:",-1,78,40,50,8 - LTEXT "AlegeÈi o acÈiune:",-1,135,40,58,8 + WS_BORDER,7,7,78,58 + LTEXT "AlegeÈi o unitate:",-1,78,40,73,8 + LTEXT "AlegeÈi o acÈiune:",-1,159,40,73,8 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 + 0x1,7,71,320,10 CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "Prioritate proces:",-1,223,40,51,8 + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "Prioritate proces:",-1,241,40,73,8 END -IDD_REPORT DIALOGEX 0, 0, 391, 169 +IDD_REPORT DIALOGEX 0, 0, 405, 169 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Raport" FONT 8, "MS Shell Dlg" @@ -36,49 +36,49 @@ DEFPUSHBUTTON "kiloocteÈi",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "MegaocteÈi",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "GigaocteÈi",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "Ã&nchide",IDC_REPORTOK,334,148,50,14 - RTEXT "Volum",-1,7,7,24,8 - LTEXT "Capacitate",-1,7,51,28,8 - RTEXT "(literÄ dispozitiv)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(mÄrime disc, octeÈi)",IDC_DISKSIZEBYTES,63,51,117,10, + DEFPUSHBUTTON "Ã&nchide",IDC_REPORTOK,348,148,50,14 + LTEXT "Volum",-1,7,7,75,8 + LTEXT "Capacitate",-1,7,51,75,8 + LTEXT "(literÄ dispozitiv)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(mÄrime disc, octeÈi)",IDC_DISKSIZEBYTES,83,51,117,10, SS_SUNKEN - RTEXT "(mÄrime disc, cluster-i)",IDC_DISKSIZECLUSTERS,63,73,117, + LTEXT "(mÄrime disc, cluster-i)",IDC_DISKSIZECLUSTERS,83,73,117, 10,SS_SUNKEN - LTEXT "Total cluster-i",-1,7,73,43,8 - RTEXT "(mÄrime cluster)",IDC_DISKCLUSTERSIZE,63,84,117,10, + LTEXT "Total cluster-i",-1,7,73,75,8 + LTEXT "(mÄrime cluster)",IDC_DISKCLUSTERSIZE,83,84,117,10, SS_SUNKEN - LTEXT "Dimensiune cluster",-1,7,84,36,8 - RTEXT "(numÄr fiÈiere)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(mÄrime fiÈiere, octeÈi)",IDC_FILESSIZEBYTES,267,29,117,10, + LTEXT "Dimensiune cluster",-1,7,84,75,8 + LTEXT "(numÄr fiÈiere)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(mÄrime fiÈiere, octeÈi)",IDC_FILESSIZEBYTES,281,29,117,10, SS_SUNKEN - LTEXT "# de fiÈiere",-1,194,18,28,8 - LTEXT "MÄrime Ã®n total",-1,194,29,31,8 - LTEXT "MÄrime pe disc",-1,194,40,39,8 - RTEXT "(mÄrime Ã®n total, octeÈi)",IDC_FILESSIZEONDISK,267,40,117,10, + LTEXT "# de fiÈiere",-1,205,18,75,8 + LTEXT "MÄrime Ã®n total",-1,205,29,75,8 + LTEXT "MÄrime pe disc",-1,205,40,75,8 + LTEXT "(mÄrime Ã®n total, octeÈi)",IDC_FILESSIZEONDISK,281,40,117,10, SS_SUNKEN - RTEXT "(fiÈiere octeÈi latenÈi)",IDC_FILESSLACKBYTES,267,51,117,10, + LTEXT "(fiÈiere octeÈi latenÈi)",IDC_FILESSLACKBYTES,281,51,117,10, SS_SUNKEN - LTEXT "RisipÄ latenÈe",-1,194,51,44,8 - RTEXT "(liber pe disc, octeÈi)",IDC_DISKFREEBYTES,63,62,117,10, + LTEXT "RisipÄ latenÈe",-1,205,51,75,8 + LTEXT "(liber pe disc, octeÈi)",IDC_DISKFREEBYTES,83,62,117,10, SS_SUNKEN - LTEXT "SpaÈiu liber",-1,7,62,36,8 - RTEXT "(firÈiere fragmentate, numÄrate)",IDC_FILESFRAGGED,267,62,117, + LTEXT "SpaÈiu liber",-1,7,62,75,8 + LTEXT "(firÈiere fragmentate, numÄrate)",IDC_FILESFRAGGED,281,62,117, 10,SS_SUNKEN - LTEXT "FiÈiere fragmentate",-1,194,62,52,8 - RTEXT "(directoare numÄrate)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# de directoare",-1,194,7,48,8 - RTEXT "Sistem de fiÈiere",-1,7,40,36,8 - RTEXT "(Numele sistemului de fiÈiere)",IDC_FILESYSTEM,63,40,117,10, + LTEXT "FiÈiere fragmentate",-1,205,62,75,8 + LTEXT "(directoare numÄrate)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# de directoare",-1,205,7,75,8 + LTEXT "Sistem de fiÈiere",-1,7,40,75,8 + LTEXT "(Numele sistemului de fiÈiere)",IDC_FILESYSTEM,83,40,117,10, SS_SUNKEN - RTEXT "EtichetÄ volum",-1,7,18,44,8 - RTEXT "(nume volum)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "Serie",-1,7,29,18,8 - RTEXT "(serie volum)",IDC_VOLUMESERIAL,63,29,117,10, + LTEXT "EtichetÄ volum",-1,7,18,75,8 + LTEXT "(nume volum)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "Serie",-1,7,29,75,8 + LTEXT "(serie volum)",IDC_VOLUMESERIAL,83,29,117,10, SS_SUNKEN - RTEXT "(medie fragmete per fiÈier)",IDC_AVERAGEFRAGS,267,73,117, + LTEXT "(medie fragmete per fiÈier)",IDC_AVERAGEFRAGS,281,73,117, 10,SS_SUNKEN - LTEXT "Media fragmentelor per fiÈier",-1,194,73,60,20 + LTEXT "Media fragmentelor per fiÈier",-1,205,73,75,20 LTEXT "XX.X% din fiÈierele dispozitivului sunt fragmentate. Este recomandatÄ efectuarea unei defragmentÄri SSSSSSS.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "RecomandÄri:",-1,7,96,62,8 + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN + LTEXT "RecomandÄri:",-1,7,96,75,8 END Modified: trunk/rosapps/applications/fraginator/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/sk-SK.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -1,37 +1,37 @@ /* TRANSLATOR : MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 04-09-2008 + * DATE OF TR.: 04-09-2058 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_MAIN DIALOGEX 0, 0, 346, 103 +IDD_MAIN DIALOGEX 0, 0, 375, 103 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ZaÄaÅ¥",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "PomocnÃk",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "UkonÄiÅ¥",IDC_QUIT,294,49,45,15 + PUSHBUTTON "ZaÄaÅ¥",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "PomocnÃk",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "UkonÄiÅ¥",IDC_QUIT,322,51,45,15 CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "Vyberte jednotku:",-1,78,40,50,8 - LTEXT "Vyberte akciu:",-1,135,40,58,8 + WS_BORDER,7,7,78,58 + LTEXT "Vyberte jednotku:",-1,78,40,73,8 + LTEXT "Vyberte akciu:",-1,159,40,73,8 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 + 0x1,7,71,320,10 CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "Priorita procesu:",-1,223,40,51,8 + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "Priorita procesu:",-1,241,40,73,8 END -IDD_REPORT DIALOGEX 0, 0, 391, 169 +IDD_REPORT DIALOGEX 0, 0, 405, 169 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "HlÃ¡senie" //Report FONT 8, "MS Shell Dlg" @@ -40,49 +40,49 @@ DEFPUSHBUTTON "Kilobajty",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "Megabajty",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "Gigabajty",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 - RTEXT "MÃ©dium",-1,7,7,24,8 //Volume - LTEXT "Kapacita",-1,7,51,28,8 - RTEXT "(PÃsmeno jednotky)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(VeÄ¾kosÅ¥ disku, bajty)",IDC_DISKSIZEBYTES,63,51,117,10, + DEFPUSHBUTTON "OK",IDC_REPORTOK,348,148,50,14 + LTEXT "MÃ©dium",-1,7,7,75,8 //Volume + LTEXT "Kapacita",-1,7,51,75,8 + LTEXT "(PÃsmeno jednotky)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(VeÄ¾kosÅ¥ disku, bajty)",IDC_DISKSIZEBYTES,83,51,117,10, SS_SUNKEN - RTEXT "(VeÄ¾kosÅ¥ disku, klastre)",IDC_DISKSIZECLUSTERS,63,73,117, + LTEXT "(VeÄ¾kosÅ¥ disku, klastre)",IDC_DISKSIZECLUSTERS,83,73,117, 10,SS_SUNKEN - LTEXT "Klastrov spolu",-1,7,73,43,8 //Total clusters, SÃºÄet klastrov, Klastrov celkom - RTEXT "(VeÄ¾kosÅ¥ klastra)",IDC_DISKCLUSTERSIZE,63,84,117,10, + LTEXT "Klastrov spolu",-1,7,73,75,8 //Total clusters, SÃºÄet klastrov, Klastrov celkom + LTEXT "(VeÄ¾kosÅ¥ klastra)",IDC_DISKCLUSTERSIZE,83,84,117,10, SS_SUNKEN - LTEXT "VeÄ¾kosÅ¥ klastra",-1,7,84,36,8 - RTEXT "(PoÄeÅ¥ sÃºborov)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(PoÄeÅ¥ sÃºborov, bajty)",IDC_FILESSIZEBYTES,267,29,117,10, + LTEXT "VeÄ¾kosÅ¥ klastra",-1,7,84,75,8 + LTEXT "(PoÄeÅ¥ sÃºborov)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(PoÄeÅ¥ sÃºborov, bajty)",IDC_FILESSIZEBYTES,281,29,117,10, SS_SUNKEN - LTEXT "# sÃºborov",-1,194,18,28,8 - LTEXT "CelkovÃ¡ veÄ¾kosÅ¥",-1,194,29,31,8 - LTEXT "VeÄ¾kosÅ¥ disku",-1,194,40,39,8 - RTEXT "(CelkovÃ¡ veÄ¾kosÅ¥, bajty)",IDC_FILESSIZEONDISK,267,40,117,10, + LTEXT "# sÃºborov",-1,205,18,75,8 + LTEXT "CelkovÃ¡ veÄ¾kosÅ¥",-1,205,29,75,8 + LTEXT "VeÄ¾kosÅ¥ disku",-1,205,40,75,8 + LTEXT "(CelkovÃ¡ veÄ¾kosÅ¥, bajty)",IDC_FILESSIZEONDISK,281,40,117,10, SS_SUNKEN - RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + LTEXT "(Files slack Bytes)",IDC_FILESSLACKBYTES,281,51,117,10, SS_SUNKEN - LTEXT "Wasted slack",-1,194,51,44,8 - RTEXT "(Disk Free, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + LTEXT "Wasted slack",-1,205,51,75,8 + LTEXT "(Disk Free, Bytes)",IDC_DISKFREEBYTES,83,62,117,10, SS_SUNKEN - LTEXT "VoÄ¾nÃ© miesto",-1,7,62,36,8 - RTEXT "(FragmentovanÃ© sÃºbory, poÄet)",IDC_FILESFRAGGED,267,62,117, + LTEXT "VoÄ¾nÃ© miesto",-1,7,62,75,8 + LTEXT "(FragmentovanÃ© sÃºbory, poÄet)",IDC_FILESFRAGGED,281,62,117, 10,SS_SUNKEN - LTEXT "FragmentovanÃ© sÃºbory",-1,194,62,52,8 - RTEXT "(PoÄet adresÃ¡rov)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# adresÃ¡rov",-1,194,7,48,8 - RTEXT "SystÃ©m sÃºborov",-1,7,40,36,8 - RTEXT "(NÃ¡zov systÃ©mu sÃºborov)",IDC_FILESYSTEM,63,40,117,10, + LTEXT "FragmentovanÃ© sÃºbory",-1,205,62,75,8 + LTEXT "(PoÄet adresÃ¡rov)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# adresÃ¡rov",-1,205,7,75,8 + LTEXT "SystÃ©m sÃºborov",-1,7,40,75,8 + LTEXT "(NÃ¡zov systÃ©mu sÃºborov)",IDC_FILESYSTEM,83,40,117,10, SS_SUNKEN - RTEXT "Volume Label",-1,7,18,44,8 - RTEXT "(Volume Name)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "Serial",-1,7,29,18,8 - RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, + LTEXT "Volume Label",-1,7,18,75,8 + LTEXT "(Volume Name)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "Serial",-1,7,29,75,8 + LTEXT "(Volume Serial)",IDC_VOLUMESERIAL,83,29,117,10, SS_SUNKEN - RTEXT "(Priemerne fragmentov na sÃºbor)",IDC_AVERAGEFRAGS,267,73,117, + LTEXT "(Priemerne fragmentov na sÃºbor)",IDC_AVERAGEFRAGS,281,73,117, 10,SS_SUNKEN - LTEXT "Priemerne fragmentov na sÃºbor",-1,194,73,60,20 + LTEXT "Priemerne fragmentov na sÃºbor",-1,205,73,75,20 LTEXT "XX.X% sÃºborov na tejto jednotke je fragmentovanÃ½ch. OdporÃºÄa sa, aby ste vykonali SSSSSSS defragmentÃ¡ciu.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "OdporÃºÄania:",-1,7,96,62,8 + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN + LTEXT "OdporÃºÄania:",-1,7,96,75,8 END Modified: trunk/rosapps/applications/fraginator/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/uk-UA.rc [iso-8859-1] Mon Apr 20 00:08:02 2015 @@ -1,33 +1,33 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_MAIN DIALOGEX 0, 0, 346, 103 +IDD_MAIN DIALOGEX 0, 0, 375, 103 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + COMBOBOX IDC_METHODS_LIST,159,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + COMBOBOX IDC_PRIORITY_LIST,241,52,73,111,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ð¡ÑÐ°ÑÑ",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "ÐÐ¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "ÐÐ¸ÑÑÐ´",IDC_QUIT,294,49,45,15 + PUSHBUTTON "Ð¡ÑÐ°ÑÑ",IDC_STARTSTOP,322,7,45,15 + PUSHBUTTON "ÐÐ¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°",ID_MAIN_HELP,322,29,45,15 + PUSHBUTTON "ÐÐ¸ÑÑÐ´",IDC_QUIT,322,51,45,15 CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð´Ð¸ÑÐº:",-1,78,40,50,8 - LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð´ÑÑ:",-1,135,40,58,8 + WS_BORDER,7,7,78,58 + LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð´Ð¸ÑÐº:",-1,78,40,73,8 + LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð´ÑÑ:",-1,159,40,73,8 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 + 0x1,7,71,320,10 CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "ÐÑÑÐ¾ÑÐ¸ÑÐµÑ ÐÑÐ¾ÑÐµÑÑ:",-1,223,40,51,8 + SS_SUNKEN | WS_GROUP,7,86,359,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,115,8 + LTEXT "100.00%",IDC_PERCENT,337,71,30,8,0,WS_EX_RIGHT + LTEXT "ÐÑÑÐ¾ÑÐ¸ÑÐµÑ ÐÑÐ¾ÑÐµÑÑ:",-1,241,40,73,8 END -IDD_REPORT DIALOGEX 0, 0, 391, 169 +IDD_REPORT DIALOGEX 0, 0, 405, 169 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Ð Ð°Ð¿Ð¾ÑÑ" FONT 8, "MS Shell Dlg" @@ -36,49 +36,49 @@ DEFPUSHBUTTON "ÐÑÐ»Ð¾Ð±Ð°Ð¹Ñ",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "ÐÐµÐ³Ð°Ð±Ð°Ð¹Ñ",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "ÐÑÐ³Ð°Ð±Ð°Ð¹Ñ",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "Ð¢Ð°Ðº",IDC_REPORTOK,334,148,50,14 - RTEXT "Ð¢Ð¾Ð¼",-1,7,7,24,8 - LTEXT "ÐÐ±'ÑÐ¼",-1,7,51,28,8 - RTEXT "(ÐÑÐºÐ²Ð° ÐÐ¸ÑÐºÑ)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(Ð Ð¾Ð·Ð¼ÑÑ ÐÐ¸ÑÐºÑ, ÐÐ°Ð¹ÑÑÐ²)",IDC_DISKSIZEBYTES,63,51,117,10, + DEFPUSHBUTTON "Ð¢Ð°Ðº",IDC_REPORTOK,348,148,50,14 + LTEXT "Ð¢Ð¾Ð¼",-1,7,7,75,8 + LTEXT "ÐÐ±'ÑÐ¼",-1,7,51,75,8 + LTEXT "(ÐÑÐºÐ²Ð° ÐÐ¸ÑÐºÑ)",IDC_DRIVELETTER,83,7,117,10,SS_SUNKEN + LTEXT "(Ð Ð¾Ð·Ð¼ÑÑ ÐÐ¸ÑÐºÑ, ÐÐ°Ð¹ÑÑÐ²)",IDC_DISKSIZEBYTES,83,51,117,10, SS_SUNKEN - RTEXT "(Ð Ð¾Ð·Ð¼ÑÑ Ð´Ð¸ÑÐºÑ, ÐÐ»Ð°ÑÑÐµÑÑÐ²)",IDC_DISKSIZECLUSTERS,63,73,117, + LTEXT "(Ð Ð¾Ð·Ð¼ÑÑ Ð´Ð¸ÑÐºÑ, ÐÐ»Ð°ÑÑÐµÑÑÐ²)",IDC_DISKSIZECLUSTERS,83,73,117, 10,SS_SUNKEN - LTEXT "ÐÑÑÐ¾Ð³Ð¾ ÐºÐ»Ð°ÑÑÐµÑÑÐ²",-1,7,73,43,8 - RTEXT "(Ð Ð¾Ð·Ð¼ÑÑ ÐºÐ»Ð°ÑÑÐµÑÐ°)",IDC_DISKCLUSTERSIZE,63,84,117,10, + LTEXT "ÐÑÑÐ¾Ð³Ð¾ ÐºÐ»Ð°ÑÑÐµÑÑÐ²",-1,7,73,75,8 + LTEXT "(Ð Ð¾Ð·Ð¼ÑÑ ÐºÐ»Ð°ÑÑÐµÑÐ°)",IDC_DISKCLUSTERSIZE,83,84,117,10, SS_SUNKEN - LTEXT "Ð Ð¾Ð·Ð¼ÑÑ ÐºÐ»Ð°ÑÑÐµÑÐ°",-1,7,84,36,8 - RTEXT "(ÐÑÐ»Ñ-ÑÑÑ ÑÐ°Ð¹Ð»ÑÐ²)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(Ð Ð¾Ð·Ð¼ÑÑ ÑÐ°Ð¹Ð»ÑÐ², Ð±Ð°Ð¹ÑÑÐ²)",IDC_FILESSIZEBYTES,267,29,117,10, + LTEXT "Ð Ð¾Ð·Ð¼ÑÑ ÐºÐ»Ð°ÑÑÐµÑÐ°",-1,7,84,75,8 + LTEXT "(ÐÑÐ»Ñ-ÑÑÑ ÑÐ°Ð¹Ð»ÑÐ²)",IDC_FILESCOUNT,281,18,117,10,SS_SUNKEN + LTEXT "(Ð Ð¾Ð·Ð¼ÑÑ ÑÐ°Ð¹Ð»ÑÐ², Ð±Ð°Ð¹ÑÑÐ²)",IDC_FILESSIZEBYTES,281,29,117,10, SS_SUNKEN - LTEXT "# ÑÐ°Ð¹Ð»ÑÐ²",-1,194,18,28,8 - LTEXT "ÐÐ°Ð³Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ",-1,194,29,31,8 - LTEXT "Ð Ð¾Ð·Ð¼ÑÑ Ð½Ð° Ð´Ð¸ÑÐºÑ",-1,194,40,39,8 - RTEXT "(ÐÐ°Ð³Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ, Ð±Ð°Ð¹ÑÑÐ²)",IDC_FILESSIZEONDISK,267,40,117,10, + LTEXT "# ÑÐ°Ð¹Ð»ÑÐ²",-1,205,18,75,8 + LTEXT "ÐÐ°Ð³Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ",-1,205,29,75,8 + LTEXT "Ð Ð¾Ð·Ð¼ÑÑ Ð½Ð° Ð´Ð¸ÑÐºÑ",-1,205,40,75,8 + LTEXT "(ÐÐ°Ð³Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ, Ð±Ð°Ð¹ÑÑÐ²)",IDC_FILESSIZEONDISK,281,40,117,10, SS_SUNKEN - RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + LTEXT "(Files slack Bytes)",IDC_FILESSLACKBYTES,281,51,117,10, SS_SUNKEN - LTEXT "Wasted slack",-1,194,51,44,8 - RTEXT "(Disk Free, ÐÐ°Ð¹ÑÑÐ²)",IDC_DISKFREEBYTES,63,62,117,10, + LTEXT "Wasted slack",-1,205,51,75,8 + LTEXT "(Disk Free, ÐÐ°Ð¹ÑÑÐ²)",IDC_DISKFREEBYTES,83,62,117,10, SS_SUNKEN - LTEXT "ÐÑÐ»ÑÐ½Ðµ Ð¼ÑÑÑÐµ",-1,7,62,36,8 - RTEXT "(Ð¤ÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¾Ð²Ð°Ð½Ñ ÑÐ°Ð¹Ð»Ð¸, ÐºÑÐ»ÑÐºÑÑÑÑ)",IDC_FILESFRAGGED,267,62,117, + LTEXT "ÐÑÐ»ÑÐ½Ðµ Ð¼ÑÑÑÐµ",-1,7,62,75,8 + LTEXT "(Ð¤ÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¾Ð²Ð°Ð½Ñ ÑÐ°Ð¹Ð»Ð¸, ÐºÑÐ»ÑÐºÑÑÑÑ)",IDC_FILESFRAGGED,281,62,117, 10,SS_SUNKEN - LTEXT "Ð¤ÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¾Ð²Ð°Ð½Ñ ÑÐ°Ð¹Ð»Ð¸",-1,194,62,52,8 - RTEXT "(ÐÑÐ»Ñ-ÑÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÐ¹)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÐ¹",-1,194,7,48,8 - RTEXT "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð° Ð¡Ð¸ÑÑÐµÐ¼Ð°",-1,7,40,36,8 - RTEXT "(ÐÐ°Ð·Ð²Ð° Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð¾Ñ Ð¡Ð¸ÑÑÐµÐ¼Ð¸)",IDC_FILESYSTEM,63,40,117,10, + LTEXT "Ð¤ÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¾Ð²Ð°Ð½Ñ ÑÐ°Ð¹Ð»Ð¸",-1,205,62,75,8 + LTEXT "(ÐÑÐ»Ñ-ÑÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÐ¹)",IDC_DIRSCOUNT,281,7,117,10,SS_SUNKEN + LTEXT "# Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÐ¹",-1,205,7,75,8 + LTEXT "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð° Ð¡Ð¸ÑÑÐµÐ¼Ð°",-1,7,40,75,8 + LTEXT "(ÐÐ°Ð·Ð²Ð° Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð¾Ñ Ð¡Ð¸ÑÑÐµÐ¼Ð¸)",IDC_FILESYSTEM,83,40,117,10, SS_SUNKEN - RTEXT "ÐÑÑÐºÐ° Ð¢Ð¾Ð¼Ñ",-1,7,18,44,8 - RTEXT "(ÐÐ°Ð·Ð²Ð° Ð¢Ð¾Ð¼Ñ)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "Serial",-1,7,29,18,8 - RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, + LTEXT "ÐÑÑÐºÐ° Ð¢Ð¾Ð¼Ñ",-1,7,18,75,8 + LTEXT "(ÐÐ°Ð·Ð²Ð° Ð¢Ð¾Ð¼Ñ)",IDC_VOLUMELABEL,83,18,117,10,SS_SUNKEN + LTEXT "Serial",-1,7,29,75,8 + LTEXT "(Volume Serial)",IDC_VOLUMESERIAL,83,29,117,10, SS_SUNKEN - RTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,267,73,117, + LTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,281,73,117, 10,SS_SUNKEN - LTEXT "Ð¤ÑÐ°Ð³Ð¼ÐµÑÐ½ÑÐ² Ð² ÑÐ°Ð¹Ð»Ñ Ð² ÑÐµÑÐµÐ´Ð½ÑÐ¾Ð¼Ñ",-1,194,73,60,20 + LTEXT "Ð¤ÑÐ°Ð³Ð¼ÐµÑÐ½ÑÐ² Ð² ÑÐ°Ð¹Ð»Ñ Ð² ÑÐµÑÐµÐ´Ð½ÑÐ¾Ð¼Ñ",-1,205,73,75,20 LTEXT "XX.X% ÑÐ°Ð¹Ð»ÑÐ² Ð½Ð° ÑÑÐ¾Ð¼Ñ Ð´Ð¸ÑÐºÑ ÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¾Ð²Ð°Ð½Ñ. ÐÐ°Ð¶Ð°Ð½Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÑÐ¸ SSSSSSS Ð´ÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÑÑ.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð°ÑÑÑ:",-1,7,96,62,8 + IDC_RECOMMEND,7,106,391,38,SS_SUNKEN + LTEXT "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð°ÑÑÑ:",-1,7,96,75,8 END

1 0

[tfaber] 67318: [IPCONFIG] - Add missing newlines
by tfaber＠svn.reactos.org 20 Apr '15

20 Apr '15

Author: tfaber Date: Mon Apr 20 00:03:34 2015 New Revision: 67318 URL: http://svn.reactos.org/svn/reactos?rev=67318&view=rev Log: [IPCONFIG] - Add missing newlines Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Mon Apr 20 00:03:34 2015 @@ -542,8 +542,8 @@ if (pAdapter->DhcpEnabled) { - _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained))); - _tprintf(_T("\tLease Expires . . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseExpires))); + _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s\n"), _tasctime(localtime(&pAdapter->LeaseObtained))); + _tprintf(_T("\tLease Expires . . . . . . . . . . : %s\n"), _tasctime(localtime(&pAdapter->LeaseExpires))); } } _tprintf(_T("\n"));

1 0

[aandrejevic] 67317: [FAST486] Implement the 287-only instructions FSETPM and FRSTPM as nops. (This is how the 487 is supposed to treat them.)
by aandrejevic＠svn.reactos.org 19 Apr '15

19 Apr '15

Author: aandrejevic Date: Sun Apr 19 23:11:07 2015 New Revision: 67317 URL: http://svn.reactos.org/svn/reactos?rev=67317&view=rev Log: [FAST486] Implement the 287-only instructions FSETPM and FRSTPM as nops. (This is how the 487 is supposed to treat them.) Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6731… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun Apr 19 23:11:07 2015 @@ -1988,6 +1988,10 @@ case 0x20: /* FDISI */ case 0x21: + /* FSETPM */ + case 0x24: + /* FRSTPM */ + case 0x25: { /* These do nothing */ break;

1 0

[tfaber] 67316: [NETSHELL][COM_APITEST] - Remove another MessageBox... - Also test some more interfaces found in netshell classes
by tfaber＠svn.reactos.org 19 Apr '15

19 Apr '15

Author: tfaber Date: Sun Apr 19 22:50:25 2015 New Revision: 67316 URL: http://svn.reactos.org/svn/reactos?rev=67316&view=rev Log: [NETSHELL][COM_APITEST] - Remove another MessageBox... - Also test some more interfaces found in netshell classes Added: trunk/rostests/apitests/com/netcfgx.c (with props) Modified: trunk/reactos/dll/shellext/netshell/lanconnectui.cpp trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp trunk/rostests/apitests/com/CMakeLists.txt trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/netshell.c trunk/rostests/apitests/com/shdocvw.c trunk/rostests/apitests/com/testlist.c Modified: trunk/reactos/dll/shellext/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lanc… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lanconnectui.cpp [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -25,9 +25,9 @@ } NET_ITEM, *PNET_ITEM; class CNetConnectionPropertyUi final : + public INetConnectionConnectUi, public INetConnectionPropertyUi2, - public INetLanConnectionUiInfo, - public INetConnectionConnectUi + public INetLanConnectionUiInfo { public: CNetConnectionPropertyUi(); @@ -522,7 +522,6 @@ REFIID iid, LPVOID *ppvObj) { - LPOLESTR pStr; *ppvObj = NULL; if (IsEqualIID (iid, IID_IUnknown) || @@ -546,9 +545,6 @@ return S_OK; } - StringFromCLSID((CLSID)iid, &pStr); - MessageBoxW(NULL, pStr, L"INetConnectionPropertyUi_fnQueryInterface", MB_OK); - CoTaskMemFree(pStr); return E_NOINTERFACE; } Modified: trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/shfl… ============================================================================== --- trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -706,9 +706,6 @@ return S_OK; } - //LPOLESTR pStr; - //StringFromCLSID(iid, &pStr); - //MessageBoxW(NULL, L"ISF_NetConnect_IContextMenu2_QueryInterface unhandled", pStr, MB_OK); return E_NOINTERFACE; } Modified: trunk/rostests/apitests/com/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -4,6 +4,7 @@ list(APPEND SOURCE browseui.c ieframe.c + netcfgx.c netshell.c shdocvw.c shell32.c Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -110,6 +110,9 @@ { ID_NAME(IID_IEnumExtraSearch) }, { ID_NAME(IID_IEnumGUID) }, { ID_NAME(IID_IEnumIDList) }, + //{ ID_NAME(IID_IEnumNetCfgBindingInterface) }, + //{ ID_NAME(IID_IEnumNetCfgBindingPath) }, + { ID_NAME(IID_IEnumNetCfgComponent), TRUE }, { ID_NAME(IID_IEnumNetConnection) }, { ID_NAME(IID_IEnumShellItems) }, { ID_NAME(IID_IEnumString) }, @@ -155,10 +158,20 @@ { ID_NAME(IID_IMultiQI), TRUE }, { ID_NAME(IID_INamespaceProxy), TRUE }, { ID_NAME(IID_INameSpaceTreeControl), TRUE }, + { ID_NAME(IID_INetCfg), TRUE }, + //{ ID_NAME(IID_INetCfgBindingInterface) }, + //{ ID_NAME(IID_INetCfgBindingPath) }, + { ID_NAME(IID_INetCfgComponent), TRUE }, + { ID_NAME(IID_INetCfgComponentBindings), TRUE }, + { ID_NAME(IID_INetCfgComponentControl), TRUE }, + { ID_NAME(IID_INetCfgComponentPropertyUi), TRUE }, + { ID_NAME(IID_INetCfgLock), TRUE }, + { ID_NAME(IID_INetCfgPnpReconfigCallback), TRUE }, { ID_NAME(IID_INetConnectionConnectUi), TRUE }, { ID_NAME(IID_INetConnectionPropertyUi), TRUE }, { ID_NAME(IID_INetConnectionPropertyUi2), TRUE }, { ID_NAME(IID_INetConnectionManager) }, + { ID_NAME(IID_INetLanConnectionUiInfo), TRUE }, { ID_NAME(IID_INewShortcutHookA), TRUE }, { ID_NAME(IID_INewShortcutHookW), TRUE }, { ID_NAME(IID_INSCTree), TRUE }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -24,6 +24,8 @@ #include <oleacc.h> #include <oaidl.h> #include <netcon.h> +#include <netcfgx.h> +#include <netcfgn.h> #include <mshtmhst.h> #include <perhist.h> #include <shlguid.h> Added: trunk/rostests/apitests/com/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/netcfgx.c?re… ============================================================================== --- trunk/rostests/apitests/com/netcfgx.c (added) +++ trunk/rostests/apitests/com/netcfgx.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: COM interface test for netcfgx classes + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_CNetCfg), + { + { 0x0, &IID_INetCfg }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetCfgLock }, + { 0x10, &IID_INetCfgPnpReconfigCallback }, + }, + L"Both" + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(netcfgx) +{ + TestClasses(L"netcfgx", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/netcfgx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/com/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/netshell.c?r… ============================================================================== --- trunk/rostests/apitests/com/netshell.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/netshell.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -103,6 +103,7 @@ { 0x0, &IID_IUnknown }, { 0x4, &IID_INetConnectionPropertyUi2 }, { 0x4, &IID_INetConnectionPropertyUi }, + { 0x10, &IID_INetLanConnectionUiInfo }, }, L"Both" }, Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -12,6 +12,27 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { + { + ID_NAME(CLSID_AdminFolderShortcut), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder3 }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IShellLinkA }, + { 0xc, &IID_IShellLinkW }, + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IExtractIconW }, + { 0x18, &IID_IQueryInfo }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersistStreamInit }, + { 0x24, &IID_IPersistPropertyBag }, + { 0x28, &IID_IBrowserFrameOptions }, + } + }, { ID_NAME(CLSID_ExplorerBand), { Modified: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -6,6 +6,7 @@ extern void func_browseui(void); extern void func_ieframe(void); extern void func_interfaces(void); +extern void func_netcfgx(void); extern void func_netshell(void); extern void func_shdocvw(void); extern void func_shell32(void); @@ -15,6 +16,7 @@ { "browseui", func_browseui }, { "ieframe", func_ieframe }, { "interfaces", func_interfaces }, + { "netcfgx", func_netcfgx }, { "netshell", func_netshell }, { "shdocvw", func_shdocvw }, { "shell32", func_shell32 },

1 0

[aandrejevic] 67315: [FAST486] Clear the CF and OF flags in AND, OR and XOR.
by aandrejevic＠svn.reactos.org 19 Apr '15

19 Apr '15

Author: aandrejevic Date: Sun Apr 19 22:34:12 2015 New Revision: 67315 URL: http://svn.reactos.org/svn/reactos?rev=67315&view=rev Log: [FAST486] Clear the CF and OF flags in AND, OR and XOR. Modified: trunk/reactos/lib/fast486/opgroups.c Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Sun Apr 19 22:34:12 2015 @@ -70,6 +70,7 @@ case 1: { Result = FirstValue | SecondValue; + State->Flags.Cf = State->Flags.Of = FALSE; break; } @@ -112,6 +113,7 @@ case 4: { Result = FirstValue & SecondValue; + State->Flags.Cf = State->Flags.Of = FALSE; break; } @@ -134,6 +136,7 @@ case 6: { Result = FirstValue ^ SecondValue; + State->Flags.Cf = State->Flags.Of = FALSE; break; }

1 0

[tfaber] 67314: [NETSHELL] - Do not display a message box in CLanStatus::QueryInterface. Fixes hang when running com_apitest:netshell - Change the order of some interfaces in CNetworkConnections to...
by tfaber＠svn.reactos.org 19 Apr '15

19 Apr '15

Author: tfaber Date: Sun Apr 19 22:16:34 2015 New Revision: 67314 URL: http://svn.reactos.org/svn/reactos?rev=67314&view=rev Log: [NETSHELL] - Do not display a message box in CLanStatus::QueryInterface. Fixes hang when running com_apitest:netshell - Change the order of some interfaces in CNetworkConnections to make com_apitest slightly happier Modified: trunk/reactos/dll/shellext/netshell/lanstatusui.cpp trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp Modified: trunk/reactos/dll/shellext/netshell/lanstatusui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lans… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] Sun Apr 19 22:16:34 2015 @@ -1132,7 +1132,7 @@ AddRef(); return S_OK; } - MessageBoxW(NULL, L"IOleCommandTarget_fnQueryInterface", NULL, MB_OK); + return E_NOINTERFACE; } Modified: trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/shfl… ============================================================================== --- trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] Sun Apr 19 22:16:34 2015 @@ -27,8 +27,8 @@ */ class CNetworkConnections final : + public IPersistFolder2, public IShellFolder2, - public IPersistFolder2, public IShellExecuteHookW { public: @@ -170,26 +170,22 @@ *ppvObj = NULL; if (IsEqualIID(riid, IID_IUnknown) || - IsEqualIID(riid, IID_IShellFolder) || - IsEqualIID(riid, IID_IShellFolder2)) + IsEqualIID (riid, IID_IPersist) || + IsEqualIID (riid, IID_IPersistFolder) || + IsEqualIID (riid, IID_IPersistFolder2)) + { + *ppvObj = static_cast<IPersistFolder2*>(this); + } + else if (IsEqualIID(riid, IID_IShellFolder) || + IsEqualIID(riid, IID_IShellFolder2)) { *ppvObj = static_cast<IShellFolder2*>(this); } - else if (IsEqualIID (riid, IID_IPersistFolder) || - IsEqualIID (riid, IID_IPersistFolder2)) - { - *ppvObj = static_cast<IPersistFolder2*>(this); - } else if (IsEqualIID(riid, IID_IShellExecuteHookW)) { *ppvObj = static_cast<IShellExecuteHookW*>(this); } -#if 0 - else if (IsEqualIID(riid, IID_IPersistIDList)) - { - //*ppvObj = static_cast<IPersistIDList*>(this); - } -#endif + if (*ppvObj) { AddRef(); @@ -197,11 +193,9 @@ } /* TODO: - * IID_IPersistFreeThreadedObject - * IID_IBrowserFrameOptions - * IID_IShellIconOverlay - * IID_IPersistIDList - * IID_IPersist + * IID_IShellExtInit + * IID_IOleCommandTarget + * IID_IShellFolderViewCB */ return E_NOINTERFACE;

1 0

[tfaber] 67313: [COM_APITEST] - Add test for netshell classes - Add some interfaces
by tfaber＠svn.reactos.org 19 Apr '15

19 Apr '15

Author: tfaber Date: Sun Apr 19 21:28:09 2015 New Revision: 67313 URL: http://svn.reactos.org/svn/reactos?rev=67313&view=rev Log: [COM_APITEST] - Add test for netshell classes - Add some interfaces Added: trunk/rostests/apitests/com/netshell.c (with props) Modified: trunk/rostests/apitests/com/CMakeLists.txt trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/ieframe.c trunk/rostests/apitests/com/shdocvw.c trunk/rostests/apitests/com/shell32.c trunk/rostests/apitests/com/testlist.c Modified: trunk/rostests/apitests/com/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -4,6 +4,7 @@ list(APPEND SOURCE browseui.c ieframe.c + netshell.c shdocvw.c shell32.c com_apitest.c Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -34,7 +34,11 @@ { ID_NAME(IID_IACList), TRUE }, { ID_NAME(IID_IACList2), TRUE }, { ID_NAME(IID_IADesktopP2), TRUE }, + { ID_NAME(IID_IAccIdentity) }, + { ID_NAME(IID_IAccPropServer) }, + { ID_NAME(IID_IAccPropServices) }, { ID_NAME(IID_IAccessible) }, + { ID_NAME(IID_IAccessibleHandler) }, { ID_NAME(IID_IAccessControl), TRUE }, { ID_NAME(IID_IAccessor) }, { ID_NAME(IID_IActiveDesktop), TRUE }, @@ -88,6 +92,7 @@ { ID_NAME(IID_IDefViewFrameGroup) }, { ID_NAME(IID_IDefViewSafety), }, { ID_NAME(IID_IDefViewScript), TRUE }, + { ID_NAME(IID_IDelayedRelease), TRUE }, { ID_NAME(IID_IDeskBand) }, { ID_NAME(IID_IDeskBandEx) }, { ID_NAME(IID_IDeskBar), TRUE }, @@ -105,6 +110,7 @@ { ID_NAME(IID_IEnumExtraSearch) }, { ID_NAME(IID_IEnumGUID) }, { ID_NAME(IID_IEnumIDList) }, + { ID_NAME(IID_IEnumNetConnection) }, { ID_NAME(IID_IEnumShellItems) }, { ID_NAME(IID_IEnumString) }, { ID_NAME(IID_IEnumUnknown) }, @@ -132,6 +138,7 @@ { ID_NAME(IID_IFolderViewHost), TRUE }, { ID_NAME(IID_IFolderViewOC) }, { ID_NAME(IID_IFolderViewSettings) }, + { ID_NAME(IID_IGetNameSpaceExtensionPointer),TRUE}, { ID_NAME(IID_IGlobalFolderSettings), TRUE }, { ID_NAME(IID_IHWEventHandler) }, { ID_NAME(IID_IHWEventHandler2) }, @@ -148,6 +155,12 @@ { ID_NAME(IID_IMultiQI), TRUE }, { ID_NAME(IID_INamespaceProxy), TRUE }, { ID_NAME(IID_INameSpaceTreeControl), TRUE }, + { ID_NAME(IID_INetConnectionConnectUi), TRUE }, + { ID_NAME(IID_INetConnectionPropertyUi), TRUE }, + { ID_NAME(IID_INetConnectionPropertyUi2), TRUE }, + { ID_NAME(IID_INetConnectionManager) }, + { ID_NAME(IID_INewShortcutHookA), TRUE }, + { ID_NAME(IID_INewShortcutHookW), TRUE }, { ID_NAME(IID_INSCTree), TRUE }, { ID_NAME(IID_INSCTree2), TRUE }, { ID_NAME(IID_IObjMgr), TRUE }, @@ -169,6 +182,7 @@ { ID_NAME(IID_IPersistFolder) }, { ID_NAME(IID_IPersistFolder2) }, { ID_NAME(IID_IPersistFolder3) }, + { ID_NAME(IID_IPersistFreeThreadedObject), TRUE }, { ID_NAME(IID_IPersistHistory) }, { ID_NAME(IID_IPersistIDList) }, { ID_NAME(IID_IPersistMemory) }, @@ -183,6 +197,7 @@ { ID_NAME(IID_IProgressDialog), TRUE }, { ID_NAME(IID_IPropertyBag) }, { ID_NAME(IID_IPropertyBag2) }, + { ID_NAME(IID_IPropSheetPage), TRUE }, { ID_NAME(IID_IQueryAssociations), TRUE }, { ID_NAME(IID_IQueryInfo), TRUE }, { ID_NAME(IID_IRegTreeOptions), TRUE }, @@ -196,6 +211,8 @@ { ID_NAME(IID_IShellBrowser) }, { ID_NAME(IID_IShellBrowserService), TRUE }, { ID_NAME(IID_IShellChangeNotify), TRUE }, + { ID_NAME(IID_IShellCopyHookA), TRUE }, + { ID_NAME(IID_IShellCopyHookW), TRUE }, { ID_NAME(IID_IShellDesktopTray), TRUE }, { ID_NAME(IID_IShellDetails), TRUE }, { ID_NAME(IID_IShellDispatch) }, @@ -203,9 +220,9 @@ { ID_NAME(IID_IShellDispatch3) }, { ID_NAME(IID_IShellDispatch4) }, { ID_NAME(IID_IShellDispatch5), TRUE }, + { ID_NAME(IID_IShellExecuteHookA), TRUE }, + { ID_NAME(IID_IShellExecuteHookW), TRUE }, { ID_NAME(IID_IShellExtInit), TRUE }, - { ID_NAME(IID_IShellPropSheetExt), TRUE }, - { ID_NAME(IID_IShellIconOverlayIdentifier), TRUE }, { ID_NAME(IID_IShellFolder) }, { ID_NAME(IID_IShellFolder2) }, { ID_NAME(IID_IShellFolderBand), TRUE }, @@ -257,6 +274,8 @@ { ID_NAME(IID_ITrayPriv), TRUE }, { ID_NAME(IID_ITrayPriv2), TRUE }, { ID_NAME(IID_IUnknown) }, + { ID_NAME(IID_IURLSearchHook), TRUE }, + { ID_NAME(IID_IURLSearchHook2), TRUE }, { ID_NAME(IID_IViewObject) }, { ID_NAME(IID_IViewObject2) }, { ID_NAME(IID_IViewObjectEx), TRUE }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -23,6 +23,7 @@ #include <objsafe.h> #include <oleacc.h> #include <oaidl.h> +#include <netcon.h> #include <mshtmhst.h> #include <perhist.h> #include <shlguid.h> @@ -126,9 +127,11 @@ DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); DEFINE_GUID(IID_IFolderViewHost, 0x1ea58f02, 0xd55a, 0x411d, 0xb0, 0x9e, 0x9e, 0x65, 0xac, 0x21, 0x60, 0x5b); DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); +DEFINE_GUID(IID_IGetNameSpaceExtensionPointer,0x287d4a71, 0x439f, 0x43a4, 0x8d, 0x5b, 0x0e, 0x0a, 0xe7, 0x1e, 0x84, 0xa9); DEFINE_GUID(IID_IHWEventHandler, 0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x12, 0x8c, 0xdb, 0x91, 0x87, 0xb6, 0xd1); DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); +DEFINE_GUID(IID_IPersistFreeThreadedObject,0xc7264bf0, 0xedb6, 0x11d1, 0x85, 0x46, 0x00, 0x60, 0x08, 0x05, 0x93, 0x68); DEFINE_GUID(IID_IPreviewHandler, 0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f); DEFINE_GUID(IID_IPreviewHandlerFrame, 0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a); DEFINE_GUID(IID_IPreviewHandlerVisuals, 0x196bf9a5, 0xb346, 0x4ef0, 0xaa, 0x1e, 0x5d, 0xcd, 0xb7, 0x67, 0x68, 0xb1); Modified: trunk/rostests/apitests/com/ieframe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/ieframe.c?re… ============================================================================== --- trunk/rostests/apitests/com/ieframe.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/ieframe.c [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -15,12 +15,20 @@ { ID_NAME(CLSID_ShellWindows), { - { -0xa0, &IID_IMarshal }, - { -0x20, &IID_IClientSecurity }, - { 0x0, &IID_IMultiQI }, + { -0xa0, &IID_IMarshal }, + { -0x20, &IID_IClientSecurity }, + { 0x0, &IID_IMultiQI }, + { 0x0, &IID_IUnknown }, + { FARAWY, &IID_IShellWindows }, + { FARAWY, &IID_IDispatch }, + } + }, + { + ID_NAME(CLSID_CURLSearchHook), + { + { 0x0, &IID_IURLSearchHook2 }, + { 0x0, &IID_IURLSearchHook }, { 0x0, &IID_IUnknown }, - { FARAWY, &IID_IShellWindows }, - { FARAWY, &IID_IDispatch }, } }, }; Added: trunk/rostests/apitests/com/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/netshell.c?r… ============================================================================== --- trunk/rostests/apitests/com/netshell.c (added) +++ trunk/rostests/apitests/com/netshell.c [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -0,0 +1,152 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: COM interface test for netshell classes + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_ConnectionCommonUi), + { + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_ConnectionFolder), + { + { 0x0, &IID_IPersistFolder2 }, + { 0x0, &IID_IPersistFolder }, + { 0x0, &IID_IPersist }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellExtInit }, + { 0x8, &IID_IShellFolder2 }, + { 0x8, &IID_IShellFolder }, + { 0xc, &IID_IOleCommandTarget }, + { 0x10, &IID_IShellFolderViewCB }, + }, + L"Both" + }, + { + ID_NAME(CLSID_ConnectionFolderEnum), + { + { 0x0, &IID_IEnumIDList }, + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, +#if 0 + { + ID_NAME(CLSID_ConnectionManager), + { + { 0x0, &IID_IUnknown }, + } + }, +#endif + { + ID_NAME(CLSID_ConnectionTray), + { + { 0x0, &IID_IOleCommandTarget }, + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_DialupConnectionUi), + { + { 0x0, &IID_INetConnectionConnectUi }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetConnectionPropertyUi2 }, + //{ 0x4, &IID_INetConnectionPropertyUi }, + }, + L"Both" + }, + { + ID_NAME(CLSID_DirectConnectionUi), + { + { 0x0, &IID_INetConnectionConnectUi }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetConnectionPropertyUi2 }, + //{ 0x4, &IID_INetConnectionPropertyUi }, + }, + L"Both" + }, + { + ID_NAME(CLSID_InboundConnectionUi), + { + { 0x0, &IID_INetConnectionPropertyUi2 }, + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_InternetConnectionUi), + { + { 0x0, &IID_INetConnectionConnectUi }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetConnectionPropertyUi2 }, + //{ 0x4, &IID_INetConnectionPropertyUi }, + }, + L"Both" + }, + { + ID_NAME(CLSID_LanConnectionUi), + { + { 0x0, &IID_INetConnectionConnectUi }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetConnectionPropertyUi2 }, + { 0x4, &IID_INetConnectionPropertyUi }, + }, + L"Both" + }, + { + ID_NAME(CLSID_NetConnectionUiUtilities), + { + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_SharedAccessConnectionUi), + { + { 0x0, &IID_INetConnectionConnectUi }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetConnectionPropertyUi2 }, + { 0x4, &IID_INetConnectionPropertyUi }, + }, + L"Both" + }, + { + ID_NAME(CLSID_PPPoEUi), + { + { 0x0, &IID_INetConnectionConnectUi }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetConnectionPropertyUi2 }, + //{ 0x4, &IID_INetConnectionPropertyUi }, + }, + L"Both" + }, + { + ID_NAME(CLSID_VpnConnectionUi), + { + { 0x0, &IID_INetConnectionConnectUi }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetConnectionPropertyUi2 }, + //{ 0x4, &IID_INetConnectionPropertyUi }, + }, + L"Both" + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(netshell) +{ + TestClasses(L"netshell", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/netshell.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -57,7 +57,7 @@ { ID_NAME(CLSID_ShellDispatchInproc), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IUnknown }, } }, #endif Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -274,6 +274,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { 0x10, &IID_IPersistFreeThreadedObject }, { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, @@ -304,6 +305,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { 0x10, &IID_IPersistFreeThreadedObject }, { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, @@ -453,6 +455,7 @@ { 0x18, &IID_IPersistFolder2 }, { 0x18, &IID_IPersistFolder }, { 0x18, &IID_IPersist }, + { 0x18, &IID_IPersistFreeThreadedObject }, { 0x1c, &IID_IStorage }, { 0x2c, &IID_IContextMenuCB }, { 0x34, &IID_IOleCommandTarget }, Modified: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Apr 19 21:28:09 2015 @@ -6,6 +6,7 @@ extern void func_browseui(void); extern void func_ieframe(void); extern void func_interfaces(void); +extern void func_netshell(void); extern void func_shdocvw(void); extern void func_shell32(void); @@ -14,6 +15,7 @@ { "browseui", func_browseui }, { "ieframe", func_ieframe }, { "interfaces", func_interfaces }, + { "netshell", func_netshell }, { "shdocvw", func_shdocvw }, { "shell32", func_shell32 },

1 0

[tfaber] 67312: [NETSHELL] - Use the correct names for netshell's CLSIDs as indicated by the registry and public symbols
by tfaber＠svn.reactos.org 19 Apr '15

19 Apr '15

Author: tfaber Date: Sun Apr 19 21:14:49 2015 New Revision: 67312 URL: http://svn.reactos.org/svn/reactos?rev=67312&view=rev Log: [NETSHELL] - Use the correct names for netshell's CLSIDs as indicated by the registry and public symbols Modified: trunk/reactos/dll/shellext/netshell/README trunk/reactos/dll/shellext/netshell/classfactory.cpp trunk/reactos/dll/shellext/netshell/connectmanager.cpp trunk/reactos/dll/shellext/netshell/enumlist.cpp trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp trunk/reactos/include/reactos/shlguid_undoc.h Modified: trunk/reactos/dll/shellext/netshell/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/READ… ============================================================================== --- trunk/reactos/dll/shellext/netshell/README [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/README [iso-8859-1] Sun Apr 19 21:14:49 2015 @@ -22,7 +22,7 @@ === Status Dialog & Notification Area === -The status dialog is implemented by IOleCommandTarget interface(CLSID_LanConnectStatusUI). This interface manages all status dialogs +The status dialog is implemented by IOleCommandTarget interface(CLSID_ConnectionTray). This interface manages all status dialogs for all available dialogs. The interface is implemented as a singleton to advoid multiple notification icons appear in the Notification area of the explorer. Everytime the IShellFolder object is created (ISF_NetConnect_Constructor), it creates a reference to IOleCommandTarget interface and calls its IOleCommandTarget::Exec function with CGID_ShellServiceObject. Modified: trunk/reactos/dll/shellext/netshell/classfactory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/clas… ============================================================================== --- trunk/reactos/dll/shellext/netshell/classfactory.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/classfactory.cpp [iso-8859-1] Sun Apr 19 21:14:49 2015 @@ -72,13 +72,13 @@ { *ppvObject = NULL; - if (IsEqualCLSID(m_clsid, CLSID_NetworkConnections)) + if (IsEqualCLSID(m_clsid, CLSID_ConnectionFolder)) return ISF_NetConnect_Constructor(pUnkOuter, riid, ppvObject); else if (IsEqualCLSID(m_clsid, CLSID_ConnectionManager)) return INetConnectionManager_Constructor(pUnkOuter, riid, ppvObject); - else if (IsEqualCLSID(m_clsid, CLSID_LANConnectUI)) + else if (IsEqualCLSID(m_clsid, CLSID_LanConnectionUi)) return LanConnectUI_Constructor(pUnkOuter, riid, ppvObject); - else if (IsEqualCLSID(m_clsid, CLSID_LanConnectStatusUI)) + else if (IsEqualCLSID(m_clsid, CLSID_ConnectionTray)) return LanConnectStatusUI_Constructor(pUnkOuter, riid, ppvObject); return E_NOINTERFACE; Modified: trunk/reactos/dll/shellext/netshell/connectmanager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/conn… ============================================================================== --- trunk/reactos/dll/shellext/netshell/connectmanager.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/connectmanager.cpp [iso-8859-1] Sun Apr 19 21:14:49 2015 @@ -321,7 +321,7 @@ { if (m_Props.MediaType == NCM_LAN) { - CopyMemory(pclsid, &CLSID_LANConnectUI, sizeof(CLSID)); + CopyMemory(pclsid, &CLSID_LanConnectionUi, sizeof(CLSID)); return S_OK; } Modified: trunk/reactos/dll/shellext/netshell/enumlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/enum… ============================================================================== --- trunk/reactos/dll/shellext/netshell/enumlist.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/enumlist.cpp [iso-8859-1] Sun Apr 19 21:14:49 2015 @@ -207,7 +207,7 @@ { LPPIDLDATA pData = _ILGetDataPointer(pidlOut); - memcpy(&(pData->u.guid.guid), &CLSID_NetworkConnections, sizeof(GUID)); + memcpy(&(pData->u.guid.guid), &CLSID_ConnectionFolder, sizeof(GUID)); } return pidlOut; } @@ -231,7 +231,7 @@ const IID *piid = _ILGetGUIDPointer(const_cast<LPITEMIDLIST>(pidl)); if (piid) - return IsEqualIID(*piid, CLSID_NetworkConnections); + return IsEqualIID(*piid, CLSID_ConnectionFolder); return FALSE; } Modified: trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/shfl… ============================================================================== --- trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] Sun Apr 19 21:14:49 2015 @@ -144,7 +144,7 @@ m_pidlRoot(_ILCreateNetConnect()) { HRESULT hr; - hr = CoCreateInstance(CLSID_LanConnectStatusUI, NULL, CLSCTX_INPROC_SERVER, IID_IOleCommandTarget, reinterpret_cast<PVOID*>(&m_lpOleCmd)); + hr = CoCreateInstance(CLSID_ConnectionTray, NULL, CLSCTX_INPROC_SERVER, IID_IOleCommandTarget, reinterpret_cast<PVOID*>(&m_lpOleCmd)); if (FAILED(hr)) { ERR("CoCreateInstance failed with %lx\n", hr); @@ -1115,7 +1115,7 @@ if (!lpClassId) return E_POINTER; - *lpClassId = CLSID_NetworkConnections; + *lpClassId = CLSID_ConnectionFolder; return S_OK; } Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Sun Apr 19 21:14:49 2015 @@ -114,16 +114,24 @@ DEFINE_GUID(CGID_MenuDeskBar, 0x5C9F0A12, 0x959E, 0x11D0, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36); -DEFINE_GUID(CLSID_LANConnectUI, 0x7007ACC5, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); -DEFINE_GUID(CLSID_NetworkConnections, 0x7007ACC7, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); -DEFINE_GUID(CLSID_LanConnectStatusUI, 0x7007ACCF, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_DialupConnectionUi, 0x7007ACC1, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_DirectConnectionUi, 0x7007ACC2, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_InboundConnectionUi, 0x7007ACC3, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_InternetConnectionUi, 0x7007ACC4, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_LanConnectionUi, 0x7007ACC5, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_VpnConnectionUi, 0x7007ACC6, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_ConnectionFolder, 0x7007ACC7, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_ConnectionFolderEnum, 0x7007ACC8, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_ConnectionTray, 0x7007ACCF, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_ConnectionCommonUi, 0x7007ACD1, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_NetConnectionUiUtilities,0x7007ACD3, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_PPPoEUi, 0x7007ACD4, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_SharedAccessConnectionUi,0x7007ACD5, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); DEFINE_GUID(CLSID_SysTray, 0x35CEC8A3, 0x2BE6, 0x11D2, 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53); DEFINE_GUID(CLSID_BackgroundTaskScheduler, 0x603D3800, 0xBD81, 0x11d0, 0xA3, 0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC); DEFINE_GUID(CLSID_SharedTaskScheduler, 0x603D3801, 0xBD81, 0x11d0, 0xA3, 0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC); - -#define CLSID_ConnectionTray CLSID_LanConnectStatusUI #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar

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