Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70121: [WINMINE] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 22:42:12 2015 New Revision: 70121 URL: http://svn.reactos.org/svn/reactos?rev=70121&view=rev Log: [WINMINE] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/base/applications/games/winmine/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Thu Nov 26 22:42:12 2015 @@ -79,38 +79,31 @@ RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( !RegQueryValueExW( hkey, xposW, NULL, &type, - (LPBYTE) &p_board->pos.x, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( !RegQueryValueExW( hkey, yposW, NULL, &type, - (LPBYTE) &p_board->pos.y, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( !RegQueryValueExW( hkey, heightW, NULL, &type, - (LPBYTE) &p_board->rows, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( !RegQueryValueExW( hkey, widthW, NULL, &type, - (LPBYTE) &p_board->cols, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( !RegQueryValueExW( hkey, minesW, NULL, &type, - (LPBYTE) &p_board->mines, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( !RegQueryValueExW( hkey, difficultyW, NULL, &type, - (LPBYTE) &p_board->difficulty, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( !RegQueryValueExW( hkey, markW, NULL, &type, - (LPBYTE) &p_board->IsMarkQ, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { @@ -126,8 +119,7 @@ for( i = 0; i < 3; i++ ) { wsprintfW( key_name, timeW, i+1 ); size = sizeof( p_board->best_time[i] ); - if( !RegQueryValueExW( hkey, key_name, NULL, &type, - (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) ) p_board->best_time[i] = 999; } RegCloseKey( hkey ); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 26 22:42:12 2015 @@ -234,7 +234,7 @@ reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.47 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.47 -reactos/base/applications/games/winmine # Synced to WineStaging-1.7.47 with our own resources. +reactos/base/applications/games/winmine # Synced to WineStaging-1.7.55 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-1.7.47 reactos/base/applications/iexplore # Synced to WineStaging-1.7.47 reactos/base/applications/notepad # Forked at Wine-20041201

1 0

