Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gdalsnes] 19166: merge with wine (by hand!). fixes two failing kernel32 profile winetests. now all pass
by gdalsnes＠svn.reactos.com 12 Nov '05

12 Nov '05

merge with wine (by hand!). fixes two failing kernel32 profile winetests. now all pass Modified: trunk/reactos/lib/kernel32/misc/profile.c _____ Modified: trunk/reactos/lib/kernel32/misc/profile.c --- trunk/reactos/lib/kernel32/misc/profile.c 2005-11-12 00:26:21 UTC (rev 19165) +++ trunk/reactos/lib/kernel32/misc/profile.c 2005-11-12 01:11:28 UTC (rev 19166) @@ -112,8 +112,7 @@ { WCHAR quote = '\0'; - if (!buffer) - return; + if (!buffer) return; if (strip_quote && ((*value == '\'') || (*value == '\"'))) { @@ -122,6 +121,7 @@ } lstrcpynW( buffer, value, len ); + if (quote && (len >= wcslen(value))) buffer[wcslen(buffer)-1] = '\0'; } @@ -214,19 +214,16 @@ { int len = 0; - if (section->name[0]) - len += wcslen(section->name) + 6; + if (section->name[0]) len += wcslen(section->name) + 6; for (key = section->key; key; key = key->next) { len += wcslen(key->name) + 2; - if (key->value) - len += wcslen(key->value) + 1; + if (key->value) len += wcslen(key->value) + 1; } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!buffer) - return; + if (!buffer) return; p = buffer; if (section->name[0]) @@ -274,8 +271,7 @@ for (key = section->key; key; key = next_key) { next_key = key->next; - if (key->value) - HeapFree( GetProcessHeap(), 0, key->value ); + HeapFree( GetProcessHeap(), 0, key->value ); HeapFree( GetProcessHeap(), 0, key ); } next_section = section->next; @@ -321,10 +317,6 @@ return ENCODING_ANSI; } -static const WCHAR * PROFILE_GetLine(const WCHAR * szStart, const WCHAR * szEnd) -{ - return memchrW(szStart, '\n', szEnd - szStart); -} /*********************************************************************** * PROFILE_Load @@ -336,7 +328,7 @@ void *pBuffer; WCHAR * szFile; const WCHAR *szLineStart, *szLineEnd; - const WCHAR *szValueStart, *szNameEnd, *szEnd; + const WCHAR *szValueStart, *szEnd, *next_line; int line = 0, len; PROFILESECTION *section, *first_section; PROFILESECTION **next_section; @@ -429,20 +421,21 @@ next_section = &first_section->next; next_key = &first_section->key; prev_key = NULL; - szLineEnd = szFile - 1; /* will be increased to correct value in loop */ + next_line = szFile; - while (TRUE) + while (next_line < szEnd) { - szLineStart = szLineEnd + 1; - if (szLineStart >= szEnd) - break; - szLineEnd = PROFILE_GetLine(szLineStart, szEnd); - if (!szLineEnd) - szLineEnd = szEnd; + szLineStart = next_line; + next_line = memchrW(szLineStart, '\n', szEnd - szLineStart); + if (!next_line) next_line = szEnd; + else next_line++; + szLineEnd = next_line; + line++; - while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) - szLineStart++; + /* get rid of white space */ + while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; + while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; if (szLineStart >= szLineEnd) continue; @@ -478,31 +471,18 @@ } } - /* get rid of white space at the end of the line */ - while ((szLineEnd > szLineStart) && ((*szLineEnd == '\n') || PROFILE_isspaceW(*szLineEnd))) - szLineEnd--; - - /* line end should be pointing to character *after* the last wanted character */ - szLineEnd++; - /* get rid of white space after the name and before the start * of the value */ - if ((szNameEnd = szValueStart = memchrW( szLineStart, '=', szLineEnd - szLineStart )) != NULL) + len = szLineEnd - szLineStart; + if ((szValueStart = memchrW( szLineStart, '=', szLineEnd - szLineStart )) != NULL) { - szNameEnd = szValueStart - 1; - while ((szNameEnd > szLineStart) && PROFILE_isspaceW(*szNameEnd)) - szNameEnd--; + const WCHAR *szNameEnd = szValueStart; + while ((szNameEnd > szLineStart) && PROFILE_isspaceW(szNameEnd[-1])) szNameEnd--; + len = szNameEnd - szLineStart; szValueStart++; - while (szValueStart < szLineEnd && PROFILE_isspaceW(*szValueStart)) - szValueStart++; + while (szValueStart < szLineEnd && PROFILE_isspaceW(*szValueStart)) szValueStart++; } - if (!szNameEnd) - szNameEnd = szLineEnd - 1; - /* name end should be pointing to character *after* the last wanted character */ - szNameEnd++; - len = (int)(szNameEnd - szLineStart); - if (len || !prev_key || *prev_key->name) { /* no need to allocate +1 for NULL terminating character as @@ -577,8 +557,7 @@ { PROFILEKEY *to_del = *key; *key = to_del->next; - if (to_del->value) - HeapFree( GetProcessHeap(), 0, to_del->value); + HeapFree( GetProcessHeap(), 0, to_del->value); HeapFree( GetProcessHeap(), 0, to_del ); return TRUE; } @@ -596,7 +575,7 @@ * * Delete all keys from a profile tree. */ -void PROFILE_DeleteAllKeys( LPCWSTR section_name) +static void PROFILE_DeleteAllKeys( LPCWSTR section_name) { PROFILESECTION **section= &CurProfile->section; while (*section) @@ -608,8 +587,7 @@ { PROFILEKEY *to_del = *key; *key = to_del->next; - if (to_del->value) - HeapFree( GetProcessHeap(), 0, to_del->value); + HeapFree( GetProcessHeap(), 0, to_del->value); HeapFree( GetProcessHeap(), 0, to_del ); CurProfile->changed =TRUE; } @@ -737,8 +715,7 @@ { PROFILE_FlushFile(); PROFILE_Free( CurProfile->section ); - if (CurProfile->filename) - HeapFree( GetProcessHeap(), 0, CurProfile->filename ); + HeapFree( GetProcessHeap(), 0, CurProfile->filename ); CurProfile->changed = FALSE; CurProfile->section = NULL; CurProfile->filename = NULL; @@ -877,7 +854,7 @@ * If return_values is TRUE, also include the corresponding values. */ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, - LPWSTR buffer, UINT len, BOOL return_values ) + LPWSTR buffer, UINT len, BOOL return_values, BOOL return_noequalkeys ) { PROFILEKEY *key; @@ -893,12 +870,10 @@ UINT oldlen = len; for (key = section->key; key; key = key->next) { - if (len <= 2) - break; - if (!*key->name) - continue; /* Skip empty lines */ - if (IS_ENTRY_COMMENT(key->name)) - continue; /* Skip comments */ + if (len <= 2) break; + if (!*key->name) continue; /* Skip empty lines */ + if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ + if (!return_noequalkeys && !return_values && !key->value) continue; /* Skip lines w.o. '=' */ PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); len -= wcslen(buffer) + 1; buffer += wcslen(buffer) + 1; @@ -935,41 +910,36 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) { LPWSTR buf; - UINT f,l; + UINT buflen,tmplen; PROFILESECTION *section; DPRINT("(%p, %d)\n", buffer, len); if (!buffer || !len) return 0; - if (len == 1) - { + if (len == 1) { *buffer = '\0'; return 0; } - f = len - 1; + buflen=len-1; buf = buffer; section = CurProfile->section; - while ((section!=NULL)) - { - if (section->name[0]) - { - l = wcslen(section->name)+1; - if (l > f) - { - if (f > 0) - { - memcpy(buf, section->name, (f - 1) * sizeof(WCHAR)); - buf += f - 1; + while ((section!=NULL)) { + if (section->name[0]) { + tmplen = wcslen(section->name)+1; + if (tmplen > buflen) { + if (buflen > 0) { + memcpy(buf, section->name, (buflen - 1) * sizeof(WCHAR)); + buf += buflen - 1; *buf++ = '\0'; } *buf='\0'; return len - 2; } - wcscpy(buf, section->name); - buf += l; - f -= l; + memcpy(buf, section->name, tmplen * sizeof(WCHAR)); + buf += tmplen; + buflen -= tmplen; } section = section->next; } @@ -1001,17 +971,14 @@ * */ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, - LPCWSTR def_val, LPWSTR buffer, UINT len ) + LPCWSTR def_val, LPWSTR buffer, UINT len, BOOL win32 ) { PROFILEKEY *key = NULL; static const WCHAR empty_strW[] = { 0 }; - if (!buffer) - return 0; + if (!buffer) return 0; - if (!def_val) - def_val = empty_strW; - + if (!def_val) def_val = empty_strW; if (key_name) { if (!key_name[0]) @@ -1031,7 +998,7 @@ /* no "else" here ! */ if (section && section[0]) { - INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE); + INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE, !win32); if (!buffer[0]) /* no luck -> def_val */ { PROFILE_CopyEntry(buffer, def_val, len, TRUE); @@ -1073,13 +1040,11 @@ key_name, TRUE, create_always ); DPRINT("(%S, %S, %S):\n", section_name, key_name, value); - if (!key) - return FALSE; + if (!key) return FALSE; /* strip the leading spaces. We can safely strip \n\r and * friends too, they should not happen here anyway. */ - while (PROFILE_isspaceW(*value)) - value++; + while (PROFILE_isspaceW(*value)) value++; if (key->value) { @@ -1123,15 +1088,15 @@ } /* - * if allow_section_name_copy is TRUE, allow the copying : - * - of Section names if 'section' is NULL - * - of Keys in a Section if 'entry' is NULL + * if win32, copy: + * - Section names if 'section' is NULL + * - Keys in a Section if 'entry' is NULL * (see MSDN doc for GetPrivateProfileString) */ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, UINT len, LPCWSTR filename, - BOOL allow_section_name_copy ) + BOOL win32 ) { int ret; LPCWSTR pDefVal = NULL; @@ -1172,16 +1137,13 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) - { - if ((allow_section_name_copy) && (section == NULL)) + if (PROFILE_Open( filename )) { + if (win32 && (section == NULL)) ret = PROFILE_GetSectionNames(buffer, len); else - /* PROFILE_GetString already handles the 'entry == NULL' case */ - ret = PROFILE_GetString( section, entry, pDefVal, buffer, len ); - } - else - { + /* PROFILE_GetString can handle the 'entry == NULL' case */ + ret = PROFILE_GetString( section, entry, pDefVal, buffer, len, win32 ); + } else { lstrcpynW( buffer, pDefVal, len ); ret = wcslen( buffer ); } @@ -1237,7 +1199,7 @@ RtlFreeUnicodeString(&entryW); RtlFreeUnicodeString(&def_valW); RtlFreeUnicodeString(&filenameW); - if (bufferW) HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, bufferW); return ret; } @@ -1368,7 +1330,7 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename )) - ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE); + ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE, FALSE); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1413,7 +1375,7 @@ RtlFreeUnicodeString(&sectionW); RtlFreeUnicodeString(&filenameW); - if (bufferW) HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, bufferW); return ret; } @@ -1444,25 +1406,21 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) + if (!section && !entry && !string) /* documented "file flush" case */ { - if (!section && !entry && !string) /* documented "file flush" case */ + if (!filename || PROFILE_Open( filename )) { - PROFILE_FlushFile(); - PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } - else - { - if (!section) - { - DPRINT1("(NULL?, %S, %S, %S)?\n", + } + else if (PROFILE_Open( filename )) + { + if (!section) { + DPRINT1("(NULL?, %S, %S, %S)?\n", entry, string, filename); - } - else - { - ret = PROFILE_SetString( section, entry, string, FALSE); - PROFILE_FlushFile(); - } + } else { + ret = PROFILE_SetString( section, entry, string, FALSE); + PROFILE_FlushFile(); } } @@ -1508,28 +1466,24 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) + if (!section && !string) { - if (!section && !string) + if (!filename || PROFILE_Open( filename )) { - PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } - else if (!string) - { - /* delete the named section*/ + } + else if (PROFILE_Open( filename )) { + if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); PROFILE_FlushFile(); - } - else - { + } else { PROFILE_DeleteAllKeys(section); ret = TRUE; - while(*string) - { - LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (wcslen(string) + 1) * sizeof(WCHAR) ); + while(*string) { + LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (wcslen(string)+1) * sizeof(WCHAR) ); wcscpy( buf, string ); - if ((p = wcschr( buf, L'='))) - { + if((p = wcschr( buf, '='))) { *p = '\0'; ret = PROFILE_SetString( section, buf, p + 1, TRUE); } @@ -1560,8 +1514,7 @@ INT lenA, lenW; LPCSTR p = string; - while(*p) - p += strlen(p) + 1; + while(*p) p += strlen(p) + 1; lenA = p - string + 1; lenW = MultiByteToWideChar(CP_ACP, 0, string, lenA, NULL, 0); if ((stringW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)))) @@ -1680,7 +1633,7 @@ } RtlFreeUnicodeString(&filenameW); - if (bufferW) HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, bufferW); return ret; }

