Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[akhaldi] 70927: [SCRRUN_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 10:07:02 2016 New Revision: 70927 URL: http://svn.reactos.org/svn/reactos?rev=70927&view=rev Log: [SCRRUN_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/scrrun/filesystem.c trunk/rostests/winetests/scrrun/scrrun.idl Modified: trunk/rostests/winetests/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/filesyst… ============================================================================== --- trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] Sat Mar 5 10:07:02 2016 @@ -59,6 +59,47 @@ DeleteFileW(path); } +static IDrive *get_fixed_drive(void) +{ + IDriveCollection *drives; + IEnumVARIANT *iter; + IDrive *drive; + HRESULT hr; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDriveCollection_Release(drives); + + while (1) { + DriveTypeConst type; + VARIANT var; + + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + if (hr == S_FALSE) { + drive = NULL; + break; + } + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_DriveType(drive, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (type == Fixed) + break; + + IDrive_Release(drive); + } + + IEnumVARIANT_Release(iter); + return drive; +} + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -1790,6 +1831,83 @@ SysFreeString(nameW); } +struct driveexists_test { + const WCHAR drivespec[10]; + const INT drivetype; + const VARIANT_BOOL expected_ret; +}; + +/* If 'drivetype' != -1, the first character of 'drivespec' will be replaced + * with the drive letter of a drive of this type. If such a drive does not exist, + * the test will be skipped. */ +static const struct driveexists_test driveexiststestdata[] = { + { {'N',':','\\',0}, DRIVE_NO_ROOT_DIR, VARIANT_FALSE }, + { {'R',':','\\',0}, DRIVE_REMOVABLE, VARIANT_TRUE }, + { {'F',':','\\',0}, DRIVE_FIXED, VARIANT_TRUE }, + { {'F',':',0}, DRIVE_FIXED, VARIANT_TRUE }, + { {'F','?',0}, DRIVE_FIXED, VARIANT_FALSE }, + { {'F',0}, DRIVE_FIXED, VARIANT_TRUE }, + { {'?',0}, -1, VARIANT_FALSE }, + { { 0 } } +}; + +static void test_DriveExists(void) +{ + const struct driveexists_test *ptr = driveexiststestdata; + HRESULT hr; + VARIANT_BOOL ret; + BSTR drivespec; + WCHAR root[] = {'?',':','\\',0}; + + hr = IFileSystem3_DriveExists(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = VARIANT_TRUE; + hr = IFileSystem3_DriveExists(fs3, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret == VARIANT_FALSE, "got %x\n", ret); + + drivespec = SysAllocString(root); + hr = IFileSystem3_DriveExists(fs3, drivespec, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + SysFreeString(drivespec); + + for (; *ptr->drivespec; ptr++) { + drivespec = SysAllocString(ptr->drivespec); + if (ptr->drivetype != -1) { + for (root[0] = 'A'; root[0] <= 'Z'; root[0]++) + if (GetDriveTypeW(root) == ptr->drivetype) + break; + if (root[0] > 'Z') { + skip("No drive with type 0x%x found, skipping test %s.\n", + ptr->drivetype, wine_dbgstr_w(ptr->drivespec)); + SysFreeString(drivespec); + continue; + } + + /* Test both upper and lower case drive letters. */ + drivespec[0] = root[0]; + ret = ptr->expected_ret == VARIANT_TRUE ? VARIANT_FALSE : VARIANT_TRUE; + hr = IFileSystem3_DriveExists(fs3, drivespec, &ret); + ok(hr == S_OK, "got 0x%08x for drive spec %s (%s)\n", + hr, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + ok(ret == ptr->expected_ret, "got %d, expected %d for drive spec %s (%s)\n", + ret, ptr->expected_ret, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + + drivespec[0] = tolower(root[0]); + } + + ret = ptr->expected_ret == VARIANT_TRUE ? VARIANT_FALSE : VARIANT_TRUE; + hr = IFileSystem3_DriveExists(fs3, drivespec, &ret); + ok(hr == S_OK, "got 0x%08x for drive spec %s (%s)\n", + hr, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + ok(ret == ptr->expected_ret, "got %d, expected %d for drive spec %s (%s)\n", + ret, ptr->expected_ret, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + + SysFreeString(drivespec); + } +} + struct getdrivename_test { const WCHAR path[10]; const WCHAR drive[5]; @@ -1835,44 +1953,105 @@ } } +struct getdrive_test { + const WCHAR drivespec[12]; + HRESULT res; + const WCHAR driveletter[2]; +}; + +static void test_GetDrive(void) +{ + HRESULT hr; + IDrive *drive_fixed, *drive; + BSTR dl_fixed, drivespec; + WCHAR root[] = {'?',':','\\',0}; + + drive = (void*)0xdeadbeef; + hr = IFileSystem3_GetDrive(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(drive == (void*)0xdeadbeef, "got %p\n", drive); + + for (root[0] = 'A'; root[0] <= 'Z'; root[0]++) + if (GetDriveTypeW(root) == DRIVE_NO_ROOT_DIR) + break; + + if (root[0] > 'Z') + skip("All drive letters are occupied, skipping test for nonexisting drive.\n"); + else { + drivespec = SysAllocString(root); + drive = (void*)0xdeadbeef; + hr = IFileSystem3_GetDrive(fs3, drivespec, &drive); + ok(hr == CTL_E_DEVICEUNAVAILABLE, "got 0x%08x\n", hr); + ok(drive == NULL, "got %p\n", drive); + SysFreeString(drivespec); + } + + drive_fixed = get_fixed_drive(); + if (!drive_fixed) { + skip("No fixed drive found, skipping test.\n"); + return; + } + + hr = IDrive_get_DriveLetter(drive_fixed, &dl_fixed); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (FAILED(hr)) + skip("Could not retrieve drive letter of fixed drive, skipping test.\n"); + else { + WCHAR dl_upper = toupper(dl_fixed[0]); + WCHAR dl_lower = tolower(dl_fixed[0]); + struct getdrive_test testdata[] = { + { {dl_upper,0}, S_OK, {dl_upper,0} }, + { {dl_upper,':',0}, S_OK, {dl_upper,0} }, + { {dl_upper,':','\\',0}, S_OK, {dl_upper,0} }, + { {dl_lower,':','\\',0}, S_OK, {dl_upper,0} }, + { {dl_upper,'\\',0}, E_INVALIDARG, { 0 } }, + { {dl_lower,'\\',0}, E_INVALIDARG, { 0 } }, + { {'$',':','\\',0}, E_INVALIDARG, { 0 } }, + { {'\\','h','o','s','t','\\','s','h','a','r','e',0}, E_INVALIDARG, { 0 } }, + { {'h','o','s','t','\\','s','h','a','r','e',0}, E_INVALIDARG, { 0 } }, + { { 0 } }, + }; + struct getdrive_test *ptr = &testdata[0]; + + for (; *ptr->drivespec; ptr++) { + drivespec = SysAllocString(ptr->drivespec); + drive = (void*)0xdeadbeef; + hr = IFileSystem3_GetDrive(fs3, drivespec, &drive); + ok(hr == ptr->res, "got 0x%08x, expected 0x%08x for drive spec %s\n", + hr, ptr->res, wine_dbgstr_w(ptr->drivespec)); + ok(!lstrcmpW(ptr->drivespec, drivespec), "GetDrive modified its DriveSpec argument\n"); + SysFreeString(drivespec); + + if (*ptr->driveletter) { + BSTR driveletter; + hr = IDrive_get_DriveLetter(drive, &driveletter); + ok(hr == S_OK, "got 0x%08x for drive spec %s\n", hr, wine_dbgstr_w(ptr->drivespec)); + if (SUCCEEDED(hr)) { + ok(!lstrcmpW(ptr->driveletter, driveletter), "got %s, expected %s for drive spec %s\n", + wine_dbgstr_w(driveletter), wine_dbgstr_w(ptr->driveletter), + wine_dbgstr_w(ptr->drivespec)); + SysFreeString(driveletter); + } + IDrive_Release(drive); + } else + ok(drive == NULL, "got %p for drive spec %s\n", drive, wine_dbgstr_w(ptr->drivespec)); + } + SysFreeString(dl_fixed); + } +} + static void test_SerialNumber(void) { - IDriveCollection *drives; - IEnumVARIANT *iter; IDrive *drive; LONG serial; HRESULT hr; BSTR name; - hr = IFileSystem3_get_Drives(fs3, &drives); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDriveCollection_Release(drives); - - while (1) { - DriveTypeConst type; - VARIANT var; - - hr = IEnumVARIANT_Next(iter, 1, &var, NULL); - if (hr == S_FALSE) { - skip("No fixed drive found, skipping test.\n"); - IEnumVARIANT_Release(iter); - return; - } - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); - ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&var); - - hr = IDrive_get_DriveType(drive, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (type == Fixed) - break; - - IDrive_Release(drive); + drive = get_fixed_drive(); + if (!drive) { + skip("No fixed drive found, skipping test.\n"); + return; } hr = IDrive_get_SerialNumber(drive, NULL); @@ -1902,7 +2081,6 @@ SysFreeString(name); IDrive_Release(drive); - IEnumVARIANT_Release(iter); } static const struct extension_test { @@ -2019,7 +2197,9 @@ test_WriteLine(); test_ReadAll(); test_Read(); + test_DriveExists(); test_GetDriveName(); + test_GetDrive(); test_SerialNumber(); test_GetExtensionName(); test_GetSpecialFolder(); Modified: trunk/rostests/winetests/scrrun/scrrun.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/scrrun.i… ============================================================================== --- trunk/rostests/winetests/scrrun/scrrun.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/scrrun.idl [iso-8859-1] Sat Mar 5 10:07:02 2016 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header + import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl";

8 years, 9 months

[akhaldi] 70924: [RICHED20_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 09:58:36 2016 New Revision: 70924 URL: http://svn.reactos.org/svn/reactos?rev=70924&view=rev Log: [RICHED20_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/riched20/editor.c Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… ============================================================================== --- trunk/rostests/winetests/riched20/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/editor.c [iso-8859-1] Sat Mar 5 09:58:36 2016 @@ -46,6 +46,7 @@ format, string1, string2, string3); static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -486,6 +487,28 @@ offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + int offset_test1[3][2] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 9}, /* Line 2: |richedit\x8e\xf0\n */ + {15, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -1519,6 +1542,19 @@ ok(result == strlen(text2), "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + textRange.chrg.cpMin = 4; + textRange.chrg.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + todo_wine ok(result == 5, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + } + DestroyWindow(hwndRichEdit); } @@ -1535,15 +1571,27 @@ SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect, buffer), "EM_GETSELTEXT filled %s\n", buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect, buffer), "EM_GETSELTEXT filled %s\n", buffer); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + todo_wine ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); } @@ -3676,8 +3724,9 @@ setText.codepage = CP_ACP; setText.flags = ST_SELECTION; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + todo_wine ok(result == 18, "EM_SETTEXTEX returned %d, expected 18\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3692,8 +3741,9 @@ hwndRichEdit = new_richedit(NULL); setText.codepage = CP_ACP; setText.flags = ST_SELECTION; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + todo_wine ok(result == 18, "EM_SETTEXTEX returned %d, expected 18\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3706,8 +3756,9 @@ * but this time it is because the selection is at the beginning. */ setText.codepage = CP_ACP; setText.flags = ST_DEFAULT; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3724,7 +3775,8 @@ getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3739,7 +3791,8 @@ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem2); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem2); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem2) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3784,7 +3837,8 @@ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3797,7 +3851,8 @@ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3alt); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3alt); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3810,7 +3865,8 @@ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem4); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem4); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem4_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3825,7 +3881,8 @@ /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; @@ -3840,7 +3897,8 @@ /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; @@ -3878,7 +3936,8 @@ getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)buf); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)buf); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3996,6 +4055,41 @@ ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); result = strcmp(bufACP, "TestUTF8WithBOM"); ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + + /* Test multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + setText.flags = ST_SELECTION; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"abc\x8e\xf0"); + todo_wine ok(result == 5, "EM_SETTEXTEX incorrectly returned %d, expected 5\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + + setText.flags = ST_DEFAULT; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"abc\x8e\xf0"); + ok(result == 1, "EM_SETTEXTEX incorrectly returned %d, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + setText.flags = ST_SELECTION; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"{\\rtf abc\x8e\xf0}"); + todo_wine ok(result == 4, "EM_SETTEXTEX incorrectly returned %d, expected 4\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + todo_wine ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + } DestroyWindow(hwndRichEdit); } @@ -4484,13 +4578,9 @@ SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->todo) { - todo_wine { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } - } else { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } + todo_wine_if (setsel->todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } static void test_EM_EXSETSEL(void) @@ -4508,6 +4598,27 @@ check_EM_EXSETSEL(hwndRichEdit, &exsetsel_tests[i], i); } + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + CHARRANGE cr; + char bufA[MAX_BUF_LEN] = {0}; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 78901 */ + cr.cpMin = 4, cr.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + ok(result == 8, "EM_EXSETSEL return %ld expected 8\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + ok(!strcmp(bufA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); + SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); + ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); + } + DestroyWindow(hwndRichEdit); } @@ -4521,18 +4632,14 @@ SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->todo) { - todo_wine { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } - } else { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } + todo_wine_if (setsel->todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } static void test_EM_SETSEL(void) { - char buffA[32]; + char buffA[32] = {0}; HWND hwndRichEdit = new_richedit(NULL); int i; const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); @@ -4550,6 +4657,25 @@ buffA[0] = 123; SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); ok(buffA[0] == 0, "selection text %s\n", buffA); + + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + int sel_start, sel_end; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 78901 */ + result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + ok(result == 8, "EM_SETSEL return %ld expected 8\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + ok(!strcmp(buffA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); + result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); + ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); + } DestroyWindow(hwndRichEdit); } @@ -4561,6 +4687,8 @@ int r; GETTEXTEX getText; CHARRANGE cr; + CHAR rtfstream[] = "{\\rtf1 TestSomeText}"; + CHAR urtfstream[] = "{\\urtf1 TestSomeText}"; /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); @@ -4832,6 +4960,76 @@ /* Test number of lines reported after EM_REPLACESEL */ r = SendMessageA(hwndRichEdit, EM_GETLINECOUNT, 0, 0); ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"abc\x8e\xf0"); + todo_wine ok(r == 5, "EM_REPLACESEL returned %d, expected 5\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(r == 0, "EM_EXGETSEL returned %d, expected 0\n", r); + ok(cr.cpMin == 4, "EM_EXGETSEL returned cpMin=%d, expected 4\n", cr.cpMin); + ok(cr.cpMax == 4, "EM_EXGETSEL returned cpMax=%d, expected 4\n", cr.cpMax); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok(!strcmp(buffer, "abc\x8e\xf0"), "WM_GETTEXT returned incorrect string\n"); + ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"{\\rtf abc\x8e\xf0}"); + todo_wine ok(r == 4, "EM_REPLACESEL returned %d, expected 4\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(r == 0, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 4, "EM_EXGETSEL returned cpMin=%d, expected 4\n", cr.cpMin); + todo_wine ok(cr.cpMax == 4, "EM_EXGETSEL returned cpMax=%d, expected 4\n", cr.cpMax); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "abc\x8e\xf0"), "WM_GETTEXT returned incorrect string\n"); + todo_wine ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + } + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 12, "EM_EXGETSEL returned cpMin=%d, expected 12\n", cr.cpMin); + todo_wine ok(cr.cpMax == 12, "EM_EXGETSEL returned cpMax=%d, expected 12\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "TestSomeText"), "WM_GETTEXT returned incorrect string\n"); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)urtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 12, "EM_EXGETSEL returned cpMin=%d, expected 12\n", cr.cpMin); + todo_wine ok(cr.cpMax == 12, "EM_EXGETSEL returned cpMax=%d, expected 12\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "TestSomeText"), "WM_GETTEXT returned incorrect string\n"); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"Wine"); + SendMessageA(hwndRichEdit, EM_SETSEL, 1, 2); + todo_wine r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 13, "EM_EXGETSEL returned cpMin=%d, expected 13\n", cr.cpMin); + todo_wine ok(cr.cpMax == 13, "EM_EXGETSEL returned cpMax=%d, expected 13\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1 Wine}"); + SendMessageA(hwndRichEdit, EM_SETSEL, 1, 2); + todo_wine r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 13, "EM_EXGETSEL returned cpMin=%d, expected 13\n", cr.cpMin); + todo_wine ok(cr.cpMax == 13, "EM_EXGETSEL returned cpMax=%d, expected 13\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); if (!redraw) /* This is needed to avoid interferring with keybd_event calls @@ -7620,15 +7818,10 @@ wbuf[1] = 0; SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)wbuf); result = SendMessageW(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER,0); - if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) - todo_wine - ok(result == delimiter_tests[i].isdelimiter, - "wanted ISDELIMITER_W(0x%x) %d, got %d\n", - delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); - else + todo_wine_if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) ok(result == delimiter_tests[i].isdelimiter, - "wanted ISDELIMITER_W(0x%x) %d, got %d\n", - delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); + "wanted ISDELIMITER_W(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); } DestroyWindow(hwndRichEdit); } @@ -7658,12 +7851,7 @@ buf[1] = 0; SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); result = SendMessageA(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); - if (buf[0] == 0x20) - todo_wine - ok(result == delimiter_tests[i].isdelimiter, - "wanted ISDELIMITER_A(0x%x) %d, got %d\n", - delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); - else + todo_wine_if (buf[0] == 0x20) ok(result == delimiter_tests[i].isdelimiter, "wanted ISDELIMITER_A(0x%x) %d, got %d\n", delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); @@ -8035,6 +8223,37 @@ DestroyWindow(richedit); } +static void test_WM_GETTEXTLENGTH(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + static const char text1[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text2[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text3[] = "abcdef\x8e\xf0"; + int result; + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text1), "WM_GETTEXTLENGTH returned %d, expected %d\n", + result, lstrlenA(text1)); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text2), "WM_GETTEXTLENGTH returned %d, expected %d\n", + result, lstrlenA(text2)); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + todo_wine ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { BOOL ret; @@ -8042,6 +8261,7 @@ * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); @@ -8078,6 +8298,7 @@ test_EM_FORMATRANGE(); test_unicode_conversions(); test_EM_GETTEXTLENGTHEX(); + test_WM_GETTEXTLENGTH(); test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY();

8 years, 9 months

[akhaldi] 70923: [RICHED20] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 09:57:50 2016 New Revision: 70923 URL: http://svn.reactos.org/svn/reactos?rev=70923&view=rev Log: [RICHED20] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sat Mar 5 09:57:50 2016 @@ -544,7 +544,8 @@ PARAFORMAT2 fmt; fmt.cbSize = sizeof(fmt); fmt.dwMask = 0; - + fmt.wEffects = 0; + switch(info->rtfMinor) { case rtfParDef: /* restores default paragraph attributes */ @@ -939,7 +940,7 @@ ME_DisplayItem *para = info->editor->pCursors[0].pPara; PARAFORMAT2 *pFmt = para->member.para.pFmt; pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; - pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; + pFmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam; } info->tableDef->numCellsDefined++; break; Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] Sat Mar 5 09:57:50 2016 @@ -102,6 +102,8 @@ { ME_DisplayItem *p = editor->pBuffer->pFirst; int ofs = 0, ofsp = 0; + + TRACE_(richedit_check)("Checking begin\n"); if(TRACE_ON(richedit_lists)) { TRACE_(richedit_lists)("---\n"); @@ -113,6 +115,7 @@ case diTextEnd: TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); assert(ofsp+ofs == p->member.para.nCharOfs); + TRACE_(richedit_check)("Checking finished\n"); return; case diParagraph: TRACE_(richedit_check)("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); @@ -137,6 +140,7 @@ assert(0); } } while(1); + TRACE_(richedit_check)("Checking finished\n"); } /****************************************************************************** @@ -239,12 +243,8 @@ ME_Remove(pNext); ME_DestroyDisplayItem(pNext); ME_UpdateRunFlags(editor, &p->member.run); - if(TRACE_ON(richedit)) - { - TRACE("Before check after join\n"); + if(TRACE_ON(richedit_check)) ME_CheckCharOffsets(editor); - TRACE("After check after join\n"); - } } /****************************************************************************** Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Sat Mar 5 09:57:50 2016 @@ -23,6 +23,7 @@ #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); +WINE_DECLARE_DEBUG_CHANNEL(richedit_check); /* * Unsolved problems: @@ -123,12 +124,8 @@ ME_Cursor cursor = {wc->pPara, item, nVChar}; assert(item->member.run.nCharOfs != -1); - if(TRACE_ON(richedit)) - { - TRACE("Before check before split\n"); + if(TRACE_ON(richedit_check)) ME_CheckCharOffsets(editor); - TRACE("After check before split\n"); - } run = &item->member.run; @@ -147,15 +144,12 @@ run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; - if(TRACE_ON(richedit)) - { - TRACE("Before check after split\n"); + if(TRACE_ON(richedit_check)) ME_CheckCharOffsets(editor); - TRACE("After check after split\n"); - TRACE("After split: %s(%d, %d), %s(%d, %d)\n", - debugstr_run( run ), run->pt.x, run->pt.y, - debugstr_run( run2 ), run2->pt.x, run2->pt.y); - } + + TRACE("After split: %s(%d, %d), %s(%d, %d)\n", + debugstr_run( run ), run->pt.x, run->pt.y, + debugstr_run( run2 ), run2->pt.x, run2->pt.y); return cursor.pRun; } 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] Sat Mar 5 09:57:50 2016 @@ -161,7 +161,7 @@ reactos/dll/win32/query # Synced to WineStaging-1.7.55 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/resutils # Synced to WineStaging-1.7.55 -reactos/dll/win32/riched20 # Synced to WineStaging-1.7.55 +reactos/dll/win32/riched20 # Synced to WineStaging-1.9.4 reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55 reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.7.55 reactos/dll/win32/rsabase # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70922: [PROGMAN] Properly import from Wine Staging 1.9.4. This fixes PCH usage, marks ReactOS specific diffs, reduces difference to upstream code, properly documents the sync in README.WI...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 08:45:08 2016 New Revision: 70922 URL: http://svn.reactos.org/svn/reactos?rev=70922&view=rev Log: [PROGMAN] Properly import from Wine Staging 1.9.4. This fixes PCH usage, marks ReactOS specific diffs, reduces difference to upstream code, properly documents the sync in README.WINE, improves header inclusions and more. Changes should be sent upstream by their author (TM). CORE-10912 Modified: trunk/reactos/base/shell/progman/dialog.c trunk/reactos/base/shell/progman/group.c trunk/reactos/base/shell/progman/grpfile.c trunk/reactos/base/shell/progman/main.c trunk/reactos/base/shell/progman/progman.h trunk/reactos/base/shell/progman/progman.rc trunk/reactos/base/shell/progman/program.c trunk/reactos/base/shell/progman/string.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/shell/progman/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/dialog.… ============================================================================== --- trunk/reactos/base/shell/progman/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/dialog.c [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -21,6 +21,8 @@ */ #include "progman.h" + +#include <commdlg.h> /*********************************************************************** * Modified: trunk/reactos/base/shell/progman/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/group.c… ============================================================================== --- trunk/reactos/base/shell/progman/group.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/group.c [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -58,8 +58,8 @@ class.cbClsExtra = 0; class.cbWndExtra = sizeof(LONG_PTR); class.hInstance = Globals.hInstance; - class.hIcon = LoadIconW(0, (LPWSTR)IDI_WINLOGO); - class.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + class.hIcon = LoadIconW (0, (LPWSTR)IDI_WINLOGO); + class.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); class.hbrBackground = GetStockObject (WHITE_BRUSH); class.lpszMenuName = 0; class.lpszClassName = STRING_GROUP_WIN_CLASS_NAME; @@ -170,7 +170,11 @@ cs.style = 0; cs.lParam = 0; +#ifdef __REACTOS__ group->hWnd = (HWND)SendMessageW(Globals.hMDIWnd, WM_MDICREATE, 0, (LPARAM)&cs); +#else + group->hWnd = (HWND)SendMessageA(Globals.hMDIWnd, WM_MDICREATE, 0, (LPARAM)&cs); +#endif SetWindowTextA( group->hWnd, lpszName ); SetWindowLongPtrW(group->hWnd, 0, (LONG_PTR) hGroup); Modified: trunk/reactos/base/shell/progman/grpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/grpfile… ============================================================================== --- trunk/reactos/base/shell/progman/grpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/grpfile.c [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -20,7 +20,6 @@ */ #include "progman.h" -// #include <mmsystem.h> #define MALLOCHUNK 1000 @@ -277,7 +276,11 @@ if (iconANDbits_ptr + iconANDsize > buffer + size || iconXORbits_ptr + iconXORsize > buffer + size) return(0); - hIcon = CreateIcon( Globals.hInstance, width, height, planes, bpp, (PBYTE)iconANDbits_ptr, (PBYTE)iconXORbits_ptr ); +#ifdef __REACTOS__ + hIcon = CreateIcon(Globals.hInstance, width, height, planes, bpp, (PBYTE)iconANDbits_ptr, (PBYTE)iconXORbits_ptr); +#else + hIcon = CreateIcon( Globals.hInstance, width, height, planes, bpp, iconANDbits_ptr, iconXORbits_ptr ); +#endif lpszName = buffer + GET_USHORT(program_ptr, 18); lpszCmdLine = buffer + GET_USHORT(program_ptr, 20); @@ -508,7 +511,11 @@ HLOCAL hProgram; INT NumProg, Title, Progs, Icons, Extension; INT CurrProg, CurrIcon, nCmdShow, ptr, seqnum; - UINT sizeAnd, sizeXor; +#ifdef __REACTOS__ + UINT sizeAnd, sizeXor; +#else + DWORD sizeAnd, sizeXor; +#endif BOOL need_extension; LPCSTR lpszTitle = LocalLock(group->hName); Modified: trunk/reactos/base/shell/progman/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?… ============================================================================== --- trunk/reactos/base/shell/progman/main.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/main.c [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -// #define OEMRESOURCE #include "progman.h" + +#include <shellapi.h> GLOBALS Globals; @@ -38,11 +39,18 @@ * WinMain */ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +#ifdef __REACTOS__ +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +#else +int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +#endif { MSG msg; Globals.lpszIniFile = "progman.ini"; +#ifndef __REACTOS__ + Globals.lpszIcoFile = "progman.ico"; +#endif Globals.hInstance = hInstance; Globals.hGroups = 0; @@ -57,9 +65,15 @@ GetPrivateProfileIntA("Settings", "SaveSettings", 0, Globals.lpszIniFile); /* Load default icons */ - Globals.hMainIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON)); - Globals.hGroupIcon = Globals.hMainIcon; // ExtractIconA(Globals.hInstance, Globals.lpszIcoFile, 0); - Globals.hDefaultIcon = Globals.hMainIcon; // ExtractIconA(Globals.hInstance, Globals.lpszIcoFile, 0); +#ifdef __REACTOS__ + Globals.hMainIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON)); + Globals.hGroupIcon = Globals.hMainIcon; + Globals.hDefaultIcon = Globals.hMainIcon; +#else + Globals.hMainIcon = ExtractIconA(Globals.hInstance, Globals.lpszIcoFile, 0); + Globals.hGroupIcon = ExtractIconA(Globals.hInstance, Globals.lpszIcoFile, 0); + Globals.hDefaultIcon = ExtractIconA(Globals.hInstance, Globals.lpszIcoFile, 0); +#endif if (!Globals.hMainIcon) Globals.hMainIcon = LoadIconW(0, (LPWSTR)DEFAULTICON); if (!Globals.hGroupIcon) Globals.hGroupIcon = LoadIconW(0, (LPWSTR)DEFAULTICON); if (!Globals.hDefaultIcon) Globals.hDefaultIcon = LoadIconW(0, (LPWSTR)DEFAULTICON); @@ -310,12 +324,17 @@ break; case PM_ABOUT_WINE: +#ifdef __REACTOS__ { WCHAR szTitle[MAX_STRING_LEN]; LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, szTitle, ARRAYSIZE(szTitle)); ShellAboutW(hWnd, szTitle, NULL, NULL); break; } +#else + ShellAboutA(hWnd, "WINE", "Program Manager", 0); + break; +#endif default: MAIN_MessageBoxIDS(IDS_NOT_IMPLEMENTED, IDS_ERROR, MB_OK); @@ -338,7 +357,7 @@ class.cbWndExtra = 0; class.hInstance = Globals.hInstance; class.hIcon = Globals.hMainIcon; - class.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + class.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); class.hbrBackground = GetStockObject (NULL_BRUSH); class.lpszMenuName = 0; class.lpszClassName = STRING_MAIN_WIN_CLASS_NAME; Modified: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.h [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -23,20 +23,16 @@ #define PROGMAN_H #include <stdio.h> -#include <string.h> - -#define WIN32_LEAN_AND_MEAN - -#include <windows.h> + +#define WIN32_NO_STATUS #include <windef.h> -#include <commdlg.h> -#include <shellapi.h> - +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> #define MAX_STRING_LEN 255 #define MAX_PATHNAME_LEN 1024 #define MAX_LANGUAGE_NUMBER (PM_LAST_LANGUAGE - PM_FIRST_LANGUAGE) - #include "resource.h" @@ -138,6 +134,9 @@ HMENU hWindowsMenu; HMENU hLanguageMenu; LPCSTR lpszIniFile; +#ifndef __REACTOS__ + LPCSTR lpszIcoFile; +#endif BOOL bAutoArrange; BOOL bSaveSettings; BOOL bMinOnRun; @@ -206,3 +205,7 @@ extern WCHAR STRING_PROGRAM_WIN_CLASS_NAME[]; #endif /* PROGMAN_H */ + +/* Local Variables: */ +/* c-file-style: "GNU" */ +/* End: */ Modified: trunk/reactos/base/shell/progman/progman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.rc [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -21,22 +21,17 @@ #include <windef.h> #include <winuser.h> -// #include <commctrl.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Program Manager" -#define REACTOS_STR_INTERNAL_NAME "progman" -#define REACTOS_STR_ORIGINAL_FILENAME "progman.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Program Manager" +#define REACTOS_STR_INTERNAL_NAME "progman" +#define REACTOS_STR_ORIGINAL_FILENAME "progman.exe" #include <reactos/version.rc> IDI_APPICON ICON "res/progman.ico" - - - - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT @@ -188,7 +183,11 @@ EDITTEXT PM_DIRECTORY, 95, 40, 90, 15, WS_TABSTOP LTEXT "&Key combination:", PM_HOT_KEY_TXT, 5, 55, 75, 10 EDITTEXT PM_HOT_KEY, 95, 55, 90, 15, WS_TABSTOP +#ifdef __REACTOS__ ICON "", PM_ICON, 20, 70, 20, 20 +#else +ICON "", PM_ICON, 20, 70 +#endif CHECKBOX "&Minimize at launch", PM_SYMBOL, 95, 75, 90, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 200, 5, 70, 15, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 200, 25, 70, 15, WS_TABSTOP Modified: trunk/reactos/base/shell/progman/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/program… ============================================================================== --- trunk/reactos/base/shell/progman/program.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/program.c [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -77,7 +77,7 @@ class.cbWndExtra = sizeof(LONG_PTR); class.hInstance = Globals.hInstance; class.hIcon = 0; - class.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + class.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); class.hbrBackground = GetStockObject (WHITE_BRUSH); class.lpszMenuName = 0; class.lpszClassName = STRING_PROGRAM_WIN_CLASS_NAME; Modified: trunk/reactos/base/shell/progman/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/string.… ============================================================================== --- trunk/reactos/base/shell/progman/string.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/string.c [iso-8859-1] Sat Mar 5 08:45:08 2016 @@ -30,31 +30,36 @@ VOID STRING_LoadMenus(VOID) { - WCHAR caption[MAX_STRING_LEN]; - HMENU hMainMenu; +#ifdef __REACTOS__ + WCHAR caption[MAX_STRING_LEN]; +#else + CHAR caption[MAX_STRING_LEN]; +#endif + HMENU hMainMenu; - /* Set frame caption */ - LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption)); - SetWindowTextW(Globals.hMainWnd, caption); + /* Set frame caption */ +#ifdef __REACTOS__ + LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption)); + SetWindowTextW(Globals.hMainWnd, caption); +#else + LoadStringA(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption)); + SetWindowTextA(Globals.hMainWnd, caption); +#endif - /* Create menu */ - hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU)); - Globals.hFileMenu = GetSubMenu(hMainMenu, 0); - Globals.hOptionMenu = GetSubMenu(hMainMenu, 1); - Globals.hWindowsMenu = GetSubMenu(hMainMenu, 2); - Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3); + /* Create menu */ + hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU)); + Globals.hFileMenu = GetSubMenu(hMainMenu, 0); + Globals.hOptionMenu = GetSubMenu(hMainMenu, 1); + Globals.hWindowsMenu = GetSubMenu(hMainMenu, 2); + Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3); - if (Globals.hMDIWnd) - { - SendMessageW(Globals.hMDIWnd, WM_MDISETMENU, - (WPARAM)hMainMenu, (LPARAM)Globals.hWindowsMenu); - } - else - { - SetMenu(Globals.hMainWnd, hMainMenu); - } + if (Globals.hMDIWnd) + SendMessageW(Globals.hMDIWnd, WM_MDISETMENU, + (WPARAM) hMainMenu, + (LPARAM) Globals.hWindowsMenu); + else SetMenu(Globals.hMainWnd, hMainMenu); - /* Destroy old menu */ - if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); - Globals.hMainMenu = hMainMenu; + /* Destroy old menu */ + if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); + Globals.hMainMenu = hMainMenu; } 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] Sat Mar 5 08:45:08 2016 @@ -242,6 +242,7 @@ reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.4 reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 reactos/base/services/rpcss # Synced to WineStaging-1.7.55 +reactos/base/shell/progman # Synced to WineStaging-1.9.4 reactos/base/system/expand # Synced to WineStaging-1.7.55 reactos/base/system/msiexec # Synced to WineStaging-1.9.4 reactos/modules/rosapps/winfile # Autosync

8 years, 9 months

[akhaldi] 70921: [PROGMAN] Fix build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 08:24:55 2016 New Revision: 70921 URL: http://svn.reactos.org/svn/reactos?rev=70921&view=rev Log: [PROGMAN] Fix build. Modified: trunk/reactos/base/shell/progman/progman.h Modified: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.h [iso-8859-1] Sat Mar 5 08:24:55 2016 @@ -21,8 +21,6 @@ #ifndef PROGMAN_H #define PROGMAN_H - -#pragma once #include <stdio.h> #include <string.h>

8 years, 9 months

[hbelusca] 70918: [PROGMAN]: Add the famous Program Manager (Win3.1 style) from Wine 1.9.5, with minor fixes for compilation. The icon should be replaced as soon as possible.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 4 19:22:35 2016 New Revision: 70918 URL: http://svn.reactos.org/svn/reactos?rev=70918&view=rev Log: [PROGMAN]: Add the famous Program Manager (Win3.1 style) from Wine 1.9.5, with minor fixes for compilation. The icon should be replaced as soon as possible. Added: trunk/reactos/base/shell/progman/ (with props) trunk/reactos/base/shell/progman/CMakeLists.txt (with props) trunk/reactos/base/shell/progman/dialog.c (with props) trunk/reactos/base/shell/progman/group.c (with props) trunk/reactos/base/shell/progman/grpfile.c (with props) trunk/reactos/base/shell/progman/main.c (with props) trunk/reactos/base/shell/progman/progman.h (with props) trunk/reactos/base/shell/progman/progman.rc (with props) trunk/reactos/base/shell/progman/program.c (with props) trunk/reactos/base/shell/progman/res/ (with props) trunk/reactos/base/shell/progman/res/progman.ico (with props) trunk/reactos/base/shell/progman/resource.h (with props) trunk/reactos/base/shell/progman/string.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/shell/progman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/CMakeLi… Added: trunk/reactos/base/shell/progman/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/dialog.… Added: trunk/reactos/base/shell/progman/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/group.c… Added: trunk/reactos/base/shell/progman/grpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/grpfile… Added: trunk/reactos/base/shell/progman/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?… Added: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… Added: trunk/reactos/base/shell/progman/progman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… Added: trunk/reactos/base/shell/progman/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/program… Added: trunk/reactos/base/shell/progman/res/progman.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/res/pro… Added: trunk/reactos/base/shell/progman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/resourc… Added: trunk/reactos/base/shell/progman/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/string.…

8 years, 9 months

[hbelusca] 70919: [PROGMAN] - Fix the Shell-About box. - Whitespace/indentation fixes in string.c - Add missing size for the ICON resource item of the dialog "Program attributes". MSVC resource com...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 5 01:27:27 2016 New Revision: 70919 URL: http://svn.reactos.org/svn/reactos?rev=70919&view=rev Log: [PROGMAN] - Fix the Shell-About box. - Whitespace/indentation fixes in string.c - Add missing size for the ICON resource item of the dialog "Program attributes". MSVC resource compiler considered that as an error, while GCC's windres compiled that without warning (who knows what they took as the default value...). Modified: trunk/reactos/base/shell/progman/main.c trunk/reactos/base/shell/progman/progman.rc trunk/reactos/base/shell/progman/string.c Modified: trunk/reactos/base/shell/progman/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?… ============================================================================== --- trunk/reactos/base/shell/progman/main.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/main.c [iso-8859-1] Sat Mar 5 01:27:27 2016 @@ -310,8 +310,12 @@ break; case PM_ABOUT_WINE: - ShellAboutA(hWnd, "WINE", "Program Manager", 0); - break; + { + WCHAR szTitle[MAX_STRING_LEN]; + LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, szTitle, ARRAYSIZE(szTitle)); + ShellAboutW(hWnd, szTitle, NULL, NULL); + break; + } default: MAIN_MessageBoxIDS(IDS_NOT_IMPLEMENTED, IDS_ERROR, MB_OK); Modified: trunk/reactos/base/shell/progman/progman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.rc [iso-8859-1] Sat Mar 5 01:27:27 2016 @@ -188,7 +188,7 @@ EDITTEXT PM_DIRECTORY, 95, 40, 90, 15, WS_TABSTOP LTEXT "&Key combination:", PM_HOT_KEY_TXT, 5, 55, 75, 10 EDITTEXT PM_HOT_KEY, 95, 55, 90, 15, WS_TABSTOP -ICON "", PM_ICON, 20, 70 +ICON "", PM_ICON, 20, 70, 20, 20 CHECKBOX "&Minimize at launch", PM_SYMBOL, 95, 75, 90, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 200, 5, 70, 15, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 200, 25, 70, 15, WS_TABSTOP Modified: trunk/reactos/base/shell/progman/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/string.… ============================================================================== --- trunk/reactos/base/shell/progman/string.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/string.c [iso-8859-1] Sat Mar 5 01:27:27 2016 @@ -30,27 +30,31 @@ VOID STRING_LoadMenus(VOID) { - CHAR caption[MAX_STRING_LEN]; - HMENU hMainMenu; + WCHAR caption[MAX_STRING_LEN]; + HMENU hMainMenu; - /* Set frame caption */ - LoadStringA(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption)); - SetWindowTextA(Globals.hMainWnd, caption); + /* Set frame caption */ + LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption)); + SetWindowTextW(Globals.hMainWnd, caption); - /* Create menu */ - hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU)); - Globals.hFileMenu = GetSubMenu(hMainMenu, 0); - Globals.hOptionMenu = GetSubMenu(hMainMenu, 1); - Globals.hWindowsMenu = GetSubMenu(hMainMenu, 2); - Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3); + /* Create menu */ + hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU)); + Globals.hFileMenu = GetSubMenu(hMainMenu, 0); + Globals.hOptionMenu = GetSubMenu(hMainMenu, 1); + Globals.hWindowsMenu = GetSubMenu(hMainMenu, 2); + Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3); - if (Globals.hMDIWnd) - SendMessageW(Globals.hMDIWnd, WM_MDISETMENU, - (WPARAM) hMainMenu, - (LPARAM) Globals.hWindowsMenu); - else SetMenu(Globals.hMainWnd, hMainMenu); + if (Globals.hMDIWnd) + { + SendMessageW(Globals.hMDIWnd, WM_MDISETMENU, + (WPARAM)hMainMenu, (LPARAM)Globals.hWindowsMenu); + } + else + { + SetMenu(Globals.hMainWnd, hMainMenu); + } - /* Destroy old menu */ - if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); - Globals.hMainMenu = hMainMenu; + /* Destroy old menu */ + if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); + Globals.hMainMenu = hMainMenu; }

8 years, 9 months

[hbelusca] 70920: [OOPS] A little bird pointed to me that I forgot to add progman to compilation...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 5 01:29:46 2016 New Revision: 70920 URL: http://svn.reactos.org/svn/reactos?rev=70920&view=rev Log: [OOPS] A little bird pointed to me that I forgot to add progman to compilation... Modified: trunk/reactos/base/shell/CMakeLists.txt Modified: trunk/reactos/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?… ============================================================================== --- trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] Sat Mar 5 01:29:46 2016 @@ -2,4 +2,5 @@ add_subdirectory(cmd) add_subdirectory(explorer) add_subdirectory(filebrowser) +add_subdirectory(progman) add_subdirectory(rshell)

8 years, 9 months

[rnaumann] 70915: [RAPPS] Display error messages on download failures. Patch by toe_head2001. Thank you!

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Mar 4 16:10:26 2016 New Revision: 70915 URL: http://svn.reactos.org/svn/reactos?rev=70915&view=rev Log: [RAPPS] Display error messages on download failures. Patch by toe_head2001. Thank you! Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/resource.h Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -204,4 +204,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -205,4 +205,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -203,4 +203,6 @@ IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobaciÃ³n del certificado SSL." IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..." IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobaciÃ³n de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo." -END + IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexiÃ³n a Internet." + IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre." +END Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "La vÃ©rification du certificat SSL a Ã©chouÃ©." IDS_INTEG_CHECK_TITLE "VÃ©rification de l'intÃ©gritÃ© du paquet..." IDS_INTEG_CHECK_FAIL "Le contrÃ´le d'intÃ©gritÃ© du paquet a Ã©chouÃ©, il se peut qu'il ait Ã©tÃ© corrompu ou altÃ©rÃ© au cours du tÃ©lÃ©chargement. L'exÃ©cution du programme n'est pas recommandÃ©e." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -208,4 +208,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -206,4 +206,6 @@ IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eÈuat." IDS_INTEG_CHECK_TITLE "Se verificÄ integritatea pachetuluiâ¦" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandatÄ." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ SSL ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." IDS_INTEG_CHECK_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÐ¾ÑÐ»Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÐµÐ½Ð¾. ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -205,4 +205,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -204,4 +204,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -207,4 +207,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doÄrulamasÄ± baÅarÄ±sÄ±z." IDS_INTEG_CHECK_TITLE "Paket bÃ¼tÃ¼nlÃ¼ÄÃ¼ doÄrulanÄ±yor..." IDS_INTEG_CHECK_FAIL "Paket bÃ¼tÃ¼nlÃ¼k denetimini geÃ§medi, bozulmuÅ veyÃ¢ indirme esnÃ¢sÄ±nda oynanmÄ±Å olabilir. YazÄ±lÄ±mÄ± Ã§alÄ±ÅtÄ±rmak Ã¶nerilmez." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -208,4 +208,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -203,4 +203,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL æèé©èå¤±æã" IDS_INTEG_CHECK_TITLE "é©èå¥è£è»é«çå®æ´æ§..." IDS_INTEG_CHECK_FAIL "åæ²æééå®æ´æ§æª¢æ¥ï¼å®å¯è½å·²æå£ï¼æèå¨ä¸è¼éç¨ä¸ç¯¡æ¹ãå»ºè°æ¨ä¸è¦éè¡è©²è»é«ã" -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -458,8 +458,26 @@ do { - if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) goto end; - if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) goto end; + if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_INTERRUPTED_DOWNLOAD, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } + if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_UNABLE_TO_WRITE, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } dwCurrentBytesRead += dwBytesRead; IBindStatusCallback_OnProgress(dl, dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); } Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -99,6 +99,8 @@ #define IDS_CERT_DOES_NOT_MATCH 120 #define IDS_INTEG_CHECK_TITLE 121 #define IDS_INTEG_CHECK_FAIL 122 +#define IDS_INTERRUPTED_DOWNLOAD 123 +#define IDS_UNABLE_TO_WRITE 124 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200

8 years, 9 months

[hbelusca] 70916: [FORMAT] - Completely reunicodify the application. CORE-9369 - Add back the original copyright/author information.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 4 16:26:57 2016 New Revision: 70916 URL: http://svn.reactos.org/svn/reactos?rev=70916&view=rev Log: [FORMAT] - Completely reunicodify the application. CORE-9369 - Add back the original copyright/author information. Modified: trunk/reactos/base/system/format/CMakeLists.txt trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/CMakeLi… ============================================================================== --- trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] Fri Mar 4 16:26:57 2016 @@ -1,6 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs) add_executable(format format.c format.rc) -set_module_type(format win32cui) +set_module_type(format win32cui UNICODE) set_target_properties(format PROPERTIES SUFFIX ".com") add_importlibs(format user32 fmifs msvcrt kernel32 ntdll) add_cd_file(TARGET format DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Fri Mar 4 16:26:57 2016 @@ -1,18 +1,63 @@ +//====================================================================== +// +// Formatx +// // Copyright (c) 1998 Mark Russinovich // Systems Internals // http://www.sysinternals.com - +// +// Format clone that demonstrates the use of the FMIFS file system +// utility library. +// +// -------------------------------------------------------------------- +// +// This software is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public License as +// published by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version. +// +// This software is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this software; see the file COPYING.LIB. If +// not, write to the Free Software Foundation, Inc., 675 Mass Ave, +// Cambridge, MA 02139, USA. +// +// -------------------------------------------------------------------- +// +// 1999 February (Emanuele Aliberti) +// Adapted for ReactOS and lcc-win32. +// +// 1999 April (Emanuele Aliberti) +// Adapted for ReactOS and egcs. +// +// 2003 April (Casper S. Hornstrup) +// Reintegration. +// +//====================================================================== + +#include <stdio.h> +#include <tchar.h> + +/* PSDK/NDK Headers */ #define WIN32_NO_STATUS -#include <stdio.h> #include <windef.h> #include <winbase.h> #include <winnls.h> #include <winuser.h> -#include <wine/winternl.h> + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> + +/* FMIFS Public Header */ #include <fmifs/fmifs.h> -#include <tchar.h> #include "resource.h" + +#define FMIFS_IMPORT_DLL // Globals BOOL Error = FALSE; @@ -22,46 +67,76 @@ DWORD ClusterSize = 0; BOOL CompressDrive = FALSE; BOOL GotALabel = FALSE; -LPTSTR Label = _T(""); -LPTSTR Drive = NULL; -LPTSTR FileSystem = _T("FAT"); - -TCHAR RootDirectory[MAX_PATH]; -TCHAR LabelString[12]; +PWCHAR Label = L""; +PWCHAR Drive = NULL; +PWCHAR FileSystem = L"FAT"; + +WCHAR RootDirectory[MAX_PATH]; +WCHAR LabelString[12]; + +#ifndef FMIFS_IMPORT_DLL +// +// Functions in FMIFS.DLL +// +PFORMATEX FormatEx; +PENABLEVOLUMECOMPRESSION EnableVolumeCompression; +PQUERYAVAILABLEFILESYSTEMFORMAT QueryAvailableFileSystemFormat; +#endif + // // Size array // typedef struct { - TCHAR SizeString[16]; + WCHAR SizeString[16]; DWORD ClusterSize; } SIZEDEFINITION, *PSIZEDEFINITION; SIZEDEFINITION LegalSizes[] = { - { _T("512"), 512 }, - { _T("1024"), 1024 }, - { _T("2048"), 2048 }, - { _T("4096"), 4096 }, - { _T("8192"), 8192 }, - { _T("16K"), 16384 }, - { _T("32K"), 32768 }, - { _T("64K"), 65536 }, - { _T("128K"), 65536 * 2 }, - { _T("256K"), 65536 * 4 }, - { _T(""), 0 }, + { L"512", 512 }, + { L"1024", 1024 }, + { L"2048", 2048 }, + { L"4096", 4096 }, + { L"8192", 8192 }, + { L"16K", 16384 }, + { L"32K", 32768 }, + { L"64K", 65536 }, + { L"128K", 65536 * 2 }, + { L"256K", 65536 * 4 }, + { L"", 0 }, }; -int LoadStringAndOem(HINSTANCE hInst, - UINT uID, - LPTSTR szStr, - int Siz -) -{ - TCHAR szTmp[RC_STRING_MAX_SIZE]; - int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); - CharToOem(szTmp, szStr); - return(res); +VOID PrintStringV(LPWSTR szStr, va_list args) +{ + WCHAR bufFormatted[RC_STRING_MAX_SIZE]; + CHAR bufFormattedOem[RC_STRING_MAX_SIZE]; + + _vsnwprintf(bufFormatted, ARRAYSIZE(bufFormatted), szStr, args); + + CharToOemW(bufFormatted, bufFormattedOem); + puts(bufFormattedOem); +} + +VOID PrintString(LPWSTR szStr, ...) +{ + va_list args; + + va_start(args, szStr); + PrintStringV(szStr, args); + va_end(args); +} + +VOID PrintResourceString(UINT uID, ...) +{ + WCHAR bufSrc[RC_STRING_MAX_SIZE]; + va_list args; + + LoadStringW(GetModuleHandleW(NULL), uID, bufSrc, ARRAYSIZE(bufSrc)); + + va_start(args, uID); + PrintStringV(bufSrc, args); + va_end(args); } @@ -72,16 +147,16 @@ // Takes the win32 error code and prints the text version. // //---------------------------------------------------------------------- -static VOID PrintWin32Error( LPTSTR Message, DWORD ErrorCode ) -{ - LPTSTR lpMsgBuf; - - FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, +static VOID PrintWin32Error( LPWSTR Message, DWORD ErrorCode ) +{ + LPWSTR lpMsgBuf; + + FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, 0, NULL ); - - _tprintf(_T("%s: %s\n"), Message, lpMsgBuf ); + (LPWSTR)&lpMsgBuf, 0, NULL ); + + PrintString(L"%s: %s\n", Message, lpMsgBuf ); LocalFree( lpMsgBuf ); } @@ -93,7 +168,7 @@ // Get the switches. // //---------------------------------------------------------------------- -static int ParseCommandLine( int argc, TCHAR *argv[] ) +static int ParseCommandLine( int argc, WCHAR *argv[] ) { int i, j; BOOLEAN gotFormat = FALSE; @@ -107,41 +182,41 @@ switch( argv[i][0] ) { - case '-': - case '/': - - if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) { + case L'-': + case L'/': + + if( !_wcsnicmp( &argv[i][1], L"FS:", 3 )) { if( gotFormat) return -1; FileSystem = &argv[i][4]; gotFormat = TRUE; - } else if( !_tcsnicmp( &argv[i][1], _T("A:"), 2 )) { + } else if( !_wcsnicmp( &argv[i][1], L"A:", 2 )) { if( gotSize ) return -1; j = 0; while( LegalSizes[j].ClusterSize && - _tcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; + wcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; if( !LegalSizes[j].ClusterSize ) return i; ClusterSize = LegalSizes[j].ClusterSize; gotSize = TRUE; - } else if( ! _tcsnicmp( &argv[i][1], _T("V:"), 2 )) { + } else if( ! _wcsnicmp( &argv[i][1], L"V:", 2 )) { if( gotLabel ) return -1; Label = &argv[i][3]; gotLabel = TRUE; GotALabel = TRUE; - } else if( !_tcsicmp( &argv[i][1], _T("Q") )) { + } else if( !wcsicmp( &argv[i][1], L"Q" )) { if( gotQuick ) return -1; QuickFormat = TRUE; gotQuick = TRUE; - } else if( !_tcsicmp( &argv[i][1], _T("C") )) { + } else if( !wcsicmp( &argv[i][1], L"C" )) { if( gotCompressed ) return -1; CompressDrive = TRUE; @@ -153,7 +228,7 @@ default: if( Drive ) return i; - if( argv[i][1] != _T(':') ) return i; + if( argv[i][1] != L':' ) return i; Drive = argv[i]; break; @@ -179,7 +254,6 @@ PDWORD percent; PTEXTOUTPUT output; PBOOLEAN status; - TCHAR szMsg[RC_STRING_MAX_SIZE]; // // We get other types of commands, but we don't have to pay attention to them @@ -188,21 +262,19 @@ case PROGRESS: percent = (PDWORD) Argument; - LoadStringAndOem( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, *percent); + PrintResourceString(STRING_COMPLETE, *percent); break; case OUTPUT: output = (PTEXTOUTPUT) Argument; - fprintf(stdout, "%s", output->Output); + wprintf(L"%S", output->Output); break; case DONE: status = (PBOOLEAN) Argument; if( *status == FALSE ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_FORMAT_FAIL); Error = TRUE; } break; @@ -220,14 +292,13 @@ case UNKNOWND: case STRUCTUREPROGRESS: case CLUSTERSIZETOOSMALL: - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_NO_SUPPORT); return FALSE; } return TRUE; } - +#ifndef FMIFS_IMPORT_DLL //---------------------------------------------------------------------- // // LoadFMIFSEntryPoints @@ -235,32 +306,34 @@ // Loads FMIFS.DLL and locates the entry point(s) we are going to use // //---------------------------------------------------------------------- -BOOLEAN LoadFMIFSEntryPoints() -{ - HMODULE hFmifs = LoadLibrary( _T("fmifs.dll") ); +static BOOLEAN LoadFMIFSEntryPoints(VOID) +{ + HMODULE hFmifs = LoadLibraryW( L"fmifs.dll" ); if (hFmifs == NULL) { return FALSE; } - if( !(void*) GetProcAddress( hFmifs, "FormatEx" ) ) { + FormatEx = (PFORMATEX)GetProcAddress(hFmifs, "FormatEx"); + if (!FormatEx) { FreeLibrary(hFmifs); return FALSE; } - if( !((void *) GetProcAddress( hFmifs, - "EnableVolumeCompression" )) ) { + EnableVolumeCompression = (PENABLEVOLUMECOMPRESSION)GetProcAddress(hFmifs, "EnableVolumeCompression"); + if (!EnableVolumeCompression) { FreeLibrary(hFmifs); return FALSE; } - if( !((void *) GetProcAddress( hFmifs, - "QueryAvailableFileSystemFormat" )) ) { + QueryAvailableFileSystemFormat = (PQUERYAVAILABLEFILESYSTEMFORMAT)GetProcAddress(hFmifs, "QueryAvailableFileSystemFormat"); + if (!QueryAvailableFileSystemFormat) { FreeLibrary(hFmifs); return FALSE; } return TRUE; } +#endif //---------------------------------------------------------------------- @@ -270,24 +343,24 @@ // Tell the user how to use the program // //---------------------------------------------------------------------- -static VOID Usage( LPTSTR ProgramName ) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szFormats[MAX_PATH]; -#ifndef UNICODE - TCHAR szFormatA[MAX_PATH]; -#endif +static VOID Usage( LPWSTR ProgramName ) +{ + WCHAR szMsg[RC_STRING_MAX_SIZE]; + WCHAR szFormats[MAX_PATH]; WCHAR szFormatW[MAX_PATH]; DWORD Index = 0; BYTE dummy; BOOLEAN latestVersion; - LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_HELP, szMsg, ARRAYSIZE(szMsg)); + +#ifndef FMIFS_IMPORT_DLL if (!LoadFMIFSEntryPoints()) { - _tprintf(szMsg, ProgramName, _T("")); + PrintString(szMsg, ProgramName, L""); return; } +#endif szFormats[0] = 0; while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) @@ -295,15 +368,11 @@ if (!latestVersion) continue; if (szFormats[0]) - _tcscat(szFormats, _T(", ")); -#ifdef UNICODE - _tcscat(szFormats, szFormatW); -#else - if (0 != WideCharToMultiByte(CP_ACP, 0, szFormatW, -1, szFormatA, sizeof(szFormatA), NULL, NULL)) - _tcscat(szFormats, szFormatA); -#endif - } - _tprintf(szMsg, ProgramName, szFormats); + wcscat(szFormats, L", "); + + wcscat(szFormats, szFormatW); + } + PrintString(szMsg, ProgramName, szFormats); } @@ -319,39 +388,40 @@ // arguments. // //---------------------------------------------------------------------- -int -_tmain(int argc, TCHAR *argv[]) +int wmain(int argc, WCHAR *argv[]) { int badArg; DWORD media = FMIFS_HARDDISK; DWORD driveType; - TCHAR fileSystem[1024]; - TCHAR volumeName[1024]; - TCHAR input[1024]; + WCHAR fileSystem[1024]; + WCHAR volumeName[1024]; + WCHAR input[1024]; DWORD serialNumber; DWORD flags, maxComponent; ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; -#ifndef UNICODE - WCHAR RootDirectoryW[MAX_PATH], FileSystemW[MAX_PATH], LabelW[MAX_PATH]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + + wprintf(L"\n" + L"Formatx v1.0 by Mark Russinovich\n" + L"Systems Internals - http://www.sysinternals.com\n" + L"ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); + +#ifndef FMIFS_IMPORT_DLL + // + // Get function pointers + // + if( !LoadFMIFSEntryPoints()) { + PrintResourceString(STRING_FMIFS_FAIL); + return -1; + } #endif - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - // - // Get function pointers - // - if( !LoadFMIFSEntryPoints()) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); - return -1; - } // // Parse command line // if( (badArg = ParseCommandLine( argc, argv ))) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, argv[badArg] ); + PrintResourceString(STRING_UNKNOW_ARG, argv[badArg]); Usage(argv[0]); return -1; @@ -362,44 +432,41 @@ // if( !Drive ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + PrintResourceString(STRING_DRIVE_PARM); Usage( argv[0] ); return -1; } else { - _tcscpy( RootDirectory, Drive ); - } - RootDirectory[2] = _T('\\'); - RootDirectory[3] = _T('\0'); + wcscpy( RootDirectory, Drive ); + } + RootDirectory[2] = L'\\'; + RootDirectory[3] = L'\0'; // // See if the drive is removable or not // - driveType = GetDriveType( RootDirectory ); + driveType = GetDriveTypeW( RootDirectory ); switch (driveType) { case DRIVE_UNKNOWN : - LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; case DRIVE_REMOTE: case DRIVE_CDROM: - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - _tprintf(szMsg); + PrintResourceString(STRING_NO_SUPPORT); return -1; case DRIVE_NO_ROOT_DIR: - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; case DRIVE_REMOVABLE: - LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - _fgetts( input, sizeof(input)/2, stdin ); + PrintResourceString(STRING_INSERT_DISK, RootDirectory[0]); + fgetws( input, ARRAYSIZE(input), stdin ); media = FMIFS_FLOPPY; break; @@ -411,17 +478,16 @@ // Reject attempts to format the system drive { - TCHAR path[MAX_PATH + 1]; + WCHAR path[MAX_PATH + 1]; UINT rc; - rc = GetWindowsDirectory(path, MAX_PATH); + rc = GetWindowsDirectoryW(path, MAX_PATH); if (rc == 0 || rc > MAX_PATH) // todo: Report "Unable to query system directory" return -1; - if (_totlower(path[0]) == _totlower(Drive[0])) + if (towlower(path[0]) == towlower(Drive[0])) { // todo: report "Cannot format system drive" - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - _tprintf(szMsg); + PrintResourceString(STRING_NO_SUPPORT); return -1; } } @@ -429,27 +495,26 @@ // // Determine the drive's file system format // - if( !GetVolumeInformation( RootDirectory, - volumeName, sizeof(volumeName)/2, + if( !GetVolumeInformationW( RootDirectory, + volumeName, ARRAYSIZE(volumeName), &serialNumber, &maxComponent, &flags, - fileSystem, sizeof(fileSystem)/2)) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + fileSystem, ARRAYSIZE(fileSystem))) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } - if( !GetDiskFreeSpaceEx( RootDirectory, + if( !GetDiskFreeSpaceExW( RootDirectory, &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, fileSystem ); + PrintResourceString(STRING_FILESYSTEM, fileSystem); // // Make sure they want to do this @@ -460,30 +525,27 @@ while(1 ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - _fgetts( input, sizeof(input)/2, stdin ); - input[ _tcslen( input ) - 1] = 0; - - if( !_tcsicmp( input, volumeName )) { + PrintResourceString(STRING_LABEL_NAME_EDIT, RootDirectory[0]); + fgetws( input, ARRAYSIZE(input), stdin ); + input[ wcslen( input ) - 1] = 0; + + if( !wcsicmp( input, volumeName )) { break; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_ERROR_LABEL); } } - LoadStringAndOem( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - - LoadStringAndOem( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintResourceString(STRING_YN_FORMAT, RootDirectory[0]); + + LoadStringW(GetModuleHandle(NULL), STRING_YES_NO_FAQ, szMsg, ARRAYSIZE(szMsg)); while( 1 ) { - _fgetts( input, sizeof(input)/2, stdin ); - if(_strnicmp(&input[0],&szMsg[0],1) == 0) break; - if(_strnicmp(&input[0],&szMsg[1],1) == 0) { - _tprintf(_T("\n")); + fgetws( input, ARRAYSIZE(input), stdin ); + if(_wcsnicmp(&input[0],&szMsg[0],1) == 0) break; + if(_wcsnicmp(&input[0],&szMsg[1],1) == 0) { + wprintf(L"\n"); return 0; } } @@ -494,64 +556,48 @@ // if( !QuickFormat ) { - LoadString( GetModuleHandle(NULL), STRING_VERIFYING, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_VERIFYING, szMsg, ARRAYSIZE(szMsg)); if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - _tprintf(_T("%s %.1fM\n"),szMsg, + PrintString(L"%s %.1fM\n",szMsg, ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } } else { - LoadStringAndOem( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_FAST_FMT, szMsg, ARRAYSIZE(szMsg)); if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - _tprintf(_T("%s %.2fM\n"),szMsg, + PrintString(L"%s %.2fM\n",szMsg, ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } - LoadStringAndOem( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_CREATE_FSYS); } // // Format away! // -#ifndef UNICODE - MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, FileSystem, -1, FileSystemW, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, Label, -1, LabelW, MAX_PATH); - FormatEx( RootDirectoryW, media, FileSystemW, LabelW, QuickFormat, - ClusterSize, FormatExCallback ); -#else FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat, ClusterSize, FormatExCallback ); -#endif if( Error ) return -1; - LoadStringAndOem( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_FMT_COMPLETE); // // Enable compression if desired // if( CompressDrive ) { -#ifndef UNICODE - MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); - if( !EnableVolumeCompression( RootDirectoryW, TRUE )) { -#else if( !EnableVolumeCompression( RootDirectory, TRUE )) { -#endif - - LoadStringAndOem( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + + PrintResourceString(STRING_VOL_COMPRESS); } } @@ -560,25 +606,24 @@ // if( !GotALabel ) { - LoadString( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); - _fgetts( input, sizeof(LabelString)/2, stdin ); - - input[ _tcslen(input)-1] = 0; - if( !SetVolumeLabel( RootDirectory, input )) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintResourceString(STRING_ENTER_LABEL); + fgetws( input, ARRAYSIZE(LabelString), stdin ); + + input[ wcslen(input)-1] = 0; + if( !SetVolumeLabelW( RootDirectory, input )) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_LABEL, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error(szMsg, GetLastError()); return -1; } } - if( !GetVolumeInformation( RootDirectory, - volumeName, sizeof(volumeName)/2, + if( !GetVolumeInformationW( RootDirectory, + volumeName, ARRAYSIZE(volumeName), &serialNumber, &maxComponent, &flags, - fileSystem, sizeof(fileSystem)/2)) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + fileSystem, ARRAYSIZE(fileSystem))) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } @@ -586,34 +631,33 @@ // // Print out some stuff including the formatted size // - if( !GetDiskFreeSpaceEx( RootDirectory, + if( !GetDiskFreeSpaceExW( RootDirectory, &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error(szMsg, GetLastError()); return -1; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); + PrintResourceString(STRING_FREE_SPACE, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); // // Get the drive's serial number // - if( !GetVolumeInformation( RootDirectory, - volumeName, sizeof(volumeName)/2, + if( !GetVolumeInformationW( RootDirectory, + volumeName, ARRAYSIZE(volumeName), &serialNumber, &maxComponent, &flags, - fileSystem, sizeof(fileSystem)/2)) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + fileSystem, ARRAYSIZE(fileSystem))) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, (unsigned int)(serialNumber >> 16), - (unsigned int)(serialNumber & 0xFFFF) ); + PrintResourceString(STRING_SERIAL_NUMBER, + (unsigned int)(serialNumber >> 16), + (unsigned int)(serialNumber & 0xFFFF)); return 0; }

8 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016