[akhaldi] 70120: [REG_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 22:37:25 2015 New Revision: 70120 URL: http://svn.reactos.org/svn/reactos?rev=70120&view=rev Log: [REG_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/reg/reg.c Modified: trunk/rostests/winetests/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/reg/reg.c?rev=7… ============================================================================== --- trunk/rostests/winetests/reg/reg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/reg/reg.c [iso-8859-1] Thu Nov 26 22:37:25 2015 @@ -110,12 +110,12 @@ /* Test empty type */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\" /d WineTest /f", &r); - ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), + todo_wine ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %u\n", r); if (r == REG_EXIT_SUCCESS) - verify_reg(hkey, "emptyType", REG_SZ, "", 1, 0); - else - win_skip("broken reg.exe detected\n"); + todo_wine verify_reg(hkey, "emptyType", REG_SZ, "", 1, 0); + else + todo_wine win_skip("broken reg.exe detected\n"); /* Test input key formats */ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); @@ -154,7 +154,7 @@ /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); - verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); + verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, TODO_REG_SIZE); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); @@ -171,7 +171,7 @@ run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "", 1, 0); + verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -179,7 +179,7 @@ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test2", REG_SZ, "", 1, 0); + verify_reg(hkey, "test2", REG_SZ, "", 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -188,23 +188,23 @@ /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, 0); + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand1 /t REG_EXpand_sz /d \"dead^%PATH^%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, 0); + verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, 0); + verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, 0); + verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); + verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); @@ -217,11 +217,11 @@ verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin4 /f /d DeAdBeEf0DD", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -254,14 +254,14 @@ win_skip("broken reg.exe detected\n"); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 0\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword5 /t reg_dword /d 12345678 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -275,21 +275,22 @@ ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); - ok(dword == 123 || broken(dword == 0123 /* WinXP */), + todo_wine ok(dword == 123 || broken(dword == 0123 /* WinXP */), "got wrong data %d, expected %d\n", dword, 123); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0xdeadbeef; - verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), + (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r); @@ -304,7 +305,7 @@ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); dword = 456; - verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like * an ordinary REG_DWORD - that is little endian. GG */ @@ -312,41 +313,41 @@ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); memcpy(buffer, "three\0little\0strings\0", 22); - verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, 0); + verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, 0); + verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, 0); + verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, 0); + verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, 0); + verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s \"\\0\" /d \"three\\0little\\0strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); buffer[0]='a'; buffer[1]=0; buffer[2]=0; - verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, 0); + verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); RegCloseKey(hkey); @@ -388,7 +389,7 @@ run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -423,7 +424,10 @@ return; } - test_add(); + if (!winetest_interactive) + skip("ROSTESTS-200: Skipping test_add because of exceptions in Cm.\n"); + else + test_add(); test_delete(); test_query(); }

1 0

[akhaldi] 70119: [REG] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 22:37:06 2015 New Revision: 70119 URL: http://svn.reactos.org/svn/reactos?rev=70119&view=rev Log: [REG] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/reg/reg.c trunk/reactos/base/applications/cmdutils/reg/reg.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -1,6 +1,9 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) add_executable(reg reg.c reg.rc) set_module_type(reg win32cui UNICODE) target_link_libraries(reg wine) -add_importlibs(reg advapi32 user32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll) add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "ÐÑÐµÑÐºÐ°: ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸Ñ ÑÐµÐ´\n" STRING_NO_REMOTE, "ÐÑÐµÑÐºÐ°: ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²ÑÐ½Ðµ Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ðµ Ð² Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½Ð°ÑÐ° Ð¼Ð°ÑÐ¸Ð½Ð°\n" STRING_CANNOT_FIND, "ÐÑÐµÑÐºÐ°: Ð£ÑÐµÐ´Ð±Ð°ÑÐ° Ð½Ðµ Ð¾ÑÐºÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐµÐ½ ÐºÐ»ÑÑ Ð¸Ð»Ð¸ ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -16,7 +16,5 @@ STRING_INVALID_CMDLINE, "Chyba: NeplatnÃ© parametry pÅÃkazovÃ© ÅÃ¡dky\n" STRING_NO_REMOTE, "Chyba: Nelze pÅidat klÃÄe na vzdÃ¡lenÃ½ stroj\n" STRING_CANNOT_FIND, "Chyba: SystÃ©m nenalezl zadanÃ½ klÃÄ nebo hodnotu registru\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n" STRING_NO_REMOTE, "Fejl: Kunne ikke tilfÃ¸je nÃ¸gler til fjern maskinen\n" STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nÃ¸gle eller vÃ¦rdi\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Fehler: UngÃ¼ltige Befehlszeilenargumente\n" STRING_NO_REMOTE, "Fehler: Konnte SchlÃ¼ssel nicht zum entfernten Rechner hinzufÃ¼gen\n" STRING_CANNOT_FIND, "Fehler: Der angegebene SchlÃ¼ssel oder Wert konnte nicht gefunden werden\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n" STRING_NO_REMOTE, "Error: Unable to access remote machine\n" STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry key or value\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Error: parÃ¡metros en lÃnea de comandos no vÃ¡lidos\n" STRING_NO_REMOTE, "Error: No se pueden agregar las claves al equipo remoto\n" STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n" - STRING_ERROR, "Error inesperado: " STRING_UNSUPPORTED_TYPE, "Error: Tipo no soportado\n" - STRING_INVALID_DWORD, "Error: /d debe de ser un nÃºmero positivo\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "ErreurÂ : paramÃ¨tre de ligne de commande non valable\n" STRING_NO_REMOTE, "ErreurÂ : impossible d'ajouter des clÃ©s Ã une machine distante\n" STRING_CANNOT_FIND, "ErreurÂ : le systÃ¨me n'a pas pu trouver la clÃ© ou la valeur de registre spÃ©cifiÃ©e\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n" STRING_NO_REMOTE, "Errore: impossibile aggiungere chiavi alla macchina remota\n" STRING_CANNOT_FIND, "Errore: il sistema non Ã¨ riuscito a trovare la chiave di registro o il valore specificati\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "ã¨ã©ã¼: ã³ãã³ã ã©ã¤ã³å¼æ°ãç¡å¹ã§ã\n" STRING_NO_REMOTE, "ã¨ã©ã¼: ãªã¢ã¼ã ãã·ã³ã«ãã¼ãè¿½å ã§ãã¾ããã§ãã\n" STRING_CANNOT_FIND, "ã¨ã©ã¼: ã·ã¹ãã ã¯æå®ããããã¼ã¾ãã¯å¤ãè¦ã¤ãããã¾ããã§ãã\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "ìë¬:ì¬ë°ë¥´ì§ ìì ëªë ¹ë¼ì¸ ë§¤ê°ë³ì\n" STRING_NO_REMOTE, "ìë¬: ìê²© ë¨¸ì ì í¤ë¥¼ ëíë ê²ì ê°ë¥íì§ ììµëë¤\n" STRING_CANNOT_FIND, "ìë¬: ì´ ìì¤íìì ì§ì ë ë ì§ì¤í¸ë¦¬ í¤ë ê°ì ì°¾ìì ììµëë¤\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Klaida: Netinkami komandos eilutÄs parametrai\n" STRING_NO_REMOTE, "Klaida: Negalima pridÄti raktÅ³ nuotoliniame kompiuteryje\n" STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikÅ¡mÄs\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n" STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Feil: Ugyldige parametere pÃ¥ kommandolinjen\n" STRING_NO_REMOTE, "Feil: Kan ikke legge til nÃ¸kler pÃ¥ ekstern maskin\n" STRING_CANNOT_FIND, "Feil: Systemet klarte ikke finne den angitte registernÃ¸kkelen eller -verdien\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "BÅÄd: NiewÅaÅciwe parametry wiersza poleceÅ\n" STRING_NO_REMOTE, "BÅÄd: Nie moÅ¼na dodaÄ kluczy do zdalnej maszyny\n" STRING_CANNOT_FIND, "BÅÄd: System nie mÃ³gÅ znaleÅºÄ podanej wartoÅci lub klucza rejestru\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Erro: ParÃ¢metros da linha de comandos invÃ¡lidos\n" STRING_NO_REMOTE, "Erro: Incapaz de adicionar chaves Ã mÃ¡quina remota\n" STRING_CANNOT_FIND, "Erro: O sistema foi incapaz de encontrar a chave de registo ou valor especificado\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -17,7 +17,5 @@ STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandÄ\n" STRING_NO_REMOTE, "Eroare: Nu se pot adÄuga chei pe calculatorul de la distanÈÄ\n" STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut gÄsi cheia sau valoarea de registru specificatÄ\n" - STRING_ERROR, "Eroare neaÈteptatÄ: " STRING_UNSUPPORTED_TYPE, "Eroare: Tip nerecunoscut\n" - STRING_INVALID_DWORD, "Eroare: /d trebuie sÄ fie numÄr pozitiv\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸\n" STRING_NO_REMOTE, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐºÐ»ÑÑÐ¸ Ð½Ð° ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¼Ð°ÑÐ¸Ð½Ðµ\n" STRING_CANNOT_FIND, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÐºÐ»ÑÑ ÑÐµÐµÑÑÑÐ° Ð¸Ð»Ð¸ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ\n" - STRING_ERROR, "ÐÐµÐ¿ÑÐµÐ´Ð²Ð¸Ð´ÐµÐ½Ð½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°: " STRING_UNSUPPORTED_TYPE, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÑÐ¸Ð¿\n" - STRING_INVALID_DWORD, "ÐÑÐ¸Ð±ÐºÐ°: /d Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±ÑÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼ ÑÐ¸ÑÐ»Ð¾Ð¼\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Napaka: NapaÄen parameter v ukazni vrstici\n" STRING_NO_REMOTE, "Napaka: Na morem dodati kljuÄa na oddaljen raÄunalnik\n" STRING_CANNOT_FIND, "Napaka: Sistem ni naÅ¡el zahtevanega kljuÄa ali vrednosti\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -15,7 +15,5 @@ STRING_INVALID_CMDLINE, "Error: Parametrat e pavlefshme ne vijÃ«n komanduse\n" STRING_NO_REMOTE, "Error: NÃ« pamundÃ«si pÃ«r tÃ« shtuar Ã§elÃ«sat nÃ« makinÃ« nÃ« distancÃ«\n" STRING_CANNOT_FIND, "Error: Sistemi nuk ishte nÃ« gjendje pÃ«r tÃ« gjetur Ã§elÃ«sat tÃ« caktuar tÃ« regjistrit ose vlerÃ«s\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "Fel: ogiltiga kommandoradsparametrar\n" STRING_NO_REMOTE, "Fel: Kan inte lÃ¤gga till nycklar till fjÃ¤rrmaskin\n" STRING_CANNOT_FIND, "Fel: Systemet kunde inte hitta angiven nyckel eller vÃ¤rde i registret\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -13,7 +13,5 @@ STRING_INVALID_CMDLINE, "YanlÄ±ÅlÄ±k: GeÃ§ersiz komut yatacÄ± deÄiÅkenleri\n" STRING_NO_REMOTE, "YanlÄ±ÅlÄ±k: Uzak makineye eriÅilemez\n" STRING_CANNOT_FIND, "YanlÄ±ÅlÄ±k: Dizge belirtilen deÄer defteri dizinini ya da deÄerini bulamadÄ±\n" - STRING_ERROR, "Beklenmeyen yanlÄ±ÅlÄ±k: " STRING_UNSUPPORTED_TYPE, "YanlÄ±ÅlÄ±k: Desteklenmeyen tÃ¼r\n" - STRING_INVALID_DWORD, "YanlÄ±ÅlÄ±k: /d artÄ± sayÄ± olmalÄ±\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -11,7 +11,5 @@ STRING_INVALID_CMDLINE, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ°\n" STRING_NO_REMOTE, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð´Ð¾Ð´Ð°ÑÐ¸ ÐºÐ»ÑÑÑ Ð½Ð° Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½ÑÐ¹ Ð¼Ð°ÑÐ¸Ð½Ñ\n" STRING_CANNOT_FIND, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ ÐºÐ»ÑÑ ÑÐµÑÑÑÑÑ ÑÐ¸ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ\n" - STRING_ERROR, "Unexpected error: " STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" - STRING_INVALID_DWORD, "Error: /d must be positive number\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -29,13 +29,6 @@ #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) -#define ERROR_NO_REMOTE 20000 -#define ERROR_INVALID_DWORD 20001 - -WINE_DEFAULT_DEBUG_CHANNEL(reg); - -static const WCHAR empty_wstr[] = {0}; - static const WCHAR short_hklm[] = {'H','K','L','M',0}; static const WCHAR short_hkcu[] = {'H','K','C','U',0}; static const WCHAR short_hkcr[] = {'H','K','C','R',0}; @@ -135,45 +128,6 @@ return reg_printfW(formatW, msg_buffer); } -static void reg_print_error(LSTATUS error_code) -{ - switch (error_code) - { - case ERROR_SUCCESS: - return; - case ERROR_BAD_COMMAND: - reg_message(STRING_INVALID_CMDLINE); - return; - case ERROR_INVALID_HANDLE: - reg_message(STRING_INVALID_KEY); - return; - case ERROR_NO_REMOTE: - reg_message(STRING_NO_REMOTE); - return; - case ERROR_FILE_NOT_FOUND: - reg_message(STRING_CANNOT_FIND); - return; - case ERROR_UNSUPPORTED_TYPE: - reg_message(STRING_UNSUPPORTED_TYPE); - return; - case ERROR_INVALID_DWORD: - reg_message(STRING_INVALID_DWORD); - return; - default: - { - static const WCHAR error_string[] = {'%','0','5','d',':',' ','%','s',0}; - WCHAR *message = NULL; - FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, - error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *)&message, 0, NULL); - - reg_message(STRING_ERROR); - reg_printfW(error_string, error_code, message); - LocalFree(message); - return; - } - } -} - static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name) { DWORD length = strlenW(rootkey_name); @@ -196,20 +150,6 @@ return NULL; } -static LSTATUS path_open(const WCHAR *path, HKEY *out, BOOL create) -{ - *out = path_get_rootkey(path); - - path = strchrW(path, '\\'); - if (path) - path++; - - if (create) - return RegCreateKeyW(*out, path, out); - else - return RegOpenKeyW(*out, path, out); -} - static DWORD wchar_get_type(const WCHAR *type_name) { DWORD i; @@ -226,316 +166,292 @@ return ~0u; } -static LSTATUS wchar_get_data(const WCHAR *input, const DWORD type, const WCHAR separator, - DWORD *size_out, BYTE **out) -{ - DWORD i; - - if (!input) - input = empty_wstr; - - switch (type) - { - case REG_NONE: +/* hexchar_to_byte from programs/regedit/hexedit.c */ +static inline BYTE hexchar_to_byte(WCHAR ch) +{ + if (ch >= '0' && ch <= '9') + return ch - '0'; + else if (ch >= 'a' && ch <= 'f') + return ch - 'a' + 10; + else if (ch >= 'A' && ch <= 'F') + return ch - 'A' + 10; + else + return -1; +} + +static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *reg_count) +{ + LPBYTE out_data = NULL; + *reg_count = 0; + + switch (reg_type) + { case REG_SZ: - case REG_EXPAND_SZ: - { - i = (strlenW(input) + 1) * sizeof(WCHAR); - *out = HeapAlloc(GetProcessHeap(), 0, i); - memcpy(*out, input, i); - *size_out = i; - return ERROR_SUCCESS; + { + *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); + out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); + lstrcpyW((LPWSTR)out_data,data); + break; } case REG_DWORD: - case REG_DWORD_BIG_ENDIAN: - { - WCHAR *temp; - - if (input[0] == '0' && (input[1] == 'x' || input[1] == 'X')) - i = strtoulW(input, &temp, 16); - else - i = strtoulW(input, &temp, 10); - - if (input[0] == '-' || temp[0] || temp == input) - return ERROR_INVALID_DWORD; - - if (i == 0xffffffff) - WINE_FIXME("Check for integer overflow.\n"); - - *out = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); - **(DWORD **) out = i; - *size_out = sizeof(DWORD); - return ERROR_SUCCESS; - } - case REG_MULTI_SZ: - { - WCHAR *temp = HeapAlloc(GetProcessHeap(), 0, (strlenW(input) + 1) * sizeof(WCHAR)); - DWORD p; - - for (i = 0, p = 0; i <= strlenW(input); i++, p++) + { + LPWSTR rest; + DWORD val; + val = strtolW(data, &rest, 0); + if (rest == data) { + static const WCHAR nonnumber[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','n','u','m','b','e','r','.','\n',0}; + reg_printfW(nonnumber); + break; + } + *reg_count = sizeof(DWORD); + out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); + ((LPDWORD)out_data)[0] = val; + break; + } + case REG_BINARY: + { + static const WCHAR nohex[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','h','e','x',' ','d','a','t','a','.','\n',0}; + BYTE hex0, hex1; + int i = 0, destByteIndex = 0, datalen = lstrlenW(data); + *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); + out_data = HeapAlloc(GetProcessHeap(), 0, *reg_count); + if(datalen % 2) { - /* If this character is the separator, or no separator has been given and these - * characters are "\\0", then add a 0 indicating the end of this string */ - if ( (separator && input[i] == separator) || - (!separator && input[i] == '\\' && input[i + 1] == '0') ) - { - /* If it's the first character or the previous one was a separator */ - if (!p || temp[p - 1] == 0) - { - HeapFree(GetProcessHeap(), 0, temp); - return ERROR_INVALID_DATA; - } - temp[p] = 0; - - if (!separator) - i++; - } - else - temp[p] = input[i]; + hex1 = hexchar_to_byte(data[i++]); + if(hex1 == 0xFF) + goto no_hex_data; + out_data[destByteIndex++] = hex1; } - - /* Add a 0 to the end if the string wasn't "", and it wasn't - * double-0-terminated already (In the case of a trailing separator) */ - if (p > 1 && temp[p - 2]) - temp[p++] = 0; - - *size_out = p * sizeof(WCHAR); - *out = (BYTE *) temp; - return ERROR_SUCCESS; - } - case REG_BINARY: - { - BYTE *temp = HeapAlloc(GetProcessHeap(), 0, strlenW(input)); - DWORD p, odd; - - for (i = 0, p = 0; i < strlenW(input); i++, p++) + for(;i + 1 < datalen;i += 2) { - if (input[i] >= '0' && input[i] <= '9') - temp[p] = input[i] - '0'; - else if (input[i] >= 'a' && input[i] <= 'f') - temp[p] = input[i] - 'a' + 10; - else if (input[i] >= 'A' && input[i] <= 'F') - temp[p] = input[i] - 'A' + 10; - else - { - HeapFree(GetProcessHeap(), 0, temp); - return ERROR_INVALID_DATA; - } + hex0 = hexchar_to_byte(data[i]); + hex1 = hexchar_to_byte(data[i + 1]); + if(hex0 == 0xFF || hex1 == 0xFF) + goto no_hex_data; + out_data[destByteIndex++] = (hex0 << 4) | hex1; } - - *out = temp; - odd = p & 1; - temp += odd; - p >>= 1; - - for (i = 0; i < p; i++) - temp[i] = (temp[i * 2] << 4) | temp[i * 2 + 1]; - - *size_out = p + odd; - return ERROR_SUCCESS; + break; + no_hex_data: + /* cleanup, print error */ + HeapFree(GetProcessHeap(), 0, out_data); + reg_printfW(nohex); + out_data = NULL; + break; } default: { - WINE_FIXME("Add support for registry type: %u\n", type); - return ERROR_UNSUPPORTED_TYPE; - } - } -} - -static LSTATUS sane_path(const WCHAR *key) -{ - int i = strlenW(key); + static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; + reg_printfW(unhandled, reg_type,data); + } + } + + return out_data; +} + +static BOOL sane_path(const WCHAR *key) +{ + unsigned int i = strlenW(key); if (i < 3 || (key[i - 1] == '\\' && key[i - 2] == '\\')) - return ERROR_INVALID_HANDLE; + { + reg_message(STRING_INVALID_KEY); + return FALSE; + } if (key[0] == '\\' && key[1] == '\\' && key[2] != '\\') - return ERROR_NO_REMOTE; - - return ERROR_SUCCESS; -} - -static int reg_add( const WCHAR *key_name, const WCHAR *value_name, const BOOL value_empty, - const WCHAR *type, const WCHAR separator, const WCHAR *data, - const BOOL force) -{ - HKEY key = NULL; - LONG err = sane_path(key_name); - if (err != ERROR_SUCCESS) - goto error; - - if (value_name && value_empty) - { - err = ERROR_BAD_COMMAND; - goto error; - } - - err = path_open(key_name, &key, TRUE); - if (err != ERROR_SUCCESS) - goto error; + { + reg_message(STRING_NO_REMOTE); + return FALSE; + } + + return TRUE; +} + +static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, + WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) +{ + static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s', + ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0}; + LPWSTR p; + HKEY root,subkey; + + reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); + + if (!sane_path(key_name)) + return 1; + + p = strchrW(key_name,'\\'); + if (!p) + { + reg_message(STRING_INVALID_KEY); + return 1; + } + p++; + + root = path_get_rootkey(key_name); + if (!root) + { + reg_message(STRING_INVALID_KEY); + return 1; + } + + if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) + { + reg_message(STRING_INVALID_KEY); + return 1; + } if (value_name || data) { - DWORD size, reg_type; - BYTE *data_out; - - if (value_name && !value_name[0]) - value_name = NULL; - - if (type && !type[0]) - { - data = NULL; - type = NULL; - } - - if (!force && RegQueryValueExW(key, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) - { - WINE_FIXME("Prompt for overwrite\n"); + DWORD reg_type; + DWORD reg_count = 0; + BYTE* reg_data = NULL; + + if (!force) + { + if (RegQueryValueW(subkey,value_name,NULL,NULL)==ERROR_SUCCESS) + { + /* FIXME: Prompt for overwrite */ + } } reg_type = wchar_get_type(type); if (reg_type == ~0u) { - err = ERROR_INVALID_DATATYPE; - goto error; - } - - err = wchar_get_data(data, reg_type, separator, &size, &data_out); - if (err != ERROR_SUCCESS) - goto error; - - err = RegSetValueExW(key, value_name, 0, reg_type, data_out, size); - HeapFree(GetProcessHeap(), 0, data_out); - if (err != ERROR_SUCCESS) - goto error; - } - - RegCloseKey(key); + RegCloseKey(subkey); + reg_message(STRING_UNSUPPORTED_TYPE); + return 1; + } + + if (data) + reg_data = get_regdata(data,reg_type,separator,&reg_count); + + RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count); + HeapFree(GetProcessHeap(),0,reg_data); + } + + RegCloseKey(subkey); + reg_message(STRING_SUCCESS); + + return 0; +} + +static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, + BOOL value_all, BOOL force) +{ + LPWSTR p; + HKEY root,subkey; + + static const WCHAR stubW[] = {'D','E','L','E','T','E', + ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' + ,0}; + reg_printfW(stubW, key_name, value_name, value_empty, value_all, force); + + if (!sane_path(key_name)) + return 1; + + p = strchrW(key_name,'\\'); + if (!p) + { + reg_message(STRING_INVALID_KEY); + return 1; + } + p++; + + root = path_get_rootkey(key_name); + if (!root) + { + reg_message(STRING_INVALID_KEY); + return 1; + } + + if (value_name && value_empty) + { + reg_message(STRING_INVALID_CMDLINE); + return 1; + } + + if (value_empty && value_all) + { + reg_message(STRING_INVALID_CMDLINE); + return 1; + } + + if (!force) + { + /* FIXME: Prompt for delete */ + } + + /* Delete subtree only if no /v* option is given */ + if (!value_name && !value_empty && !value_all) + { + if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + { + reg_message(STRING_CANNOT_FIND); + return 1; + } + reg_message(STRING_SUCCESS); + return 0; + } + + if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) + { + reg_message(STRING_CANNOT_FIND); + return 1; + } + + if (value_all) + { + LPWSTR szValue; + DWORD maxValue; + DWORD count; + LONG rc; + + rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + &maxValue, NULL, NULL, NULL); + if (rc != ERROR_SUCCESS) + { + /* FIXME: failure */ + RegCloseKey(subkey); + return 1; + } + maxValue++; + szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR)); + + while (1) + { + count = maxValue; + rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + rc = RegDeleteValueW(subkey, szValue); + if (rc != ERROR_SUCCESS) + break; + } + else break; + } + if (rc != ERROR_SUCCESS) + { + /* FIXME delete failed */ + } + } + else if (value_name) + { + if (RegDeleteValueW(subkey,value_name) != ERROR_SUCCESS) + { + RegCloseKey(subkey); + reg_message(STRING_CANNOT_FIND); + return 1; + } + } + else if (value_empty) + { + RegSetValueExW(subkey,NULL,0,REG_SZ,NULL,0); + } + + RegCloseKey(subkey); reg_message(STRING_SUCCESS); return 0; - -error: - RegCloseKey(key); - reg_print_error(err); - return 1; -} - -static int reg_delete(const WCHAR *key_name, const WCHAR *value_name, const BOOL value_empty, - const BOOL value_all, const BOOL force) -{ - HKEY key = NULL; - LONG err = sane_path(key_name); - if (err != ERROR_SUCCESS) - { - reg_print_error(err); - return 1; - } - - err = path_open(key_name, &key, FALSE); - if (err != ERROR_SUCCESS) - goto error; - - /* Mutually exclusive options */ - if ((!!value_name + !!value_empty + !!value_all) > 1) - { - err = ERROR_BAD_COMMAND; - goto error; - } - - if (!force) - { - WINE_FIXME("Prompt for delete\n"); - } - - if (value_empty || value_name) - { - if (value_name && value_name[0]) - err = RegDeleteValueW(key, value_name); - else - err = RegDeleteValueW(key, NULL); - - if (err != ERROR_SUCCESS) - goto error; - } - else if (value_all) - { - WCHAR *enum_v_name; - DWORD count, max_size, this_size, i = 0; - BOOL incomplete = FALSE; - - err = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, - &count, &max_size, NULL, NULL, NULL); - if (err != ERROR_SUCCESS) - goto error; - - max_size++; - enum_v_name = HeapAlloc(GetProcessHeap(), 0, max_size * sizeof(WCHAR)); - if (!enum_v_name) - { - err = ERROR_NOT_ENOUGH_MEMORY; - goto error; - } - - while (i < count) - { - this_size = max_size; - - err = RegEnumValueW(key, i, enum_v_name, &this_size, NULL, NULL, NULL, NULL); - if (err != ERROR_SUCCESS) - { - reg_print_error(err); - incomplete = TRUE; - i++; - continue; - } - - err = RegDeleteValueW(key, enum_v_name); - if (err != ERROR_SUCCESS) - { - reg_print_error(err); - incomplete = TRUE; - i++; - continue; - } - - count--; - } - - HeapFree(GetProcessHeap(), 0, enum_v_name); - - if (incomplete) - { - RegCloseKey(key); - return 1; - } - } - /* Delete subtree only if no /v* option is given */ - else - { - if (key == path_get_rootkey(key_name)) - { - /* "This works well enough on native to make you regret you pressed enter" - stefand */ - WINE_FIXME("Deleting a root key is not implemented.\n"); - RegCloseKey(key); - return 1; - } - - err = SHDeleteKey(key, NULL); - if (err != ERROR_SUCCESS) - goto error; - err = RegDeleteKeyW(key, empty_wstr); - if (err != ERROR_SUCCESS) - goto error; - } - - RegCloseKey(key); - reg_message(STRING_SUCCESS); - return 0; - -error: - RegCloseKey(key); - reg_print_error(err); - return 1; } static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, @@ -579,7 +495,7 @@ if (argc < 3) { - reg_print_error(ERROR_BAD_COMMAND); + reg_message(STRING_INVALID_CMDLINE); return 1; } else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || @@ -599,14 +515,7 @@ else if (!lstrcmpiW(argvW[i], slashTW)) type = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashSW)) - { - if (!argvW[++i][0] || argvW[i][1]) - { - reg_print_error(ERROR_BAD_COMMAND); - return 1; - } - separator = argvW[i][0]; - } + separator = argvW[++i][0]; else if (!lstrcmpiW(argvW[i], slashDW)) data = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashFW)) @@ -622,7 +531,7 @@ if (argc < 3) { - reg_print_error(ERROR_BAD_COMMAND); + reg_message(STRING_INVALID_CMDLINE); return 1; } else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || @@ -653,7 +562,7 @@ if (argc < 3) { - reg_print_error(ERROR_BAD_COMMAND); + reg_message(STRING_INVALID_CMDLINE); return 1; } else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || @@ -677,7 +586,7 @@ } else { - reg_print_error(ERROR_BAD_COMMAND); - return 1; - } -} + reg_message(STRING_INVALID_CMDLINE); + return 1; + } +} Modified: trunk/reactos/base/applications/cmdutils/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.h [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -32,6 +32,4 @@ #define STRING_INVALID_CMDLINE 107 #define STRING_NO_REMOTE 108 #define STRING_CANNOT_FIND 109 -#define STRING_ERROR 110 -#define STRING_UNSUPPORTED_TYPE 111 -#define STRING_INVALID_DWORD 112 +#define STRING_UNSUPPORTED_TYPE 110 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 26 22:37:06 2015 @@ -229,7 +229,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.47 -reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.55 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.47 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.47 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37

1 0

[tfaber] 70118: [QUARTZ] - Don't cache IFilterMapper2 interface in FilterGraph2. Fixes use after free when playing videos with MPC HC. - Fix a reference leak CORE-7671
by tfaber＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: tfaber Date: Thu Nov 26 22:04:34 2015 New Revision: 70118 URL: http://svn.reactos.org/svn/reactos?rev=70118&view=rev Log: [QUARTZ] - Don't cache IFilterMapper2 interface in FilterGraph2. Fixes use after free when playing videos with MPC HC. - Fix a reference leak CORE-7671 Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtermapper.c Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Thu Nov 26 22:04:34 2015 @@ -155,7 +155,6 @@ IUnknown *outer_unk; LONG ref; IUnknown *punkFilterMapper2; - IFilterMapper2 * pFilterMapper2; IBaseFilter ** ppFiltersInGraph; LPWSTR * pFilterNames; ULONG nFilters; @@ -243,11 +242,11 @@ TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper2, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper2 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper3, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphConfig_iface; TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); @@ -297,9 +296,6 @@ IUnknown_Release(This->ItfCacheEntries[i].iface); } - /* AddRef on controlling IUnknown, to compensate for Release of cached IFilterMapper2 */ - IUnknown_AddRef(This->outer_unk); - IFilterMapper2_Release(This->pFilterMapper2); IUnknown_Release(This->punkFilterMapper2); if (This->pSite) IUnknown_Release(This->pSite); @@ -888,6 +884,7 @@ CLSID FilterCLSID; PIN_DIRECTION dir; unsigned int i = 0; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); @@ -977,10 +974,16 @@ TRACE("MajorType %s\n", debugstr_guid(&mt->majortype)); TRACE("SubType %s\n", debugstr_guid(&mt->subtype)); + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) { + WARN("Unable to get IFilterMapper2 (%x)\n", hr); + goto out; + } + /* Try to find a suitable filter that can connect to the pin to render */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); goto out; @@ -1147,7 +1150,11 @@ CoTaskMemFree(ppins); } + IEnumMoniker_Release(pEnumMoniker); + out: + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); if (penummt) IEnumMediaTypes_Release(penummt); if (mt) @@ -1243,6 +1250,7 @@ ULONG nb; IMoniker* pMoniker; INT x; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p)\n", This, iface, ppinOut); @@ -1352,10 +1360,20 @@ continue; } + if (pFilterMapper2 == NULL) + { + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) + { + WARN("Unable to query IFilterMapper2 (%x)\n", hr); + break; + } + } + /* Try to find a suitable renderer with the same media type */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); @@ -1468,6 +1486,9 @@ break; hr = S_OK; } + + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); IEnumMediaTypes_Release(penummt); return hr; @@ -5684,14 +5705,6 @@ hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fimpl->punkFilterMapper2); - if (SUCCEEDED(hr)) - hr = IUnknown_QueryInterface(fimpl->punkFilterMapper2, &IID_IFilterMapper2, - (void**)&fimpl->pFilterMapper2); - - if (SUCCEEDED(hr)) - /* Release controlling IUnknown - compensate refcount increase from caching IFilterMapper2 interface. */ - IUnknown_Release(fimpl->outer_unk); - if (FAILED(hr)) { ERR("Unable to create filter mapper (%x)\n", hr); if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Thu Nov 26 22:04:34 2015 @@ -1886,6 +1886,98 @@ ok(hr == S_OK, "CoRevokeClassObject failed with %08x\n", hr); } +typedef struct IUnknownImpl +{ + IUnknown IUnknown_iface; + int AddRef_called; + int Release_called; +} IUnknownImpl; + +static IUnknownImpl *IUnknownImpl_from_iface(IUnknown * iface) +{ + return CONTAINING_RECORD(iface, IUnknownImpl, IUnknown_iface); +} + +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +{ + ok(0, "QueryInterface should not be called for %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->AddRef_called++; + return 2; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->Release_called++; + return 1; +} + +static CONST_VTBL IUnknownVtbl IUnknownImpl_Vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +static void test_aggregate_filter_graph(void) +{ + HRESULT hr; + IUnknown *pgraph; + IUnknown *punk; + IUnknownImpl unk_outer = { { &IUnknownImpl_Vtbl }, 0, 0 }; + + hr = CoCreateInstance(&CLSID_FilterGraph, &unk_outer.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pgraph); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(pgraph != &unk_outer.IUnknown_iface, "pgraph = %p, expected not %p\n", pgraph, &unk_outer.IUnknown_iface); + + hr = IUnknown_QueryInterface(pgraph, &IID_IUnknown, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper2, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper3, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + + IUnknown_Release(pgraph); +} + START_TEST(filtergraph) { HRESULT hr; @@ -1904,5 +1996,6 @@ test_mediacontrol(); test_filter_graph2(); test_render_filter_priority(); + test_aggregate_filter_graph(); CoUninitialize(); } Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Thu Nov 26 22:04:34 2015 @@ -541,6 +541,98 @@ IFilterMapper2_Release(pMapper); } +typedef struct IUnknownImpl +{ + IUnknown IUnknown_iface; + int AddRef_called; + int Release_called; +} IUnknownImpl; + +static IUnknownImpl *IUnknownImpl_from_iface(IUnknown * iface) +{ + return CONTAINING_RECORD(iface, IUnknownImpl, IUnknown_iface); +} + +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +{ + ok(0, "QueryInterface should not be called for %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->AddRef_called++; + return 2; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->Release_called++; + return 1; +} + +static CONST_VTBL IUnknownVtbl IUnknownImpl_Vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +static void test_aggregate_filter_mapper(void) +{ + HRESULT hr; + IUnknown *pmapper; + IUnknown *punk; + IUnknownImpl unk_outer = { { &IUnknownImpl_Vtbl }, 0, 0 }; + + hr = CoCreateInstance(&CLSID_FilterMapper2, &unk_outer.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pmapper); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(pmapper != &unk_outer.IUnknown_iface, "pmapper = %p, expected not %p\n", pmapper, &unk_outer.IUnknown_iface); + + hr = IUnknown_QueryInterface(pmapper, &IID_IUnknown, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper2, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper3, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + + IUnknown_Release(pmapper); +} + START_TEST(filtermapper) { CoInitialize(NULL); @@ -550,6 +642,7 @@ test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); test_parse_filter_data(); + test_aggregate_filter_mapper(); CoUninitialize(); }

1 0

[tfaber] 70117: [D3DXOF] - Avoid undefined behavior in parse_object_parts. Fixes 3D app startup on MSVC builds. CORE-10590 #resolve
by tfaber＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: tfaber Date: Thu Nov 26 21:54:44 2015 New Revision: 70117 URL: http://svn.reactos.org/svn/reactos?rev=70117&view=rev Log: [D3DXOF] - Avoid undefined behavior in parse_object_parts. Fixes 3D app startup on MSVC builds. CORE-10590 #resolve Modified: trunk/reactos/dll/directx/wine/d3dxof/parsing.c Modified: trunk/reactos/dll/directx/wine/d3dxof/parsing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/parsing.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/parsing.c [iso-8859-1] Thu Nov 26 21:54:44 2015 @@ -1337,7 +1337,8 @@ return FALSE; } - buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; + buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects]; + pxo->root->nb_subobjects++; TRACE("Enter optional %s\n", (char*)buf->value); buf->level++;

1 0

[akhaldi] 70116: [PSDK] Add missing D3DPRESENT_DONOTWAIT and D3DPRESENT_LINEAR_CONTENT.
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 17:21:12 2015 New Revision: 70116 URL: http://svn.reactos.org/svn/reactos?rev=70116&view=rev Log: [PSDK] Add missing D3DPRESENT_DONOTWAIT and D3DPRESENT_LINEAR_CONTENT. Modified: trunk/reactos/include/psdk/d3d9.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=70… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d9.h [iso-8859-1] Thu Nov 26 17:21:12 2015 @@ -66,6 +66,8 @@ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL 0x00000002L +#define D3DPRESENT_DONOTWAIT 1L +#define D3DPRESENT_LINEAR_CONTENT 2L #define D3DPRESENT_BACK_BUFFERS_MAX 3L #define D3DSGR_NO_CALIBRATION 0x00000000L #define D3DSGR_CALIBRATE 0x00000001L

1 0

[akhaldi] 70115: [INCLUDES/WINE] Update dplaysp.h. CORE-10536
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 14:32:03 2015 New Revision: 70115 URL: http://svn.reactos.org/svn/reactos?rev=70115&view=rev Log: [INCLUDES/WINE] Update dplaysp.h. CORE-10536 Modified: trunk/reactos/include/reactos/wine/dplaysp.h Modified: trunk/reactos/include/reactos/wine/dplaysp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/dplay… ============================================================================== --- trunk/reactos/include/reactos/wine/dplaysp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/dplaysp.h [iso-8859-1] Wed Nov 25 14:32:03 2015 @@ -38,8 +38,15 @@ /* For SP. Top 16 bits is dplay, bottom 16 is SP */ #define DPSP_MAJORVERSION 0x00060000 + +#define DPSP_DX3VERSION 0x00040000 #define DPSP_DX5VERSION 0x00050000 -#define DPSP_DX3VERSION 0x00040000 +#define DPSP_DX6VERSION 0x00090000 +#define DPSP_DX61VERSION 0x000a0000 +#define DPSP_DX61AVERSION 0x000b0000 +#define DPSP_DX71VERSION 0x000c0000 +#define DPSP_DX8VERSION 0x000d0000 +#define DPSP_DX9VERSION 0x000e0000 #define DPSP_MAJORVERSIONMASK 0xFFFF0000 #define DPSP_MINORVERSIONMASK 0x0000FFFF

1 0

[akhaldi] 70114: [MSVCRTD_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 14:30:06 2015 New Revision: 70114 URL: http://svn.reactos.org/svn/reactos?rev=70114&view=rev Log: [MSVCRTD_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/msvcrtd/debug.c Modified: trunk/rostests/winetests/msvcrtd/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/debug.c… ============================================================================== --- trunk/rostests/winetests/msvcrtd/debug.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrtd/debug.c [iso-8859-1] Wed Nov 25 14:30:06 2015 @@ -36,7 +36,7 @@ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) -static int init_functions(void) +static BOOL init_functions(void) { HMODULE hModule = LoadLibraryA("msvcrtd.dll");

1 0

[akhaldi] 70113: [OLEDLG_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 14:29:07 2015 New Revision: 70113 URL: http://svn.reactos.org/svn/reactos?rev=70113&view=rev Log: [OLEDLG_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/oledlg/main.c Modified: trunk/rostests/winetests/oledlg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oledlg/main.c?r… ============================================================================== --- trunk/rostests/winetests/oledlg/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oledlg/main.c [iso-8859-1] Wed Nov 25 14:29:07 2015 @@ -25,6 +25,18 @@ #include <initguid.h> #include <oledlg.h> + +static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return str; + str++; + } + return NULL; +} static HRESULT WINAPI enumverbs_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void **ppv) { @@ -396,8 +408,9 @@ info.cch = sizeof(buffW)/sizeof(WCHAR); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); - /* item string has a form of '<verb> <usertype> <Object>', where Object is localized */ - ok(!memcmp(buffW, verbW, sizeof(verbW) - sizeof(WCHAR)), "str %s\n", wine_dbgstr_w(buffW)); + /* Item string contains verb, usertype and localized string for 'Object' word, + exact format depends on localization. */ + ok(strstrW(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW)); ok(info.fState == 0, "got state 0x%08x\n", info.fState); ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);

1 0

[akhaldi] 70112: [OLEACC_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 25 Nov '15

25 Nov '15

Author: akhaldi Date: Wed Nov 25 14:28:16 2015 New Revision: 70112 URL: http://svn.reactos.org/svn/reactos?rev=70112&view=rev Log: [OLEACC_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/oleacc/main.c Modified: trunk/rostests/winetests/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/main.c?r… ============================================================================== --- trunk/rostests/winetests/oleacc/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/main.c [iso-8859-1] Wed Nov 25 14:28:16 2015 @@ -445,7 +445,7 @@ ret = GetStateTextW(1<<i, buf, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextW(1<<31, buf, 1024); + ret = GetStateTextW(1u<<31, buf, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); ret = GetStateTextW(2, buf, 1024); @@ -478,7 +478,7 @@ ret = GetStateTextA(1<<i, bufa, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextA(1<<31, bufa, 1024); + ret = GetStateTextA(1u<<31, bufa, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); }

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