1 0

[gedmurphy] 19165: - build as unicode
by gedmurphy＠svn.reactos.com 12 Nov '05

12 Nov '05

- build as unicode - use a _tmain hack w3seek put together Modified: trunk/reactos/subsys/system/sc/sc.c Modified: trunk/reactos/subsys/system/sc/sc.xml _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-12 00:24:16 UTC (rev 19164) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-12 00:26:21 UTC (rev 19165) @@ -137,10 +137,13 @@ return 0; } +#if defined(_UNICODE) && defined(__GNUC__) +static +#endif int _tmain(int argc, LPCTSTR argv[]) { - LPTSTR MachineName = NULL; // remote machine + LPTSTR MachineName = NULL; // remote machine LPCTSTR Command = NULL; // sc command LPCTSTR ServiceName = NULL; // Name of service @@ -169,3 +172,42 @@ return MainUsage(); } + + +#if defined(_UNICODE) && defined(__GNUC__) +/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ +int main( int argc, char **argv ) +{ + WCHAR **argvW; + int i, j, Ret = 1; + + if ((argvW = malloc(argc * sizeof(WCHAR*)))) + { + /* convert the arguments */ + for (i = 0, j = 0; i < argc; i++) + { + if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) + { + j++; + } + swprintf(argvW[i], L"%hs", argv[i]); + } + + if (j == 0) + { + /* no error converting the parameters, call wmain() */ + Ret = wmain(argc, (LPCTSTR *)argvW); + } + + /* free the arguments */ + for (i = 0; i < argc; i++) + { + if (argvW[i]) + free(argvW[i]); + } + free(argvW); + } + + return Ret; +} +#endif _____ Modified: trunk/reactos/subsys/system/sc/sc.xml --- trunk/reactos/subsys/system/sc/sc.xml 2005-11-12 00:24:16 UTC (rev 19164) +++ trunk/reactos/subsys/system/sc/sc.xml 2005-11-12 00:26:21 UTC (rev 19165) @@ -1,6 +1,8 @@ <module name="sc" type="win32cui" installbase="system32" installname="sc.exe"> <define name="__USE_W32API" /> <define name="DEFINE_GUID" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <file>sc.c</file> <file>start.c</file>

1 0

[greatlrd] 19164: fixed last part of bug 910 change Windows/ to ReactOS
by greatlrd＠svn.reactos.com 12 Nov '05

12 Nov '05

fixed last part of bug 910 change Windows/ to ReactOS Modified: trunk/reactos/subsys/system/cmd/De.rc Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-11-12 00:19:03 UTC (rev 19163) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-11-12 00:24:16 UTC (rev 19164) @@ -527,7 +527,7 @@ FOR Fuehrt einen angegebenen Befehl fuer jede Datei in einem Dateiensatz\n\ aus.\n\ FREE Zeigt den (freien) Speicherplatz an.\n\ -GOTO Setzt den Windows-Befehlsinterpreter auf eine markierte Zeile in\n\ +GOTO Setzt den ReactOS-Befehlsinterpreter auf eine markierte Zeile in\n\ einem Batchprogramm.\n\ HELP Zeigt Hilfeinformationen zu ReactOS-Befehlen an.\n\ HISTORY Listet alle Befehle auf welche sich im Speicher befinden.\n\ @@ -557,7 +557,7 @@ TIMER Erlaubt die Benutzung von bis zu 10 Stopuhren\n\ TITLE Legt den Fenstertitel fuer das Eingabeaufforderungsfenster fest.\n\ TYPE Zeigt den Inhalt einer Textdatei an.\n\ -VER Zeigt die Windows-Version an.\n\ +VER Zeigt die ReactOS-Version an.\n\ VERIFY Legt fest, ob ueberwacht werden soll, ob Dateien korrekt auf den\n\ Datentraeger geschrieben werden.\n\ VOL Zeigt die Datentraegervolumebezeichnung und die Seriennummer an.\n" _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-11-12 00:19:03 UTC (rev 19163) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-11-12 00:24:16 UTC (rev 19164) @@ -524,7 +524,7 @@ EXIT Quits the CMD.EXE program (command interpreter).\n\ FOR Runs a specified command for each file in a set of files.\n\ FREE (free) disc space.\n\ -GOTO Directs the Windows command interpreter to a labeled line in\n\ +GOTO Directs the ReactOS command interpreter to a labeled line in\n\ a batch program.\n\ HELP Provides Help information for ReactOS commands.\n\ HISTORY List alle commands which has been used\n\ @@ -546,7 +546,7 @@ RENAME Renames a file or files.\n\ RMDIR Removes a directory.\n\ SCREEN Move cursor and optionally print text.\n\ -SET Displays, sets, or removes Windows environment variables.\n\ +SET Displays, sets, or removes ReactOS environment variables.\n\ SHIFT Shifts the position of replaceable parameters in batch files.\n" STRING_HELP2, "START Starts a separate window to run a specified program or command.\n\ Executes command.\n\ @@ -554,8 +554,8 @@ TIMER Allow the use of ten stopwaches.\n\ TITLE Sets the window title for a CMD.EXE session.\n\ TYPE Displays the contents of a text file.\n\ -VER Displays the Windows version.\n\ -VERIFY Tells Windows whether to verify that your files are written\n\ +VER Displays the ReactOS version.\n\ +VERIFY Tells ReactOS whether to verify that your files are written\n\ correctly to a disk.\n\ VOL Displays a disk volume label and serial number.\n"

1 0

[greatlrd] 19163: fixed last part of bug 910 change Windows/ to ReactOS
by greatlrd＠svn.reactos.com 12 Nov '05

12 Nov '05

1 0

[greatlrd] 19162: fixed part of bug 910 change Windows/Wine to ReactOS like resting ReactOS
by greatlrd＠svn.reactos.com 12 Nov '05

12 Nov '05

fixed part of bug 910 change Windows/Wine to ReactOS like resting ReactOS Modified: trunk/reactos/lib/winmm/winmm_Cs.rc Modified: trunk/reactos/lib/winmm/winmm_De.rc Modified: trunk/reactos/lib/winmm/winmm_En.rc Modified: trunk/reactos/lib/winmm/winmm_Es.rc Modified: trunk/reactos/lib/winmm/winmm_Fr.rc Modified: trunk/reactos/lib/winmm/winmm_It.rc Modified: trunk/reactos/lib/winmm/winmm_Ja.rc Modified: trunk/reactos/lib/winmm/winmm_Nl.rc Modified: trunk/reactos/lib/winmm/winmm_Pl.rc Modified: trunk/reactos/lib/winmm/winmm_Pt.rc Modified: trunk/reactos/lib/winmm/winmm_Ru.rc Modified: trunk/reactos/lib/winmm/winmm_Si.rc Modified: trunk/reactos/lib/winmm/winmm_Sk.rc _____ Modified: trunk/reactos/lib/winmm/winmm_Cs.rc --- trunk/reactos/lib/winmm/winmm_Cs.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Cs.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -47,7 +47,7 @@ MIDIERR_NOMAP, "MIDI map nebyla nalezena. To m¨¥e ukazovat na problÚm s ovladaÞem nebo je soubor MIDIMAP.CFG po?kozen Þi chybÝ." MIDIERR_NOTREADY, "Port p°enß?Ý data na za°ÝzenÝ. PoÞkejte na dokonÞenÝ p°enosu a zkuste to znovu." MIDIERR_NODEVICE, "SouÞasnÚ nastavenÝ MIDI mapperu se odkazuje na MIDI za°ÝzenÝ nep°ÝtomnÚ v systÚmu. Upravte nastavenÝ MIDI mapperu." -MIDIERR_INVALIDSETUP, "SouÞasnÚ nastavenÝ MIDI je po?kozenÚ. P°epi?te soubor MIDIMAP.CFG ve Windows slo¥ce SYSTEM originßlem a zkuste to znovu." +MIDIERR_INVALIDSETUP, "SouÞasnÚ nastavenÝ MIDI je po?kozenÚ. P°epi?te soubor MIDIMAP.CFG ve ReactOS slo¥ce SYSTEM originßlem a zkuste to znovu." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Neplatn² identifikßtor MCI za°ÝzenÝ. Pou¥ijte identifikßtor vrßcen² p°i otev°enÝ MCI za°ÝzenÝ." @@ -68,7 +68,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "Vßmi pou¥itÚ MCI za°ÝzenÝ nepodporuje uveden² p°Ýkaz." MCIERR_FILE_NOT_FOUND, "Soubor nebyl nalezen. Ujistýte se, ¥e cesta k souboru a jeho jmÚno jsou platnÚ." MCIERR_DEVICE_NOT_READY, "OvladaÞ za°ÝzenÝ nenÝ p°ipraven." -MCIERR_INTERNAL, "P°i inicialiazaci MCI do?lo k problÚm¨m. Zkuste zrestartovat Windows." +MCIERR_INTERNAL, "P°i inicialiazaci MCI do?lo k problÚm¨m. Zkuste zrestartovat ReactOS." MCIERR_DRIVER, "OvladaÞ mß problÚmy a ukonÞil svou Þinnost. OvladaÞ nevrßtil popis chyby." MCIERR_CANNOT_USE_ALL, "Nemohu pou¥Ýt 'all' jako jmÚno za°ÝzenÝ p°i provßdýnÝ tohoto p°Ýkazu." MCIERR_MULTIPLE, "Vyskytly se chyby na vÝce za°ÝzenÝch. Zadejte p°Ýkazy zvlß?? pro ka¥dÚ jedno za°ÝzenÝify, aby bylo zji?týno, kterÚ za°ÝzenÝ chybuje." _____ Modified: trunk/reactos/lib/winmm/winmm_De.rc --- trunk/reactos/lib/winmm/winmm_De.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_De.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "Es wurde keine MIDI - Map gefunden. Es k÷nnte ein Problem mit dem Treiber geben oder die Datei MIDIMAP.CFG fehlt oder ist beschõdigt." MIDIERR_NOTREADY, "Der Anschluss ist mit der Datenausgabe belegt. Warten Sie, bis die Daten ³bertragen wurden und versuchen Sie es erneut." MIDIERR_NODEVICE, "Das gegenwõrtige MIDI - Mapper Setup benutzt ein MIDI - Gerõt, das nicht installiert ist. Benutzen Sie den MIDI - Mapper, um das Setup zu õndern." -MIDIERR_INVALIDSETUP, "Das aktuelle MIDI Setup ist beschõdigt. Kopieren sie die urspr³ngliche Datei MIDIMAP.CFG ind das Windows - Systemverzeichnis und versuchen Sie es erneut." +MIDIERR_INVALIDSETUP, "Das aktuelle MIDI Setup ist beschõdigt. Kopieren sie die urspr³ngliche Datei MIDIMAP.CFG ind das ReactOS - Systemverzeichnis und versuchen Sie es erneut." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Ung³ltige MCI - Gerõtekennung. Benutzen Sie die zur³ckgegebene ID, wenn Sie das MCI - Gerõt ÷ffnen." @@ -66,7 +66,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "Das verwendete MCI - Gerõt unterst³tzt diesen Befehl nicht." MCIERR_FILE_NOT_FOUND, "Die angeforderte Datei wurde nicht gefunden. Stellen Sie sicher, dass Pfad- und Dateiname richtig sind." MCIERR_DEVICE_NOT_READY, "Der Gerõtetreiber ist nicht bereit." -MCIERR_INTERNAL, "Ein Fehler ereignete sich beim Starten von MCI. Versuche Windows neu zu starten." +MCIERR_INTERNAL, "Ein Fehler ereignete sich beim Starten von MCI. Versuche ReactOS neu zu starten." MCIERR_DRIVER, "Es gibt ein Problem mit dem Gerõtetreiber. Der Treiber wird geschlossen. Ein Fehler kann nicht gemeldet werden." MCIERR_CANNOT_USE_ALL, "Der Gerõtename 'all' ist nicht in diesem Befehl erlaubt." MCIERR_MULTIPLE, "Es traten Fehler in mehr als einem Gerõt auf. Geben Sie jeden Befehl f³r jedes Gerõt einzeln an, um zu bestimmen, welches Gerõt die Fehler verursachte." _____ Modified: trunk/reactos/lib/winmm/winmm_En.rc --- trunk/reactos/lib/winmm/winmm_En.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_En.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "A MIDI map was not found. There may be a problem with the driver, or the MIDIMAP.CFG file may be corrupt or missing." MIDIERR_NOTREADY, "The port is transmitting data to the device. Wait until the data has been transmitted, and then try again." MIDIERR_NODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use MIDI Mapper to edit the setup." -MIDIERR_INVALIDSETUP, "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the Windows SYSTEM directory, and then try again." +MIDIERR_INVALIDSETUP, "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the ReactOS SYSTEM directory, and then try again." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Invalid MCI device ID. Use the ID returned when opening the MCI device." @@ -66,7 +66,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "The MCI device you are using does not support the specified command." MCIERR_FILE_NOT_FOUND, "Cannot find the specified file. Make sure the path and filename are correct." MCIERR_DEVICE_NOT_READY, "The device driver is not ready." -MCIERR_INTERNAL, "A problem occurred in initializing MCI. Try restarting Windows." +MCIERR_INTERNAL, "A problem occurred in initializing MCI. Try restarting ReactOS." MCIERR_DRIVER, "There is a problem with the device driver. The driver has closed. Cannot access error." MCIERR_CANNOT_USE_ALL, "Cannot use 'all' as the device name with the specified command." MCIERR_MULTIPLE, "Errors occurred in more than one device. Specify each command and device separately to determine which devices caused the error" _____ Modified: trunk/reactos/lib/winmm/winmm_Es.rc --- trunk/reactos/lib/winmm/winmm_Es.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Es.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -46,7 +46,7 @@ MIDIERR_NOMAP, "No se encontr¾ un mapa MIDI. Puede haber un problema con el controlador, el el fichero MIDIMAP.CFG puede faltar o estar corrupto." MIDIERR_NOTREADY, "El puerto estß transmitiendo datos al dispositivo. Espera hasta que los datos hayan sido transmitidos, e intente nuevamente." MIDIERR_NODEVICE, "La configuraci¾n actual del mapeador MIDI refiere a un dispositivo MIDI que no estß instalado en el sistema. Use el mapeador MIDI para editar la configuraci¾n." - MIDIERR_INVALIDSETUP, "La configuraci¾n actual de MIDI estß da±ada. Copie el fichero MIDIMAP.CFG original al directorio SYSTEM de Windows SYSTEM, e intente nuevamente." + MIDIERR_INVALIDSETUP, "La configuraci¾n actual de MIDI estß da±ada. Copie el fichero MIDIMAP.CFG original al directorio SYSTEM de ReactOS SYSTEM, e intente nuevamente." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Identificador de dispositivo MCI invßlido. Use el identificador devuelto al abrir el dispositivo MCI." @@ -67,7 +67,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "El dispositivo MCI que estß usando no soporta el comando especificado." MCIERR_FILE_NOT_FOUND, "No se encuentra el fichero especificado. Aseg·rese que el path y el nombre del fichero son correctos." MCIERR_DEVICE_NOT_READY, "El controlador de dispositivo no estß listo." - MCIERR_INTERNAL, "Un problema ha ocurrido inicializando el MCI. Intente reiniciar Windows." + MCIERR_INTERNAL, "Un problema ha ocurrido inicializando el MCI. Intente reiniciar ReactOS." MCIERR_DRIVER, "Hay un problema con el controlador del dispositivo. El controlador se ha cerrado. Intente reenviar el comando." MCIERR_CANNOT_USE_ALL, "Utilice un nombre de dispositivo especÝfico para este comando." MCIERR_MULTIPLE, "Han ocurrido errores en mßs de un dispositivo. Especifique cada comando y dispositivo por separado para determinar que dispositivos causaron el error." _____ Modified: trunk/reactos/lib/winmm/winmm_Fr.rc --- trunk/reactos/lib/winmm/winmm_Fr.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Fr.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -71,7 +71,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "Le pÚriphÚrique MCI que vous utilisez ne prend pas en charge la commande spÚcifiÚe." MCIERR_FILE_NOT_FOUND, "Le fichier spÚcifiÚ est introuvable. VÚrifiez que le chemin d'accÞs et le nom de fichier sont corrects." MCIERR_DEVICE_NOT_READY, "Le pilote de pÚriphÚrique n'est pas prÛt. Attendez une minute avant d'essayer Ó nouveau." -MCIERR_INTERNAL, "Un problÞme est survenu lors de l'initialisation de MCI. Essayez de redÚmarrer Windows." +MCIERR_INTERNAL, "Un problÞme est survenu lors de l'initialisation de MCI. Essayez de redÚmarrer ReactOS." MCIERR_DRIVER, "Une erreur spÚcifique au pilote a provoquÚ sa fermeture. Essayez de relancer la commande." MCIERR_CANNOT_USE_ALL, "Utilisez un nom de pÚriphÚrique spÚcifique pour cette commande." MCIERR_MULTIPLE, "Des erreurs se sont produites dans plusieurs pÚriphÚriques. SpÚcifiez chaque commande et chaque pÚriphÚrique sÚparÚment afin de dÚterminer les pÚriphÚriques qui ont provoquÚ les erreurs." _____ Modified: trunk/reactos/lib/winmm/winmm_It.rc --- trunk/reactos/lib/winmm/winmm_It.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_It.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -46,7 +46,7 @@ MIDIERR_NOMAP, "Non Þ stata trovata una mappa MIDI. Ci potrebbe essere un problema con il driver, o il file MIDIMAP.CFG potrebbe essere danneggiato o mancante." MIDIERR_NOTREADY, "La porta sta trasmettendo dei dati al dispositivo. Attendere la trasmissione di tutti i dati, e riprovare." MIDIERR_NODEVICE, "La configurazione attuale del Mapper MIDI si riferisce a un dispositivo MIDI che non Þ presente nel sistema. Usare il Mapper MIDI per modificare la configurazione." -MIDIERR_INVALIDSETUP, "La configutazione MIDI attuale Þ danneggiata. Copiare il file MIDIMAP.CFG nella directory SYSTEM di Windows, e riprovare." +MIDIERR_INVALIDSETUP, "La configutazione MIDI attuale Þ danneggiata. Copiare il file MIDIMAP.CFG nella directory SYSTEM di ReactOS, e riprovare." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "ID del dispositivo MCI invalido. Usare l'ID restituito quando si Þ aperto il dispositivo MCI." @@ -67,7 +67,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "Il dispositivo MCI in uso non supporta il comando specificato." MCIERR_FILE_NOT_FOUND, "Il file specificato non Þ stato trovato. Controllare che l'indirizzo e il nome del file siano corretti." MCIERR_DEVICE_NOT_READY, "Il driver non Þ pronto." -MCIERR_INTERNAL, "Si Þ verificato un problema nell'inizializazione di MCI. Provare a riavviare Windows." +MCIERR_INTERNAL, "Si Þ verificato un problema nell'inizializazione di MCI. Provare a riavviare ReactOS." MCIERR_DRIVER, "Si Þ verificato un errore nel driver. Il driver Þ stato chiuso. Errore non accessibile." MCIERR_CANNOT_USE_ALL, "Non Þ possibile usare 'all' come nome del dispositivo con il comando specificato." MCIERR_MULTIPLE, "Si sono verificati degli errori in pi¨ di un dispositivo. Specificare ogni comando e dispositivo separatamente per determinare quale dispositivo ha causato l'errore" _____ Modified: trunk/reactos/lib/winmm/winmm_Ja.rc --- trunk/reactos/lib/winmm/winmm_Ja.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Ja.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "MIDIâ}âbâvé¬î®é?é®éÞé?é?é± üBâhâëâCâoé?ûÔæÞé®üAMIDIMAP.CFGâtâ@âCâïé¬öjæ?éÁé?éóéÚé®æÂì¦éÁé?éóë?ö\\É½ é¬éáéÞé?éÀüB" MIDIERR_NOTREADY, "â|ü[âgé?âfâoâCâXé?âfü[â^éæùÉMÆåé? éÀüBâfü[â^é?æùÉMé¬ÅIéÝéÚé?é?æÊé?é?é®éþéÔéÞÆ?éÁé?ë?é?éóüB" MIDIERR_NODEVICE, "MIDIâ}âbâpé?É¦ÆÞé¬âVâXâeâÇé?æòÆàé?éÛé? éóé?éóâfâoâCâXéÄQÅãéÁé?éóé?éÀüBÉ¦ÆÞéò¤ìXéÀéÚé?é?âRâôâgâìü[âïâpâlâïé? üuMIDIâ}âbâpüvâAâvâîâbâgéÄgùpéÁé?ë?é?éóüB" -MIDIERR_INVALIDSETUP, "MIDIé?É¦ÆÞé¬öjæ?éÁé?éóé?éÀüBâIâèâWâiâïé ?MIDIMAP.CFGâtâ@âCâïéWindowsé?SYSTEMâfâBâîâNâgâèé®éþâRâsü[éÁé?éÔéÞÆ?éÁé ?ë?é?éóüB" +MIDIERR_INVALIDSETUP, "MIDIé?É¦ÆÞé¬öjæ?éÁé?éóé?éÀüBâIâèâWâiâïé ?MIDIMAP.CFGâtâ@âCâïéReactOSé?SYSTEMâfâBâîâNâgâèé®éþâRâsü[éÁé?éÔéÞÆ?éÁé ?ë?é?éóüB" /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "û?î°é?MCIâfâoâCâXIDé?éÀüBMCIâfâoâCâXé âIü[âvâôéÁé¢éãé½é?òÈé?éÛé¢IDéÄgùpéÁé?ë?é?éóüB" @@ -66,7 +66,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "ÄgùpéÁé?éóéÚMCIâfâoâCâXé?ÄwÆÞé?éÛé¢ âRâ}âôâhéâTâ|ü[âgéÁé?éóé?é?é±üB" MCIERR_FILE_NOT_FOUND, "ÄwÆÞé?éÛé¢âtâ@âCâïé?î®é?é®éÞé?é ?é±üBâtâ@âCâïû?éãâpâXéèmöFéÁé?ë?é?éóüB" MCIERR_DEVICE_NOT_READY, "âfâoâCâXâhâëâCâoé?ÅÇö§é¬é?é½é?éóé?é?é± üB" -MCIERR_INTERNAL, "MCIé?Åëè·ë?Æåé?ûÔæÞé¬ö¡ÉÂéÁé?éÁé¢ üBWindowséì?ïNô«éÁé?ë?é?éóüB" +MCIERR_INTERNAL, "MCIé?Åëè·ë?Æåé?ûÔæÞé¬ö¡ÉÂéÁé?éÁé¢ üBReactOSéì?ïNô«éÁé?ë?é?éóüB" MCIERR_DRIVER, "âfâoâCâXâhâëâCâoé?ûÔæÞé¬ö¡ÉÂéÁé ?éÁé¢üBâhâëâCâoé?âNâìü[âYé?éÛé?éóé?éÀüBâGâëü[é?âAâNâZâXé?é½é?é?é±üB" MCIERR_CANNOT_USE_ALL, "ÄwÆÞé?éÛé¢âRâ}âôâhé?üuallüvé âfâoâCâXû?éãéÁé?ÄgùpéÀéÚé?éãé¬é?é½é?é?é±üB" MCIERR_MULTIPLE, "òíÉöé?âfâoâCâXé?âGâëü[é¬ö¡ÉÂéÁé?éÁé¢ üBéÃé?âfâoâCâXé?âGâëü[é¬ö¡ÉÂéÁé¢é®èmöFéÀéÚé?é?üAâRâ}âôâhéãâfâoâCâXéò?î? é?ÄwÆÞéÁé?ë?é?éóüB" _____ Modified: trunk/reactos/lib/winmm/winmm_Nl.rc --- trunk/reactos/lib/winmm/winmm_Nl.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Nl.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "Er is geen MIDI Map gevonden. Er zou een driver probleem kunnen zijn of de MIDIMAP.CFG file is verminkt of afwezig." MIDIERR_NOTREADY, "De poort is bezig data ter versturen naar het apparaat. Wacht totdat alle data is verstuurd en probeer het dan opnieuw." MIDIERR_NODEVICE, "De huidige MIDI Mapper setup verwijst naar een MIDI apparaat dat niet op het systeem aanwezig is. Gebruik MIDI Mapper om de instellingen aan te passen." -MIDIERR_INVALIDSETUP, "De huidige MIDI setup is beschadigd. Kopieer de originele MIDIMAP.CFG file naar de Windows SYSTEM directory en probeer het daarna weer." +MIDIERR_INVALIDSETUP, "De huidige MIDI setup is beschadigd. Kopieer de originele MIDIMAP.CFG file naar de ReactOS SYSTEM directory en probeer het daarna weer." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Ongeldige MCI apparaat ID. Gebruik de teruggegeven ID als u dit MCI apparaat opent." @@ -66,7 +66,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "Het MCI apparaat dat u gebruikt ondersteund het gegeven commando niet." MCIERR_FILE_NOT_FOUND, "Kan het opgegeven bestand niet vinden. Zorg ervoor dat het pad en de bestandsnaam correct zijn." MCIERR_DEVICE_NOT_READY, "De apparaat driver is niet gereed." -MCIERR_INTERNAL, "Tijdens het initialiseren van MCI onstond een probleem. Probeer dit te verhelpen door Windows opnieuw te starten." +MCIERR_INTERNAL, "Tijdens het initialiseren van MCI onstond een probleem. Probeer dit te verhelpen door ReactOS opnieuw te starten." MCIERR_DRIVER, "Er is een probleem met de apparaat driver. Daarom is de driver afgesloten. Derhalve een toegangsfout." MCIERR_CANNOT_USE_ALL, "Kan 'all' niet gebruiken als apparaat naam bij het opgegeven commando." MCIERR_MULTIPLE, "In meer dan een apparaat zijn fouten opgetreden. Geef elk commando en apparaat apart om te achterhalen welke apparaten fouten veroorzaken." _____ Modified: trunk/reactos/lib/winmm/winmm_Pl.rc --- trunk/reactos/lib/winmm/winmm_Pl.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Pl.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "Nie mo?na odnalefµ mapowanie urz?dzenia MIDI. Mo?e to byµ spowodowane problemem ze sterownikiem albo brakiem lub uszkodzeniem pliku MIDIMAP.CFG." MIDIERR_NOTREADY, "Port przesy?a dane do urz?dzenia. Poczekaj, a? dane zostan? przes?ane i spr¾buj ponownie." MIDIERR_NODEVICE, "Bie??ce ustawienia mapowania MIDI odwo?uj? siÛ do urz?dzenia MIDI, kt¾re nie jest zainstalowane w systemie. U?yj Mapowania MIDI do edycji ustawie±." -MIDIERR_INVALIDSETUP, "Bie??ce ustawienia MIDI s? uszkodzone. Skopiuj oryginalny plik MIDIMAP.CFG do katalogu Windows SYSTEM, a nastÛpnie spr¾buj ponownie." +MIDIERR_INVALIDSETUP, "Bie??ce ustawienia MIDI s? uszkodzone. Skopiuj oryginalny plik MIDIMAP.CFG do katalogu ReactOS SYSTEM, a nastÛpnie spr¾buj ponownie." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Nieprawid?owy identyfikator urz?dzenia MCI. U?yj identyfikatora zwr¾conego podczas otwierania urz?dzenia MCI." @@ -66,7 +66,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "U?ywane urz?dzenie MCI nie obs?uguje okre£lonego polecenia." MCIERR_FILE_NOT_FOUND, "Nie mo?na znalefµ okre£lonego pliku. Sprawdf, czy £cie?ka i nazwa pliku s? poprawne." MCIERR_DEVICE_NOT_READY, "Sterownik urz?dzenia nie jest gotowy." -MCIERR_INTERNAL, "Wyst?pi? problem podczas inicjowania MCI. Spr¾buj uruchomiµ ponownie Windows." +MCIERR_INTERNAL, "Wyst?pi? problem podczas inicjowania MCI. Spr¾buj uruchomiµ ponownie ReactOS." MCIERR_DRIVER, "Wyst?pi? problem ze steronikiem tego urz?dzenia. Sterownik zosta? zamkniÛty. Nie ma dostÛpu do informacji o b?Ûdach." MCIERR_CANNOT_USE_ALL, "W okre£lonym poleceniu nie mo?na u?yµ parametru 'all' jako nazwy urz?dzenia." MCIERR_MULTIPLE, "Wyst?pi? b??d w wiÛcej ni? jednym urz?dzeniu. Okre£l ka?de polecenie i urz?dzenie oddzielnie, aby ustaliµ, kt¾re urz?dzenie spowodowa?o b?Ûdy." _____ Modified: trunk/reactos/lib/winmm/winmm_Pt.rc --- trunk/reactos/lib/winmm/winmm_Pt.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Pt.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -46,7 +46,7 @@ MIDIERR_NOMAP, "O mapa MIDI nÒo foi encontrado. Talvez seja um problema com o driver, ou o arquivo MIDIMAP.CFG pode estar corrompido ou faltando." MIDIERR_NOTREADY, "A porta estß transmitindo dados para o dispositivo. Aguarde atÚ os dados terminarem de ser transmitidos, e entÒo tente novamente." MIDIERR_NODEVICE, "A configuraþÒo atual do MIDI Mapper refere-se a um dispositivo MIDI que nÒo estß instalado no sistema. Use MIDI Mapper para editar a configuraþÒo." -MIDIERR_INVALIDSETUP, "A configuraþÒo atual do MIDI estß corrompida. Copie o arquivo original MIDIMAP.CFG para o diret¾rio Windows SYSTEM, e entÒo tente novamente." +MIDIERR_INVALIDSETUP, "A configuraþÒo atual do MIDI estß corrompida. Copie o arquivo original MIDIMAP.CFG para o diret¾rio ReactOS SYSTEM, e entÒo tente novamente." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "ID invßlido do dispositivo MCI. Use o ID retornado para abrir o dispositivo MCI." @@ -67,7 +67,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "O dispositivo MCI que vocÛ estß usando nÒo suporta o comando especificado." MCIERR_FILE_NOT_FOUND, "NÒo Ú possÝvel encontrar o arquivo especificado. Certifique-se que o caminho e o nome do arquivo estÒo corretos." MCIERR_DEVICE_NOT_READY, "O driver do dispositivo nÒo estß preparado." -MCIERR_INTERNAL, "Um problema ocorreu na inicializaþÒo do MCI. Tente reiniciar o Windows." +MCIERR_INTERNAL, "Um problema ocorreu na inicializaþÒo do MCI. Tente reiniciar o ReactOS." MCIERR_DRIVER, "Hß um problema com o driver do dispositivo. O driver foi fechado. NÒo Ú possÝvel acessar o erro." MCIERR_CANNOT_USE_ALL, "NÒo Ú possÝvel usar 'all' como nome do dispositivo com o comando especificado." MCIERR_MULTIPLE, "Erros ocorreram em mais de um dispositivo. Especifique cada comando e dispositivo separadamente para determinar quais dispositivos causaram o erro." _____ Modified: trunk/reactos/lib/winmm/winmm_Ru.rc --- trunk/reactos/lib/winmm/winmm_Ru.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Ru.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -47,7 +47,7 @@ MIDIERR_NOMAP, "?Ó?Ó (map) MIDI ÝÕ ÝÓÚõÕÝÓ. ?¯ þý¯µÝ¯, ²?¯ ¯°ÞßÛÓ õÓÚÔÕÓ, ÞÙÞ ¶ÓÚÙ MIDIMAP.CFG ¯?±¾?±?Ô¾Õ? ÞÙÞ ´¯ÔÕµõÕÝ." MIDIERR_NOTREADY, "¤¯? ´ÕÕõÓÕ? ÞÝ¶¯ýÓ÷Þ? Ô ¾±?¯Ú±?Ô¯. ¤¯õ¯µõÞ?Õ, ´¯ÛÓ ÞÝ¶¯ýÓ÷Þ ß¾õÕ? ´ÕÕõÓÝÓ Þ ´¯´¯ß¾Ú?Õ þÓÝ¯Ô¯." MIDIERR_NODEVICE, "ÊÕÛ¾¨ÞÕ ¾±?ÓÝ¯ÔÛÞ MIDI Mapper ±±¹ÙÓ??± ÝÓ ¾±?¯Ú±?Ô¯ MIDI, Û¯?¯¯Õ ÝÕ ¾±?ÓÝ¯ÔÙÕÝ¯ Ô ±Þ±?ÕýÕ. ?±´¯Ù³þ¾Ú?Õ MIDI Mapper õÙ ÕõÓÛ?Þ¯ÔÓÝÞ ¾±?ÓÝ¯Ô¯Û." -MIDIERR_INVALIDSETUP, "ÊÕÛ¾¨ÞÕ ¾±?ÓÝ¯ÔÛÞ MIDI ´¯ÔÕµõÕÝ¹. ÐÛ¯´Þ¾Ú?Õ Þ±§¯õÝ¹Ú ¶ÓÚÙ MIDIMAP.CFG Ô õÞÕÛ?¯Þ? Windows SYSTEM, Þ ´¯´¯ß¾Ú?Õ þÓÝ¯Ô¯." +MIDIERR_INVALIDSETUP, "ÊÕÛ¾¨ÞÕ ¾±?ÓÝ¯ÔÛÞ MIDI ´¯ÔÕµõÕÝ¹. ÐÛ¯´Þ¾Ú?Õ Þ±§¯õÝ¹Ú ¶ÓÚÙ MIDIMAP.CFG Ô õÞÕÛ?¯Þ? ReactOS SYSTEM, Þ ´¯´¯ß¾Ú?Õ þÓÝ¯Ô¯." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "?Õõ¯´¾±?Þý¹Ú Û¯õ ¾±?¯Ú±?ÔÓ MCI. ?±´¯ Ù³þ¾Ú?Õ Û¯õ, Ô¯þÔÓ¨ÕÝÝ¹Ú ´Þ ¯?Û¹?ÞÞ ¾±?¯Ú±?ÔÓ MCI." @@ -68,7 +68,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "?±´¯Ù³þ¾Õý¯Õ ÔÓýÞ ¾±?¯Ú±?Ô¯ MCI ÝÕ ´¯õõÕµÞÔÓÕ? ¾ÛÓþÓÝÝ¾? Û¯ýÓÝõ¾." MCIERR_FILE_NOT_FOUND, "?ÕÔ¯þý¯µÝ¯ ÝÓÚ?Þ ¾ÛÓþÓÝÝ¹Ú ¶ÓÚÙ. ËßÕõÞ?Õ±³ Ô ´ÓÔÞÙ³Ý¯±?Þ ´¾?Þ Þ ÞýÕÝÞ ¶ÓÚÙÓ." MCIERR_DEVICE_NOT_READY, "?ÓÚÔÕ ¾±?¯Ú±?ÔÓ ÝÕ Ò¯?¯Ô." -MCIERR_INTERNAL, "?°ÞßÛÓ ´Þ ÞÝÞ÷ÞÓÙÞþÓ÷ÞÞ MCI. ¤¯´¯ß¾ Ú?Õ ´ÕÕþÓ´¾±?Þ?³ Windows." +MCIERR_INTERNAL, "?°ÞßÛÓ ´Þ ÞÝÞ÷ÞÓÙÞþÓ÷ÞÞ MCI. ¤¯´¯ß¾ Ú?Õ ´ÕÕþÓ´¾±?Þ?³ ReactOS." MCIERR_DRIVER, "?°ÞßÛÓ Ô õÓÚÔÕÕ ¾±?¯Ú±?ÔÓ. ? ÓÚÔÕ þÓÛ¹?, ±¯¯ß¨ÕÝÞÕ ¯ß ¯°ÞßÛÕ ÝÕõ¯±?¾´Ý¯." MCIERR_CANNOT_USE_ALL, "?ÕÔ¯þý¯µÝ¯ Þ±´¯Ù³þ¯ÔÓ?³ 'all' Ô ÛÓ¸Õ±?ÔÕ ÞýÕÝÞ ¾±?¯Ú±?ÔÓ Ô ¾ÛÓþÓÝÝ¯Ú Û¯ýÓÝõÕ." MCIERR_MULTIPLE, "?°ÞßÛÞ Ô ÝÕ±Û¯Ù³ÛÞ§ ¾±?¯Ú±?ÔÓ§. ËÛÓµÞ?Õ ¯?õÕÙ³Ý¯ ÛÓµõ¾? Û¯ýÓÝõ¾ Þ ¾±?¯Ú±?Ô¯, ¸?¯ß¹ ¯´ÕõÕÙÞ?³, ÛÓÛÞÕ ¾± ?¯Ú±?ÔÓ Ô¹þ¹ÔÓÙÞ ¯°ÞßÛÞ." _____ Modified: trunk/reactos/lib/winmm/winmm_Si.rc --- trunk/reactos/lib/winmm/winmm_Si.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Si.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -46,7 +46,7 @@ MIDIERR_NOMAP, "Razporeditve MIDI ni mogo1e najti. To je lahko posledica te×av z gonilnikom, ali pa manjkajoÞ ali poÜkodovane datoteke MIDIMAP.CFG." MIDIERR_NOTREADY, "Prek vrat poteka prenos podatkov do naprave. PoÞakajte, da se prenos konÞa in poskusite znova." MIDIERR_NODEVICE, "Trenutna nastavitev MIDI se sklicuje na MIDI napravo, ki ni prisotna. Uporabite MIDI Mapper in spremenite nastavitve." -MIDIERR_INVALIDSETUP, "Trenutna nastavitev MIDI je poÜodovana. Namestite originalno datoteko MIDIMAP.CFG v sistemsko mapo Windows (System) in poskusite znova." +MIDIERR_INVALIDSETUP, "Trenutna nastavitev MIDI je poÜodovana. Namestite originalno datoteko MIDIMAP.CFG v sistemsko mapo ReactOS (System) in poskusite znova." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Neveljavna identifikacijska oznaka MCI naprave. Uporabite oznako, ki jo vrne odpiranje MCI naprave." @@ -67,7 +67,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "MCI naprava, ki jo uporabljate, ne podpira navedenega ukaza." MCIERR_FILE_NOT_FOUND, "Navedene datoteke ni mogoÞe najti. Preverite, ali ste pravilno vnesli ime in pot do datoteke." MCIERR_DEVICE_NOT_READY, "Gonilnik za napravo ni pripravljen. Malo poÞakajte in nato poskusite znova." -MCIERR_INTERNAL, "Pri inicializaciji MCI naprave je priÜlo do te×av. Znova za×enite Windows." +MCIERR_INTERNAL, "Pri inicializaciji MCI naprave je priÜlo do te×av. Znova za×enite ReactOS." MCIERR_DRIVER, "Zaradi napake, znaÞilne za gonilnik, je bil gonilnik zaprt. Ponovite ukaz." MCIERR_CANNOT_USE_ALL, "V tem ukazu uporabite ime toÞno doloÞene naprave." MCIERR_MULTIPLE, "V veÞ napravah je priÜlo do napak. LoÞeno vnesite vsak ukaz in vsako napravo. Tako boste lahko ugotovili, katere naprave povzroÞajo napake." _____ Modified: trunk/reactos/lib/winmm/winmm_Sk.rc --- trunk/reactos/lib/winmm/winmm_Sk.rc 2005-11-11 23:59:42 UTC (rev 19161) +++ trunk/reactos/lib/winmm/winmm_Sk.rc 2005-11-12 00:12:35 UTC (rev 19162) @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "A MIDI map was not found. There may be a problem with the driver, or the MIDIMAP.CFG file may be corrupt or missing." MIDIERR_NOTREADY, "The port is transmitting data to the device. Wait until the data has been transmitted, and then try again." MIDIERR_NODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use MIDI Mapper to edit the setup." -MIDIERR_INVALIDSETUP, "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the Windows SYSTEM directory, and then try again." +MIDIERR_INVALIDSETUP, "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the ReactOS SYSTEM directory, and then try again." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Invalid MCI device ID. Use the ID returned when opening the MCI device." @@ -66,7 +66,7 @@ MCIERR_UNSUPPORTED_FUNCTION, "The MCI device you are using does not support the specified command." MCIERR_FILE_NOT_FOUND, "Cannot find the specified file. Make sure the path and filename are correct." MCIERR_DEVICE_NOT_READY, "OvlßdaÞ zariadenia nie je pripraven²." -MCIERR_INTERNAL, "A problem occurred in initializing MCI. Try restarting Windows." +MCIERR_INTERNAL, "A problem occurred in initializing MCI. Try restarting ReactOS." MCIERR_DRIVER, "There is a problem with the device driver. The driver has closed. Cannot access error." MCIERR_CANNOT_USE_ALL, "Cannot use 'all' as the device name with the specified command." MCIERR_MULTIPLE, "Errors occurred in more than one device. Specify each command and device separately to determine which devices caused the error"

1 0

[greatlrd] 19161: fixed part of bug 910 change to ReactOS
by greatlrd＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed part of bug 910 change to ReactOS some need check the ja.rc if it right after this Modified: trunk/reactos/lib/cpl/sysdm/de.rc Modified: trunk/reactos/lib/cpl/sysdm/dk.rc Modified: trunk/reactos/lib/cpl/sysdm/en.rc Modified: trunk/reactos/lib/cpl/sysdm/nl.rc Modified: trunk/reactos/lib/cpl/sysdm/sv.rc _____ Modified: trunk/reactos/lib/cpl/sysdm/de.rc --- trunk/reactos/lib/cpl/sysdm/de.rc 2005-11-11 23:45:56 UTC (rev 19160) +++ trunk/reactos/lib/cpl/sysdm/de.rc 2005-11-11 23:59:42 UTC (rev 19161) @@ -24,7 +24,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Windows benutzt folgende Informationen im Sie im Netzwerk zu erkennen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "ReactOS benutzt folgende Informationen im Sie im Netzwerk zu erkennen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) LTEXT "Vollstõndiger Computername:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LA BELLINE(4)-4 LTEXT "(Default)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABEL LINE(4)-5 LTEXT "Arbeitsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17* PROPSHEETPADDING,LABELLINE(6)-6 _____ Modified: trunk/reactos/lib/cpl/sysdm/dk.rc --- trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-11 23:45:56 UTC (rev 19160) +++ trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-11 23:59:42 UTC (rev 19161) @@ -24,7 +24,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Reactos bruger f°lgende informationer til at identificere din computer pÕ netvµrket.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "ReactOS bruger f°lgende informationer til at identificere din computer pÕ netvµrket.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) LTEXT "Dit Fulde Computer Navn:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHEETPAD DING)-ICONSIZE,LABELLINE(4)-4 LTEXT "",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDIN G)-ICONSIZE,LABELLINE(4)-5 LTEXT "Arbejdsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PRO PSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6 _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-11 23:45:56 UTC (rev 19160) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-11 23:59:42 UTC (rev 19161) @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Windows uses the following information to identify your computer on the network.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "ReactOS uses the following information to identify your computer on the network.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) LTEXT "Full computer name:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABELLINE( 4)-4 LTEXT "(Default)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABEL LINE(4)-5 LTEXT "Workgroup:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROP SHEETPADDING,LABELLINE(6)-6 _____ Modified: trunk/reactos/lib/cpl/sysdm/nl.rc --- trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-11 23:45:56 UTC (rev 19160) +++ trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-11 23:59:42 UTC (rev 19161) @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Reactos gebruikt de volgende informatie om deze computer in het netwerk te identificeren.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "ReactOS gebruikt de volgende informatie om deze computer in het netwerk te identificeren.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) LTEXT "Volledige computernaam:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LA BELLINE(4)-4 LTEXT "(Default)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABEL LINE(4)-5 LTEXT "Werkgroep:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROP SHEETPADDING,LABELLINE(6)-6 _____ Modified: trunk/reactos/lib/cpl/sysdm/sv.rc --- trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-11 23:45:56 UTC (rev 19160) +++ trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-11 23:59:42 UTC (rev 19161) @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Windows anvõnder f÷ljande information f÷r att identifiera din dator pÕ nõtverket.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "ReactOS anvõnder f÷ljande information f÷r att identifiera din dator pÕ nõtverket.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) LTEXT "Fullstõndigt datornamn:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(4)-4 LTEXT "",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDIN G)-ICONSIZE,LABELLINE(4)-5 LTEXT "Arbetsgrupp:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PROPS HEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6

1 0

[hpoussin] 19160: Stream all keyboard port events to the same keyboard class
by hpoussin＠svn.reactos.com 11 Nov '05

11 Nov '05

Stream all keyboard port events to the same keyboard class Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-11 23:33:07 UTC (rev 19159) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-11 23:45:56 UTC (rev 19160) @@ -579,6 +579,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000 ,"system32\drivers\kbdclass.sys" HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMu ltiplePorts",0x00010001,1 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08 002BE10318}","UpperFilters",0x00010000,"kbdclass" ; SB16 driver

1 0

[cwittich] 19159: add some more info for services in msconfig (if req, vendor)
by cwittich＠svn.reactos.com 11 Nov '05

11 Nov '05

add some more info for services in msconfig (if req, vendor) Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml Modified: trunk/reactos/subsys/system/msconfig/srvpage.c _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-11 23:26:19 UTC (rev 19158) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-11 23:33:07 UTC (rev 19159) @@ -8,6 +8,7 @@ <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> <library>user32</library> + <library>version</library> <library>comctl32</library> <library>shell32</library> <file>toolspage.c</file> _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-11 23:26:19 UTC (rev 19158) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-11 23:33:07 UTC (rev 19159) @@ -62,20 +62,31 @@ GetServices ( void ) { LV_ITEM item; + WORD wCodePage; + WORD wLangID; SC_HANDLE ScHandle; - DWORD BufSize = 0; + SC_HANDLE hService; DWORD BytesNeeded = 0; DWORD ResumeHandle = 0; DWORD NumServices = 0; + DWORD dwHandle, dwLen; size_t Index; + UINT BufLen; TCHAR szStatus[128]; + TCHAR* lpData; + TCHAR* lpBuffer; + TCHAR szStrFileInfo[80]; + TCHAR FileName[MAX_PATH]; + LPVOID pvData; + LPSERVICE_FAILURE_ACTIONS pServiceFailureActions = NULL; + LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; ScHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); if (ScHandle != INVALID_HANDLE_VALUE) { - if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, (LPBYTE)pServiceStatus, BufSize, &BytesNeeded, &NumServices, &ResumeHandle, 0) == 0) + if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, (LPBYTE)pServiceStatus, 0, &BytesNeeded, &NumServices, &ResumeHandle, 0) == 0) { /* Call function again if required size was returned */ if (GetLastError() == ERROR_MORE_DATA) @@ -110,19 +121,100 @@ item.lParam = 0; item.iItem = ListView_InsertItem(hServicesListCtrl, &item); - /* FIXME - if (QueryServiceConfig2(ScHandle, SERVICE_CONFIG_FAILURE_ACTIONS, ) == 0) + BytesNeeded = 0; + hService = OpenService(ScHandle, pServiceStatus[Index].lpServiceName, SC_MANAGER_CONNECT); + if (hService != INVALID_HANDLE_VALUE) { - if (GetLastError() == ERROR_MORE_DATA) + /* check if service is required by the system*/ + if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, 0, &BytesNeeded)) { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pServiceFailureActions = (LPSERVICE_FAILURE_ACTIONS) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceFailureActions == NULL) + return; + if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, BytesNeeded, &BytesNeeded)) + { + HeapFree(GetProcessHeap(), 0, pServiceFailureActions); + return; + } + } + else /* exit on failure */ + { + return; + } } + if (pServiceFailureActions->cActions) + { + if (pServiceFailureActions->lpsaActions[0].Type == SC_ACTION_REBOOT) + { + LoadString(hInst, IDS_YES, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 1; + SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + } + + /* get vendor of service binary */ + BytesNeeded = 0; + if (!QueryServiceConfig(hService, pServiceConfig, 0, &BytesNeeded)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceConfig == NULL) + return; + + if (!QueryServiceConfig(hService, pServiceConfig, BytesNeeded, &BytesNeeded)) + { + HeapFree(GetProcessHeap(), 0, pServiceConfig); + return; + } + } + else /* exit on failure */ + { + return; + } + } + + memset(&FileName, 0, MAX_PATH); + if (_tcscspn(pServiceConfig->lpBinaryPathName, _T("\""))) + { + _tcsncpy(FileName, pServiceConfig->lpBinaryPathName, _tcscspn(pServiceConfig->lpBinaryPathName, _T(" ")) ); + } + else + { + _tcscpy(FileName, pServiceConfig->lpBinaryPathName); + } + + dwLen = GetFileVersionInfoSize(FileName, &dwHandle); + if (dwLen) + { + lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); + if (lpData == NULL) + return; + + if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { + HeapFree(GetProcessHeap(), 0, lpData); + return; + } + + if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), &pvData, (PUINT) &BufLen)) + { + wCodePage = LOWORD(*(DWORD*) pvData); + wLangID = HIWORD(*(DWORD*) pvData); + wsprintf(szStrFileInfo, _T("StringFileInfo\\%04X%04X\\CompanyName"), wCodePage, wLangID); + } + + if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) { + item.pszText = lpBuffer; + item.iSubItem = 2; + SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + } + CloseServiceHandle(hService); } - LoadString(hInst, ( CONDITION ? IDS_YES : IDS_NO), szStatus, 128); - item.pszText = szStatus; - item.iSubItem = 1; - SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - */ LoadString(hInst, ((pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_STOPPED) ? IDS_SERVICES_STATUS_STOPPED : IDS_SERVICES_STATUS_RUNNING), szStatus, 128); item.pszText = szStatus; @@ -132,6 +224,9 @@ } } + HeapFree(GetProcessHeap(), 0, pServiceStatus); + HeapFree(GetProcessHeap(), 0, pServiceConfig); + HeapFree(GetProcessHeap(), 0, pServiceFailureActions); CloseServiceHandle(ScHandle); }

1 0

[sedwards] 19158: fix a few more makefiles
by sedwards＠svn.reactos.com 11 Nov '05

11 Nov '05

fix a few more makefiles Modified: trunk/rosapps/tests/accelerator/accelerator.xml Modified: trunk/rosapps/tests/alive/alive.xml Modified: trunk/rosapps/tests/alphablend/alphablend.xml Modified: trunk/rosapps/tests/apc/apc.xml Modified: trunk/rosapps/tests/apc2/apc2.xml Modified: trunk/rosapps/tests/args/args.xml Modified: trunk/rosapps/tests/atomtest/atomtest.xml Modified: trunk/rosapps/tests/bench/bench.xml Modified: trunk/rosapps/tests/bitblt/bitblt.xml Modified: trunk/rosapps/tests/button/button.xml Modified: trunk/rosapps/tests/button2/button2.xml Modified: trunk/rosapps/tests/capclock/capclock.xml Modified: trunk/rosapps/tests/carets/carets.xml Modified: trunk/rosapps/tests/consume/consume.xml Modified: trunk/rosapps/tests/dibtest/dibtest.xml Modified: trunk/rosapps/tests/dirdlg/dirdlg.xml Modified: trunk/rosapps/tests/diskspeed/diskspeed.xml Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml Modified: trunk/rosapps/tests/enhmetafile/enhmetafile.xml Modified: trunk/rosapps/tests/enumfonts/enumfonts.xml Modified: trunk/rosapps/tests/enumwnd/enumwnd.xml Modified: trunk/rosapps/tests/enumws/enumws.xml Modified: trunk/rosapps/tests/event/event.xml Modified: trunk/rosapps/tests/eventpair/eventpair.xml Modified: trunk/rosapps/tests/fiber/fiber.xml Modified: trunk/rosapps/tests/gethostbyname/gethostbyname.xml Modified: trunk/rosapps/tests/global_mem/global_mem.xml Modified: trunk/rosapps/tests/gradient/gradient.xml Modified: trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml Modified: trunk/rosapps/tests/hello/hello.xml Modified: trunk/rosapps/tests/hivetest/hivetest.xml Modified: trunk/rosapps/tests/icontest/icontest.xml Modified: trunk/rosapps/tests/iptest/iptest.xml Modified: trunk/rosapps/tests/isotest/isotest.xml Modified: trunk/rosapps/tests/lantst/lantest.xml Modified: trunk/rosapps/tests/lineclip/lineclip.xml Modified: trunk/rosapps/tests/linetest/linetest.xml Modified: trunk/rosapps/tests/lpctst/lpctst.xml Modified: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml Modified: trunk/rosapps/tests/mdi/mdi.xml Modified: trunk/rosapps/tests/miditest/miditest.xml Modified: trunk/rosapps/tests/mktime/mktime.xml Modified: trunk/rosapps/tests/moztest/moztest.xml Modified: trunk/rosapps/tests/mstest/mstest.xml Modified: trunk/rosapps/tests/multithrdwin/multithrdwin.xml Modified: trunk/rosapps/tests/multiwin/multiwin.xml Modified: trunk/rosapps/tests/mutex/mutex.xml Modified: trunk/rosapps/tests/nameserverlist/nameserverlist.xml Modified: trunk/rosapps/tests/noexecute/noexecute.xml Modified: trunk/rosapps/tests/wclickat/wclickat.xml Modified: trunk/rosapps/tests/wpickclick/wpickclick.xml _____ Modified: trunk/rosapps/tests/accelerator/accelerator.xml --- trunk/rosapps/tests/accelerator/accelerator.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/accelerator/accelerator.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -2,9 +2,7 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - <file>accelerator.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/alive/alive.xml --- trunk/rosapps/tests/alive/alive.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/alive/alive.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -2,9 +2,7 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - <file>alive.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/alphablend/alphablend.xml --- trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -2,9 +2,7 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - <file>alphablend.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/apc/apc.xml --- trunk/rosapps/tests/apc/apc.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/apc/apc.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -4,4 +4,4 @@ <define name="__USE_W32API" /> <library>kernel32</library> <file>apc.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/apc2/apc2.xml --- trunk/rosapps/tests/apc2/apc2.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/apc2/apc2.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -4,4 +4,4 @@ <define name="__USE_W32API" /> <library>kernel32</library> <file>apc2.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/args/args.xml --- trunk/rosapps/tests/args/args.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/args/args.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -4,4 +4,4 @@ <define name="__USE_W32API" /> <library>kernel32</library> <file>args.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/atomtest/atomtest.xml --- trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>atomtest.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/bench/bench.xml --- trunk/rosapps/tests/bench/bench.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/bench/bench.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>bench.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/bitblt/bitblt.xml --- trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>bitblt.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/button/button.xml --- trunk/rosapps/tests/button/button.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/button/button.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>button.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/button2/button2.xml --- trunk/rosapps/tests/button2/button2.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/button2/button2.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>button2.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/capclock/capclock.xml --- trunk/rosapps/tests/capclock/capclock.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/capclock/capclock.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>capclock.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/carets/carets.xml --- trunk/rosapps/tests/carets/carets.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/carets/carets.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>carets.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/consume/consume.xml --- trunk/rosapps/tests/consume/consume.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/consume/consume.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -6,3 +6,4 @@ <library>gdi32</library> <file>consume.c</file> </module> + _____ Modified: trunk/rosapps/tests/dibtest/dibtest.xml --- trunk/rosapps/tests/dibtest/dibtest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/dibtest/dibtest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -2,9 +2,7 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - <file>dibtest.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/dirdlg/dirdlg.xml --- trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>dirdlg.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/diskspeed/diskspeed.xml --- trunk/rosapps/tests/diskspeed/diskspeed.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/diskspeed/diskspeed.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -5,4 +5,4 @@ <library>kernel32</library> <library>gdi32</library> <file>diskspeed.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml --- trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,8 +1,8 @@ -<module name="dnsapi" type="win32gui" installbase="bin" installname="dnsapi.exe"> +<module name="dnsapitst" type="win32gui" installbase="bin" installname="dnsapitst.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>dnsapi.c</file> + <file>dnsapitst.c</file> </module> _____ Modified: trunk/rosapps/tests/enhmetafile/enhmetafile.xml --- trunk/rosapps/tests/enhmetafile/enhmetafile.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/enhmetafile/enhmetafile.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,8 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="enhmetafile" type="win32gui" installbase="bin" installname="enhmetafile.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>alphablend.c</file> + <file>enhmetafile.c</file> </module> _____ Modified: trunk/rosapps/tests/enumfonts/enumfonts.xml --- trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>enumfonts.c</file> +</module> _____ Modified: trunk/rosapps/tests/enumwnd/enumwnd.xml --- trunk/rosapps/tests/enumwnd/enumwnd.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/enumwnd/enumwnd.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="enumwnd" type="win32gui" installbase="bin" installname="enumwnd.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>enumwnd.c</file> +</module> _____ Modified: trunk/rosapps/tests/enumws/enumws.xml --- trunk/rosapps/tests/enumws/enumws.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/enumws/enumws.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="enumws" type="win32gui" installbase="bin" installname="enumws.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>enumws.c</file> +</module> _____ Modified: trunk/rosapps/tests/event/event.xml --- trunk/rosapps/tests/event/event.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/event/event.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="event" type="win32gui" installbase="bin" installname="event.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>event.c</file> +</module> _____ Modified: trunk/rosapps/tests/eventpair/eventpair.xml --- trunk/rosapps/tests/eventpair/eventpair.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/eventpair/eventpair.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="eventpair" type="win32gui" installbase="bin" installname="eventpair.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>eventpair.c</file> +</module> _____ Modified: trunk/rosapps/tests/fiber/fiber.xml --- trunk/rosapps/tests/fiber/fiber.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/fiber/fiber.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="fiber" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="fiber" type="win32gui" installbase="bin" installname="fiber.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - <file>fiber.c</file> -</module> \ No newline at end of file +</module> _____ Modified: trunk/rosapps/tests/gethostbyname/gethostbyname.xml --- trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="gethostbyname" type="win32gui" installbase="bin" installname="gethostbyname.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>gethostbyname.c</file> +</module> _____ Modified: trunk/rosapps/tests/global_mem/global_mem.xml --- trunk/rosapps/tests/global_mem/global_mem.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/global_mem/global_mem.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="global_mem" type="win32gui" installbase="bin" installname="global_mem.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>global_mem.c</file> +</module> _____ Modified: trunk/rosapps/tests/gradient/gradient.xml --- trunk/rosapps/tests/gradient/gradient.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/gradient/gradient.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="gradient" type="win32gui" installbase="bin" installname="gradient.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>gradient.c</file> +</module> _____ Modified: trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml --- trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="guithreadinfo" type="win32gui" installbase="bin" installname="guithreadinfo.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>guithreadinfo.c</file> +</module> _____ Modified: trunk/rosapps/tests/hello/hello.xml --- trunk/rosapps/tests/hello/hello.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/hello/hello.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="hello" type="win32gui" installbase="bin" installname="hello.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>hello.c</file> +</module> _____ Modified: trunk/rosapps/tests/hivetest/hivetest.xml --- trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>hivetest.c</file> +</module> _____ Modified: trunk/rosapps/tests/icontest/icontest.xml --- trunk/rosapps/tests/icontest/icontest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/icontest/icontest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="icontest" type="win32gui" installbase="bin" installname="icontest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>icontest.c</file> +</module> _____ Modified: trunk/rosapps/tests/iptest/iptest.xml --- trunk/rosapps/tests/iptest/iptest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/iptest/iptest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="iptest" type="win32gui" installbase="bin" installname="iptest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>iptest.c</file> +</module> _____ Modified: trunk/rosapps/tests/isotest/isotest.xml --- trunk/rosapps/tests/isotest/isotest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/isotest/isotest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="isotest" type="win32gui" installbase="bin" installname="isotest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>isotest.c</file> +</module> _____ Modified: trunk/rosapps/tests/lantst/lantest.xml --- trunk/rosapps/tests/lantst/lantest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/lantst/lantest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="lantest" type="win32gui" installbase="bin" installname="lantest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>lantest.c</file> +</module> _____ Modified: trunk/rosapps/tests/lineclip/lineclip.xml --- trunk/rosapps/tests/lineclip/lineclip.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/lineclip/lineclip.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="lineclip" type="win32gui" installbase="bin" installname="lineclip.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>lineclip.c</file> +</module> _____ Modified: trunk/rosapps/tests/linetest/linetest.xml --- trunk/rosapps/tests/linetest/linetest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/linetest/linetest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="linetest" type="win32gui" installbase="bin" installname="linetest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>linetest.c</file> +</module> _____ Modified: trunk/rosapps/tests/lpctst/lpctst.xml --- trunk/rosapps/tests/lpctst/lpctst.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/lpctst/lpctst.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="lpctst" type="win32gui" installbase="bin" installname="lpctst.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>lpctst.c</file> +</module> _____ Modified: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml --- trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="map_dup_inherit" type="win32gui" installbase="bin" installname="map_dup_inherit.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>map_dup_inherit</file> +</module> _____ Modified: trunk/rosapps/tests/mdi/mdi.xml --- trunk/rosapps/tests/mdi/mdi.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/mdi/mdi.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="mdi" type="win32gui" installbase="bin" installname="mdi.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>mdi.c</file> +</module> _____ Modified: trunk/rosapps/tests/miditest/miditest.xml --- trunk/rosapps/tests/miditest/miditest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/miditest/miditest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="miditest" type="win32gui" installbase="bin" installname="miditest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>miditest.c</file> +</module> _____ Modified: trunk/rosapps/tests/mktime/mktime.xml --- trunk/rosapps/tests/mktime/mktime.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/mktime/mktime.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="mktime" type="win32gui" installbase="bin" installname="mktime.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>mktime.c</file> +</module> _____ Modified: trunk/rosapps/tests/moztest/moztest.xml --- trunk/rosapps/tests/moztest/moztest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/moztest/moztest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="moztest" type="win32gui" installbase="bin" installname="moztest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>moztest.c</file> +</module> _____ Modified: trunk/rosapps/tests/mstest/mstest.xml --- trunk/rosapps/tests/mstest/mstest.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/mstest/mstest.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="mstest" type="win32gui" installbase="bin" installname="mstest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>mstest.c</file> +</module> _____ Modified: trunk/rosapps/tests/multithrdwin/multithrdwin.xml --- trunk/rosapps/tests/multithrdwin/multithrdwin.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/multithrdwin/multithrdwin.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="multithrdwin" type="win32gui" installbase="bin" installname="multithrdwin.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>multithrdwin.c</file> +</module> _____ Modified: trunk/rosapps/tests/multiwin/multiwin.xml --- trunk/rosapps/tests/multiwin/multiwin.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/multiwin/multiwin.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="multiwin" type="win32gui" installbase="bin" installname="multiwin.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>multiwin.c</file> +</module> _____ Modified: trunk/rosapps/tests/mutex/mutex.xml --- trunk/rosapps/tests/mutex/mutex.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/mutex/mutex.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="mutex" type="win32gui" installbase="bin" installname="mutex.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>mutex.c</file> +</module> _____ Modified: trunk/rosapps/tests/nameserverlist/nameserverlist.xml --- trunk/rosapps/tests/nameserverlist/nameserverlist.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/nameserverlist/nameserverlist.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="nameserverlist" type="win32gui" installbase="bin" installname="nameserverlist.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>nameserverlist.c</file> +</module> _____ Modified: trunk/rosapps/tests/noexecute/noexecute.xml --- trunk/rosapps/tests/noexecute/noexecute.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/noexecute/noexecute.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="noexecute" type="win32gui" installbase="bin" installname="noexecute.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>noexecute.c</file> +</module> _____ Modified: trunk/rosapps/tests/wclickat/wclickat.xml --- trunk/rosapps/tests/wclickat/wclickat.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/wclickat/wclickat.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,9 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="wclickat" type="win32gui" installbase="bin" installname="wclickat.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> + <file>wclickat.c</file> +</module> - <file>alphablend.c</file> -</module> \ No newline at end of file _____ Modified: trunk/rosapps/tests/wpickclick/wpickclick.xml --- trunk/rosapps/tests/wpickclick/wpickclick.xml 2005-11-11 23:01:05 UTC (rev 19157) +++ trunk/rosapps/tests/wpickclick/wpickclick.xml 2005-11-11 23:26:19 UTC (rev 19158) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="wpickclick" type="win32gui" installbase="bin" installname="wpickclick.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <library>kernel32</library> <library>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>wpickclick.c</file> +</module>

1 0

[turner] 19157: add devmgr.exe to the bootcd
by turner＠svn.reactos.com 11 Nov '05

11 Nov '05

add devmgr.exe to the bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-11 22:56:41 UTC (rev 19156) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-11 23:01:05 UTC (rev 19157) @@ -171,6 +171,7 @@ subsys\system\autochk\autochk.exe 1 subsys\system\calc\calc.exe 1 subsys\system\cmd\cmd.exe 1 +subsys\system\devmgr\devmgr.exe 1 subsys\system\explorer\explorer.exe 4 subsys\system\explorer\explorer-cfg-template.xml 4 subsys\system\explorer\notifyhook\notifyhook.dll 1

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