Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 71782: [SCHANNEL_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:46:08 2016 New Revision: 71782 URL: http://svn.reactos.org/svn/reactos?rev=71782&view=rev Log: [SCHANNEL_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/schannel/main.c Modified: trunk/rostests/winetests/schannel/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/main.c… ============================================================================== --- trunk/rostests/winetests/schannel/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/schannel/main.c [iso-8859-1] Sun Jul 3 11:46:08 2016 @@ -43,7 +43,9 @@ QueryMetaData) #define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ ValidateTargetInfo) -#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_6 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + PostLogonUser) +#define SECPKG_FUNCTION_TABLE_SIZE_7 sizeof(SECPKG_FUNCTION_TABLE) #define LSA_BASE_CAPS ( \ SECPKG_FLAG_INTEGRITY | \ @@ -152,6 +154,8 @@ size = SECPKG_FUNCTION_TABLE_SIZE_5; else if (Version == SECPKG_INTERFACE_VERSION_6) size = SECPKG_FUNCTION_TABLE_SIZE_6; + else if (Version == SECPKG_INTERFACE_VERSION_7) + size = SECPKG_FUNCTION_TABLE_SIZE_7; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL;

1 0

[akhaldi] 71781: [SHELL32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:36:38 2016 New Revision: 71781 URL: http://svn.reactos.org/svn/reactos?rev=71781&view=rev Log: [SHELL32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/assoc.c trunk/rostests/winetests/shell32/ebrowser.c trunk/rostests/winetests/shell32/progman_dde.c trunk/rostests/winetests/shell32/shelldispatch.c trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/shlview.c Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… ============================================================================== --- trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -232,10 +232,7 @@ windows[0].registered = TRUE; windows[0].to_be_deleted = FALSE; windows[0].edge = ABE_BOTTOM; - windows[0].desired_rect.left = 0; - windows[0].desired_rect.right = screen_width; - windows[0].desired_rect.top = screen_height - 15; - windows[0].desired_rect.bottom = screen_height; + SetRect(&windows[0].desired_rect, 0, screen_height - 15, screen_width, screen_height); SetWindowLongPtrA(windows[0].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[0]); testwindow_setpos(windows[0].hwnd); do_events(); @@ -253,10 +250,7 @@ windows[1].registered = TRUE; windows[1].to_be_deleted = FALSE; windows[1].edge = ABE_BOTTOM; - windows[1].desired_rect.left = 0; - windows[1].desired_rect.right = screen_width; - windows[1].desired_rect.top = screen_height - 10; - windows[1].desired_rect.bottom = screen_height; + SetRect(&windows[1].desired_rect, 0, screen_height - 10, screen_width, screen_height); SetWindowLongPtrA(windows[1].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[1]); testwindow_setpos(windows[1].hwnd); @@ -285,10 +279,7 @@ windows[2].registered = TRUE; windows[2].to_be_deleted = FALSE; windows[2].edge = ABE_BOTTOM; - windows[2].desired_rect.left = 0; - windows[2].desired_rect.right = screen_width; - windows[2].desired_rect.top = screen_height - 10; - windows[2].desired_rect.bottom = screen_height; + SetRect(&windows[2].desired_rect, 0, screen_height - 10, screen_width, screen_height); SetWindowLongPtrA(windows[2].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[2]); testwindow_setpos(windows[2].hwnd); @@ -299,10 +290,7 @@ /* move windows[2] to the right side of the screen */ windows[2].edge = ABE_RIGHT; - windows[2].desired_rect.left = screen_width - 15; - windows[2].desired_rect.right = screen_width; - windows[2].desired_rect.top = 0; - windows[2].desired_rect.bottom = screen_height; + SetRect(&windows[2].desired_rect, screen_width - 15, 0, screen_width, screen_height); testwindow_setpos(windows[2].hwnd); do_events_until(no_appbars_intersect); @@ -312,10 +300,7 @@ /* move windows[1] to the top of the screen */ windows[1].edge = ABE_TOP; - windows[1].desired_rect.left = 0; - windows[1].desired_rect.right = screen_width; - windows[1].desired_rect.top = 0; - windows[1].desired_rect.bottom = 15; + SetRect(&windows[1].desired_rect, 0, 0, screen_width, 15); testwindow_setpos(windows[1].hwnd); do_events_until(no_appbars_intersect); @@ -325,10 +310,7 @@ /* move windows[1] back to the bottom of the screen */ windows[1].edge = ABE_BOTTOM; - windows[1].desired_rect.left = 0; - windows[1].desired_rect.right = screen_width; - windows[1].desired_rect.top = screen_height - 10; - windows[1].desired_rect.bottom = screen_height; + SetRect(&windows[1].desired_rect, 0, screen_height - 10, screen_width, screen_height); testwindow_setpos(windows[1].hwnd); do_events_until(no_appbars_intersect); Modified: trunk/rostests/winetests/shell32/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/assoc.c… ============================================================================== --- trunk/rostests/winetests/shell32/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/assoc.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -100,13 +100,84 @@ { NULL } }; +static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCWSTR expected_string, int line) +{ + IQueryAssociations *assoc; + HRESULT hr; + WCHAR *buffer; + DWORD len; + + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); + ok_(__FILE__, line)(hr == S_OK, "failed to create IQueryAssociations, 0x%x\n", hr); + hr = IQueryAssociations_Init(assoc, 0, assocName, progIdKey, NULL); + ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); + + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, NULL, &len); + if (hr != S_FALSE) { + if (expected_string) { + ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); + } else { + ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); + } + } + + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + + if (expected_string) { + ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); + } +} + static void test_IQueryAssociations_GetString(void) { + static WCHAR test_extensionW[] = {'.','t','e','s','t',0}; + static WCHAR test_progidW[] = {'t','e','s','t','f','i','l','e',0}; + static WCHAR DefaultIconW[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; + /* folder.ico, why not */ + static WCHAR test_iconW[] = {'s','h','e','l','l','3','2','.','d','l','l',',','1',0}; + HKEY test_extension_key; + HKEY test_progid_key; + HKEY test_defaulticon_key; + LRESULT r; + struct assoc_getstring_test *ptr = getstring_tests; IQueryAssociations *assoc; HRESULT hr; DWORD len; int i = 0; + + r = RegCreateKeyExW(HKEY_CLASSES_ROOT, test_extensionW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_extension_key, NULL); + if (r == ERROR_ACCESS_DENIED) + { + win_skip("Not enough permissions to create a test key.\n"); + return; + } + + ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR, \".test\") failed: 0x%lx\n", r); + r = RegSetValueExW(test_extension_key, NULL, 0, REG_SZ, (PBYTE)test_progidW, sizeof(test_progidW)); + ok(r == ERROR_SUCCESS, "RegSetValueExW(HKCR\\.test, NULL, \"testfile\") failed: 0x%lx\n", r); + + /* adding progid key with no information should fail to return information */ + r = RegCreateKeyExW(HKEY_CLASSES_ROOT, test_progidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_progid_key, NULL); + ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR, \"testfile\") failed: 0x%lx\n", r); + getstring_test(test_extensionW, NULL, ASSOCSTR_DEFAULTICON, NULL, __LINE__); + getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, NULL, __LINE__); + getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, NULL, __LINE__); + + /* adding information to the progid should return that information */ + r = RegCreateKeyExW(test_progid_key, DefaultIconW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_defaulticon_key, NULL); + ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR\\testfile\\DefaultIcon) failed: 0x%lx\n", r); + r = RegSetValueExW(test_defaulticon_key, NULL, 0, REG_SZ, (PBYTE)test_iconW, sizeof(test_iconW)); + ok(r == ERROR_SUCCESS, "RegSetValueExW(HKCR\\testfile\\DefaultIcon, NULL, \"folder.ico\") failed: 0x%lx\n", r); + getstring_test(test_extensionW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); + getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); + getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); + + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_progidW); hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr); Modified: trunk/rostests/winetests/shell32/ebrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/ebrowse… ============================================================================== --- trunk/rostests/winetests/shell32/ebrowser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/ebrowser.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -98,7 +98,7 @@ static HRESULT ebrowser_initialize(IExplorerBrowser *peb) { RECT rc; - rc.top = rc.left = 0; rc.bottom = rc.right = 500; + SetRect(&rc, 0, 0, 500, 500); return IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); } @@ -802,7 +802,7 @@ /* Initialize with a few different rectangles */ peb = NULL; ebrowser_instantiate(&peb); - rc.left = 50; rc.top = 20; rc.right = 100; rc.bottom = 80; + SetRect(&rc, 50, 20, 100, 80); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); @@ -861,7 +861,7 @@ ebrowser_instantiate(&peb); hr = IExplorerBrowser_SetOptions(peb, EBO_NOBORDER); ok(hr == S_OK, "got 0x%08x\n", hr); - rc.left = 50; rc.top = 20; rc.right = 100; rc.bottom = 80; + SetRect(&rc, 50, 20, 100, 80); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -881,7 +881,7 @@ /* empty rectangle */ ebrowser_instantiate(&peb); - rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + SetRectEmpty(&rc); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -889,7 +889,7 @@ ok(lres == 0, "Got refcount %d\n", lres); ebrowser_instantiate(&peb); - rc.left = -1; rc.top = -1; rc.right = 1; rc.bottom = 1; + SetRect(&rc, -1, -1, 1, 1); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -897,7 +897,7 @@ ok(lres == 0, "Got refcount %d\n", lres); ebrowser_instantiate(&peb); - rc.left = 10; rc.top = 10; rc.right = 5; rc.bottom = 5; + SetRect(&rc, 10, 10, 5, 5); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -905,7 +905,7 @@ ok(lres == 0, "Got refcount %d\n", lres); ebrowser_instantiate(&peb); - rc.left = 10; rc.top = 10; rc.right = 5; rc.bottom = 5; + SetRect(&rc, 10, 10, 5, 5); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -1101,16 +1101,16 @@ ebrowser_initialize(peb); /* SetRect */ - rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + SetRectEmpty(&rc); hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); - rc.left = 100; rc.top = 100; rc.right = 10; rc.bottom = 10; + SetRect(&rc, 100, 100, 10, 10); hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); /* SetRect with DeferWindowPos */ - rc.left = rc.top = 0; rc.right = rc.bottom = 10; + SetRect(&rc, 0, 0, 10, 10); hdwp = BeginDeferWindowPos(1); hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -1125,7 +1125,7 @@ ok(!lres, "EndDeferWindowPos succeeded unexpectedly.\n"); /* Test positioning */ - rc.left = 10; rc.top = 20; rc.right = 50; rc.bottom = 50; + SetRect(&rc, 10, 20, 50, 50); hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); @@ -1715,7 +1715,7 @@ hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); - rc.left = 0; rc.top = 0; rc.right = 100; rc.bottom = 100; + SetRect(&rc, 0, 0, 100, 100); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… ============================================================================== --- trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -486,19 +486,10 @@ DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); /* todo_wine... Is expected to fail, wine stubbed functions DO fail */ /* TODO REMOVE THIS CODE!!! */ - if (expected_result == DMLERR_NOTPROCESSED) - { + todo_wine_if (expected_result != DMLERR_NOTPROCESSED) ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n", groupName, GetStringFromError(expected_result), GetStringFromError(error), GetStringFromTestParams(testParams)); - } else { - todo_wine - { - ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - } if (error == DMLERR_NO_ERROR) { Modified: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… ============================================================================== --- trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -884,7 +884,6 @@ test_ShellWindows(); test_ParseName(); test_Verbs(); - test_ShellExecute(); CoUninitialize(); Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… ============================================================================== --- trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -351,12 +351,6 @@ */ #define lok ok_(__FILE__, line) -#define lok_todo_4(todo_flag,a,b,c,d) \ - if ((todo & todo_flag) == 0) lok((a), (b), (c), (d)); \ - else todo_wine lok((a), (b), (c), (d)); -#define lok_todo_2(todo_flag,a,b) \ - if ((todo & todo_flag) == 0) lok((a), (b)); \ - else todo_wine lok((a), (b)); #define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c)) void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) @@ -433,16 +427,8 @@ lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); - if (save_fails) - { - todo_wine { + todo_wine_if (save_fails) lok(r == S_OK, "save failed (0x%08x)\n", r); - } - } - else - { - lok(r == S_OK, "save failed (0x%08x)\n", r); - } /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); @@ -533,44 +519,44 @@ strcpy(buffer,"garbage"); r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer)); lok(r == S_OK, "GetDescription failed (0x%08x)\n", r); - lok_todo_4(0x1, strcmp(buffer, desc->description)==0, - "GetDescription returned '%s' instead of '%s'\n", - buffer, desc->description); + todo_wine_if ((todo & 0x1) != 0) + lok(strcmp(buffer, desc->description)==0, "GetDescription returned '%s' instead of '%s'\n", + buffer, desc->description); } if (desc->workdir) { strcpy(buffer,"garbage"); r = IShellLinkA_GetWorkingDirectory(sl, buffer, sizeof(buffer)); lok(r == S_OK, "GetWorkingDirectory failed (0x%08x)\n", r); - lok_todo_4(0x2, lstrcmpiA(buffer, desc->workdir)==0, - "GetWorkingDirectory returned '%s' instead of '%s'\n", - buffer, desc->workdir); + todo_wine_if ((todo & 0x2) != 0) + lok(lstrcmpiA(buffer, desc->workdir)==0, "GetWorkingDirectory returned '%s' instead of '%s'\n", + buffer, desc->workdir); } if (desc->path) { strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); lok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); - lok_todo_4(0x4, lstrcmpiA(buffer, desc->path)==0, - "GetPath returned '%s' instead of '%s'\n", - buffer, desc->path); + todo_wine_if ((todo & 0x4) != 0) + lok(lstrcmpiA(buffer, desc->path)==0, "GetPath returned '%s' instead of '%s'\n", + buffer, desc->path); } if (desc->pidl) { LPITEMIDLIST pidl=NULL; r = IShellLinkA_GetIDList(sl, &pidl); lok(r == S_OK, "GetIDList failed (0x%08x)\n", r); - lok_todo_2(0x8, pILIsEqual(pidl, desc->pidl), - "GetIDList returned an incorrect pidl\n"); + todo_wine_if ((todo & 0x8) != 0) + lok(pILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); } if (desc->showcmd) { int i=0xdeadbeef; r = IShellLinkA_GetShowCmd(sl, &i); lok(r == S_OK, "GetShowCmd failed (0x%08x)\n", r); - lok_todo_4(0x10, i==desc->showcmd, - "GetShowCmd returned 0x%0x instead of 0x%0x\n", - i, desc->showcmd); + todo_wine_if ((todo & 0x10) != 0) + lok(i==desc->showcmd, "GetShowCmd returned 0x%0x instead of 0x%0x\n", + i, desc->showcmd); } if (desc->icon) { @@ -578,21 +564,21 @@ strcpy(buffer,"garbage"); r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); lok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); - lok_todo_4(0x20, lstrcmpiA(buffer, desc->icon)==0, - "GetIconLocation returned '%s' instead of '%s'\n", - buffer, desc->icon); - lok_todo_4(0x20, i==desc->icon_id, - "GetIconLocation returned 0x%0x instead of 0x%0x\n", - i, desc->icon_id); + todo_wine_if ((todo & 0x20) != 0) { + lok(lstrcmpiA(buffer, desc->icon)==0, "GetIconLocation returned '%s' instead of '%s'\n", + buffer, desc->icon); + lok(i==desc->icon_id, "GetIconLocation returned 0x%0x instead of 0x%0x\n", + i, desc->icon_id); + } } if (desc->hotkey) { WORD i=0xbeef; r = IShellLinkA_GetHotkey(sl, &i); lok(r == S_OK, "GetHotkey failed (0x%08x)\n", r); - lok_todo_4(0x40, i==desc->hotkey, - "GetHotkey returned 0x%04x instead of 0x%04x\n", - i, desc->hotkey); + todo_wine_if ((todo & 0x40) != 0) + lok(i==desc->hotkey, "GetHotkey returned 0x%04x instead of 0x%04x\n", + i, desc->hotkey); } IShellLinkA_Release(sl); Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… ============================================================================== --- trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -2283,7 +2283,7 @@ /* remove newly created directory */ RemoveDirectoryW(sSubFolder2Path); - /* verify sub folder. It still succeedes, so Windows does not check folder presence each time */ + /* verify subfolder. It still succeeds, so Windows does not check folder presence each time */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); todo_wine ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… ============================================================================== --- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -365,7 +365,7 @@ #define okShell okShell_(__FILE__, __LINE__) static char assoc_desc[2048]; -void reset_association_description(void) +static void reset_association_description(void) { *assoc_desc = '\0'; } @@ -650,7 +650,7 @@ * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + if (rc > 32 && GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { int c; dump_child_(file, line); @@ -684,9 +684,37 @@ * ***/ +static BOOL create_test_class(const char* class, BOOL protocol) +{ + HKEY hkey, hkey_shell; + LONG rc; + + rc = RegCreateKeyExA(HKEY_CLASSES_ROOT, class, 0, NULL, 0, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, + &hkey, NULL); + ok(rc == ERROR_SUCCESS || rc == ERROR_ACCESS_DENIED, + "could not create class %s (rc=%d)\n", class, rc); + if (rc != ERROR_SUCCESS) + return FALSE; + + if (protocol) + { + rc = RegSetValueExA(hkey, "URL Protocol", 0, REG_SZ, (LPBYTE)"", 1); + ok(rc == ERROR_SUCCESS, "RegSetValueEx '%s' failed, expected ERROR_SUCCESS, got %d\n", class, rc); + } + + rc = RegCreateKeyExA(hkey, "shell", 0, NULL, 0, + KEY_CREATE_SUB_KEY, NULL, &hkey_shell, NULL); + ok(rc == ERROR_SUCCESS, "RegCreateKeyEx 'shell' failed, expected ERROR_SUCCESS, got %d\n", rc); + + CloseHandle(hkey); + CloseHandle(hkey_shell); + return TRUE; +} + static BOOL create_test_association(const char* extension) { - HKEY hkey, hkey_shell; + HKEY hkey; char class[MAX_PATH]; LONG rc; @@ -702,18 +730,7 @@ ok(rc==ERROR_SUCCESS, "RegSetValueEx '%s' failed, expected ERROR_SUCCESS, got %d\n", class, rc); CloseHandle(hkey); - rc=RegCreateKeyExA(HKEY_CLASSES_ROOT, class, 0, NULL, 0, - KEY_CREATE_SUB_KEY | KEY_ENUMERATE_SUB_KEYS, NULL, &hkey, NULL); - ok(rc==ERROR_SUCCESS, "RegCreateKeyEx '%s' failed, expected ERROR_SUCCESS, got %d\n", class, rc); - - rc=RegCreateKeyExA(hkey, "shell", 0, NULL, 0, - KEY_CREATE_SUB_KEY, NULL, &hkey_shell, NULL); - ok(rc==ERROR_SUCCESS, "RegCreateKeyEx 'shell' failed, expected ERROR_SUCCESS, got %d\n", rc); - - CloseHandle(hkey); - CloseHandle(hkey_shell); - - return TRUE; + return create_test_class(class, FALSE); } /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -783,16 +800,21 @@ return ret; } +static void delete_test_class(const char* classname) +{ + myRegDeleteTreeA(HKEY_CLASSES_ROOT, classname); +} + static void delete_test_association(const char* extension) { - char class[MAX_PATH]; - - sprintf(class, "shlexec%s", extension); - myRegDeleteTreeA(HKEY_CLASSES_ROOT, class); + char classname[MAX_PATH]; + + sprintf(classname, "shlexec%s", extension); + delete_test_class(classname); myRegDeleteTreeA(HKEY_CLASSES_ROOT, extension); } -static void create_test_verb_dde(const char* extension, const char* verb, +static void create_test_verb_dde(const char* classname, const char* verb, int rawcmd, const char* cmdtail, const char *ddeexec, const char *application, const char *topic, const char *ifexec) @@ -803,7 +825,7 @@ LONG rc; strcpy(assoc_desc, " Assoc "); - strcat_param(assoc_desc, "ext", extension); + strcat_param(assoc_desc, "class", classname); strcat_param(assoc_desc, "verb", verb); sprintf(shell, "%d", rawcmd); strcat_param(assoc_desc, "rawcmd", shell); @@ -813,7 +835,7 @@ strcat_param(assoc_desc, "topic", topic); strcat_param(assoc_desc, "ifexec", ifexec); - sprintf(shell, "shlexec%s\\shell", extension); + sprintf(shell, "%s\\shell", classname); rc=RegOpenKeyExA(HKEY_CLASSES_ROOT, shell, 0, KEY_CREATE_SUB_KEY, &hkey_shell); ok(rc == ERROR_SUCCESS, "%s key creation failed with %d\n", shell, rc); @@ -893,10 +915,10 @@ * This function is meant to be used to create long term test verbs and thus * does not trace them. */ -static void create_test_verb(const char* extension, const char* verb, +static void create_test_verb(const char* classname, const char* verb, int rawcmd, const char* cmdtail) { - create_test_verb_dde(extension, verb, rawcmd, cmdtail, NULL, NULL, + create_test_verb_dde(classname, verb, rawcmd, cmdtail, NULL, NULL, NULL, NULL); reset_association_description(); } @@ -994,7 +1016,9 @@ "%s\\test_shortcut_exe.lnk", "%s\\test file.shl", "%s\\test file.shlfoo", + "%s\\test file.sha", "%s\\test file.sfe", + "%s\\test file.shlproto", "%s\\masked file.shlexec", "%s\\masked", "%s\\test file.sde", @@ -1043,12 +1067,17 @@ {"notaverb", "%s\\test file.shlexec", 0x10, SE_ERR_NOASSOC}, + {"averb", "%s\\test file.sha", 0x10, 33}, + /* Test file masked due to space */ {NULL, "%s\\masked file.shlexec", 0x0, 33}, /* Test if quoting prevents the masking */ {NULL, "%s\\masked file.shlexec", 0x40, 33}, /* Test with incorrect quote */ {NULL, "\"%s\\masked file.shlexec", 0x0, SE_ERR_FNF}, + + /* Test extension / URI protocol collision */ + {NULL, "%s\\test file.shlproto", 0x0, SE_ERR_NOASSOC}, {NULL, NULL, 0} }; @@ -1570,13 +1599,13 @@ return; } - create_test_verb(".shlexec", "Params232S", 0, "Params232S %2 %3 \"%2\" \"%*\""); - create_test_verb(".shlexec", "Params23456", 0, "Params23456 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\""); - create_test_verb(".shlexec", "Params23456789", 0, "Params23456789 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" \"%7\" \"%8\" \"%9\""); - create_test_verb(".shlexec", "Params2345Etc", 0, "Params2345Etc ~2=\"%~2\" ~3=\"%~3\" ~4=\"%~4\" ~5=%~5"); - create_test_verb(".shlexec", "Params9Etc", 0, "Params9Etc ~9=\"%~9\""); - create_test_verb(".shlexec", "Params20", 0, "Params20 \"%20\""); - create_test_verb(".shlexec", "ParamsBad", 0, "ParamsBad \"%% %- %~ %~0 %~1 %~a %~* %a %b %c %TMPDIR%\""); + create_test_verb("shlexec.shlexec", "Params232S", 0, "Params232S %2 %3 \"%2\" \"%*\""); + create_test_verb("shlexec.shlexec", "Params23456", 0, "Params23456 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\""); + create_test_verb("shlexec.shlexec", "Params23456789", 0, "Params23456789 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" \"%7\" \"%8\" \"%9\""); + create_test_verb("shlexec.shlexec", "Params2345Etc", 0, "Params2345Etc ~2=\"%~2\" ~3=\"%~3\" ~4=\"%~4\" ~5=%~5"); + create_test_verb("shlexec.shlexec", "Params9Etc", 0, "Params9Etc ~9=\"%~9\""); + create_test_verb("shlexec.shlexec", "Params20", 0, "Params20 \"%20\""); + create_test_verb("shlexec.shlexec", "ParamsBad", 0, "ParamsBad \"%% %- %~ %~0 %~1 %~a %~* %a %b %c %TMPDIR%\""); sprintf(fileA, "%s\\test file.shlexec", tmpdir); @@ -1748,6 +1777,14 @@ sprintf(filename, "%s\\test file.shlexec", tmpdir); okChildPath("argvA4", filename); } + + sprintf(filename, "\"%s\\test file.sha\"", tmpdir); + rc=shell_execute(NULL, filename, NULL, NULL); + todo_wine okShell(rc > 32, "failed: rc=%ld err=%u\n", rc, GetLastError()); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "averb"); + sprintf(filename, "%s\\test file.sha", tmpdir); + todo_wine okChildPath("argvA4", filename); } typedef struct @@ -1792,6 +1829,9 @@ /* Test shortcuts vs. URLs */ {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, + /* Confuse things by mixing protocols */ + {"file://", "shlproto://foo/bar", USE_COLON, 0}, + {NULL, NULL, 0, 0} }; @@ -1878,6 +1918,100 @@ SetEnvironmentVariableA("urlprefix", NULL); } +static void test_urls(void) +{ + char url[MAX_PATH]; + INT_PTR rc; + + if (!create_test_class("fakeproto", FALSE)) + { + skip("Unable to create 'fakeproto' class for URL tests\n"); + return; + } + create_test_verb("fakeproto", "open", 0, "URL %1"); + + create_test_class("shlpaverb", TRUE); + create_test_verb("shlpaverb", "averb", 0, "PAVerb \"%1\""); + + /* Protocols must be properly declared */ + rc = shell_execute(NULL, "notaproto://foo", NULL, NULL); + ok(rc == SE_ERR_NOASSOC || broken(rc == SE_ERR_ACCESSDENIED), + "%s returned %lu\n", shell_call, rc); + + rc = shell_execute(NULL, "fakeproto://foo/bar", NULL, NULL); + todo_wine ok(rc == SE_ERR_NOASSOC || broken(rc == SE_ERR_ACCESSDENIED), + "%s returned %lu\n", shell_call, rc); + + /* Here's a real live one */ + rc = shell_execute(NULL, "shlproto://foo/bar", NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 5); + okChildString("argvA3", "URL"); + okChildString("argvA4", "shlproto://foo/bar"); + + /* Check default verb detection */ + rc = shell_execute(NULL, "shlpaverb://foo/bar", NULL, NULL); + todo_wine ok(rc > 32 || /* XP+IE7 - Win10 */ + broken(rc == SE_ERR_NOASSOC), /* XP+IE6 */ + "%s failed: rc=%lu\n", shell_call, rc); + if (rc > 32) + { + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "PAVerb"); + todo_wine okChildString("argvA4", "shlpaverb://foo/bar"); + } + + /* But alternative verbs are a recent feature! */ + rc = shell_execute("averb", "shlproto://foo/bar", NULL, NULL); + ok(rc > 32 || /* Win8 - Win10 */ + broken(rc == SE_ERR_ACCESSDENIED), /* XP - Win7 */ + "%s failed: rc=%lu\n", shell_call, rc); + if (rc > 32) + { + okChildString("argvA3", "AVerb"); + okChildString("argvA4", "shlproto://foo/bar"); + } + + /* A .lnk ending does not turn a URL into a shortcut */ + todo_wait rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "URL"); + todo_wine okChildString("argvA4", "shlproto://foo/bar.lnk"); + + /* Neither does a .exe extension */ + rc = shell_execute(NULL, "shlproto://foo/bar.exe", NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 5); + okChildString("argvA3", "URL"); + okChildString("argvA4", "shlproto://foo/bar.exe"); + + /* But a class name overrides it */ + rc = shell_execute(NULL, "shlproto://foo/bar", "shlexec.shlexec", NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 5); + okChildString("argvA3", "URL"); + okChildString("argvA4", "shlproto://foo/bar"); + + /* Environment variables are expanded in URLs (but not in file URLs!) */ + rc = shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, + NULL, "shlproto://%TMPDIR%/bar", NULL, NULL, NULL); + okShell(rc > 32, "failed: rc=%lu\n", rc); + okChildInt("argcA", 5); + sprintf(url, "shlproto://%s/bar", tmpdir); + okChildString("argvA3", "URL"); + okChildStringBroken("argvA4", url, "shlproto://%TMPDIR%/bar"); + + /* But only after the path has been identified as a URL */ + SetEnvironmentVariableA("urlprefix", "shlproto:///"); + rc = shell_execute(NULL, "%urlprefix%foo", NULL, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + SetEnvironmentVariableA("urlprefix", NULL); + + delete_test_class("fakeproto"); + delete_test_class("shlpaverb"); +} + static void test_find_executable(void) { char notepad_path[MAX_PATH]; @@ -1891,7 +2025,7 @@ skip("Unable to create association for '.sfe'\n"); return; } - create_test_verb(".sfe", "Open", 1, "%1"); + create_test_verb("shlexec.sfe", "Open", 1, "%1"); /* Don't test FindExecutable(..., NULL), it always crashes */ @@ -1941,7 +2075,7 @@ skip("Unable to create association for '.shl'\n"); return; } - create_test_verb(".shl", "Open", 0, "Open"); + create_test_verb("shlexec.shl", "Open", 0, "Open"); sprintf(filename, "%s\\test file.shl", tmpdir); rc=(INT_PTR)FindExecutableA(filename, NULL, command); @@ -2328,7 +2462,7 @@ skip("Unable to create association for '.sde'\n"); return; } - create_test_verb_dde(".sde", "Open", 0, test->command, test->ddeexec, + create_test_verb_dde("shlexec.sde", "Open", 0, test->command, test->ddeexec, test->application, test->topic, test->ifexec); if (test->application != NULL || test->topic != NULL) @@ -2506,7 +2640,7 @@ return; } sprintf(params, test->command, tmpdir); - create_test_verb_dde(".sde", "Open", 1, params, "[test]", NULL, + create_test_verb_dde("shlexec.sde", "Open", 1, params, "[test]", NULL, "shlexec", NULL); ddeApplication[0] = 0; @@ -2677,12 +2811,19 @@ skip("Unable to create association for '.shlexec'\n"); return; } - create_test_verb(".shlexec", "Open", 0, "Open \"%1\""); - create_test_verb(".shlexec", "NoQuotes", 0, "NoQuotes %1"); - create_test_verb(".shlexec", "LowerL", 0, "LowerL %l"); - create_test_verb(".shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\""); - create_test_verb(".shlexec", "UpperL", 0, "UpperL %L"); - create_test_verb(".shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); + create_test_verb("shlexec.shlexec", "Open", 0, "Open \"%1\""); + create_test_verb("shlexec.shlexec", "NoQuotes", 0, "NoQuotes %1"); + create_test_verb("shlexec.shlexec", "LowerL", 0, "LowerL %l"); + create_test_verb("shlexec.shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\""); + create_test_verb("shlexec.shlexec", "UpperL", 0, "UpperL %L"); + create_test_verb("shlexec.shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); + + create_test_association(".sha"); + create_test_verb("shlexec.sha", "averb", 0, "AVerb \"%1\""); + + create_test_class("shlproto", TRUE); + create_test_verb("shlproto", "open", 0, "URL \"%1\""); + create_test_verb("shlproto", "averb", 0, "AVerb \"%1\""); /* Set an environment variable to see if it is inherited */ SetEnvironmentVariableA("ShlexecVar", "Present"); @@ -2708,6 +2849,8 @@ /* Delete the test association */ delete_test_association(".shlexec"); + delete_test_association(".sha"); + delete_test_class("shlproto"); CloseHandle(hEvent); @@ -2785,6 +2928,7 @@ test_lpFile_parsed(); test_filename(); test_fileurls(); + test_urls(); test_find_executable(); test_lnks(); test_exes(); Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -1819,6 +1819,30 @@ ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); + + /* Check last error after a successful file operation. */ + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "testdir2\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + SetLastError(0xdeadbeef); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "File copy failed with %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check last error after a failed file operation. */ + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.pFrom = "nonexistent\0"; + shfo.pTo = "testdir2\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + SetLastError(0xdeadbeef); + retval = SHFileOperationA(&shfo); + ok(retval != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } /* tests the FO_MOVE action */ @@ -2464,6 +2488,7 @@ SHFILEOPSTRUCTW shfoW; int ret; HANDLE file; + static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'}; if (!pSHFileOperationW) { @@ -2530,6 +2555,36 @@ ret = pSHFileOperationW(&shfoW); ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); + + shfoW.hwnd = NULL; + shfoW.wFunc = FO_COPY; + shfoW.pFrom = UNICODE_PATH; + shfoW.pTo = UNICODE_PATH_TO; + shfoW.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + shfoW.hNameMappings = NULL; + shfoW.lpszProgressTitle = NULL; + + /* Check last error after a successful file operation. */ + createTestFileW(UNICODE_PATH); + ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); + SetLastError(0xdeadbeef); + ret = SHFileOperationW(&shfoW); + ok(ret == ERROR_SUCCESS, "File copy failed with %d\n", ret); + ok(!shfoW.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check last error after a failed file operation. */ + DeleteFileW(UNICODE_PATH); + ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); + SetLastError(0xdeadbeef); + ret = SHFileOperationW(&shfoW); + ok(ret != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); + ok(!shfoW.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } static void Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -1142,7 +1142,7 @@ todo_wine ok (hr == E_INVALIDARG || broken(hr == S_OK), /* W2K and earlier */ - "MyComputer->GetAttributesOf(emtpy pidl) should fail! hr = %08x\n", hr); + "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags); Modified: trunk/rostests/winetests/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlview… ============================================================================== --- trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] Sun Jul 3 11:36:38 2016 @@ -761,8 +761,7 @@ settings.ViewMode = FVM_ICON; settings.fFlags = 0; hwnd_view = (HWND)0xdeadbeef; - r.left = r.top = 0; - r.right = r.bottom = 100; + SetRect(&r, 0, 0, 100, 100); hr = IShellView_CreateViewWindow(view, NULL, &settings, browser, &r, &hwnd_view); ok(hr == S_OK, "got (0x%08x)\n", hr); ok(IsWindow(hwnd_view), "got %p\n", hwnd_view);

1 0

[akhaldi] 71780: [MSVCRT_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:33:21 2016 New Revision: 71780 URL: http://svn.reactos.org/svn/reactos?rev=71780&view=rev Log: [MSVCRT_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/msvcrt/cpp.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/heap.c trunk/rostests/winetests/msvcrt/misc.c trunk/rostests/winetests/msvcrt/string.c Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… ============================================================================== --- trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] Sun Jul 3 11:33:21 2016 @@ -1109,10 +1109,8 @@ for (i = 0; i < num_test; i++) { name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); - if (demangle[i].test_in_wine) - ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - else - todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i); + todo_wine_if (!demangle[i].test_in_wine) + ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); if(name) pfree(name); } Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] Sun Jul 3 11:33:21 2016 @@ -1350,55 +1350,6 @@ "Wrong write result in child process on %d (%s)\n", fd, strerror(errno)); } -static void test_file_refcount_child(void) -{ - static const char buffer1[] = "test1"; - static const char buffer2[] = "test2"; - static const char buffer3[] = "test3"; - static const char buffer4[] = "test4"; - HANDLE f0, f1, f2, h0, h1, h2; - DWORD written, flags, ret; - - f0 = (HANDLE)_get_osfhandle(STDIN_FILENO); - f1 = (HANDLE)_get_osfhandle(STDOUT_FILENO); - f2 = (HANDLE)_get_osfhandle(STDERR_FILENO); - ok(f0 == f1, "expected same handles, got %p, %p\n", f0, f1); - ok(f1 == f2, "expected same handles, got %p, %p\n", f1, f2); - - h0 = GetStdHandle(STD_INPUT_HANDLE); - h1 = GetStdHandle(STD_OUTPUT_HANDLE); - h2 = GetStdHandle(STD_ERROR_HANDLE); - ok(h0 == h1, "expected same handles, got %p, %p\n", h0, h1); - ok(h1 == h2, "expected same handles, got %p, %p\n", h1, h2); - ok(f0 == h0, "expected same handles, got %p, %p\n", f0, h0); - - ret = GetHandleInformation(h1, &flags); - ok(ret, "GetHandleInformation failed\n"); - ret = WriteFile(h1, buffer1, strlen(buffer1), &written, 0); - ok(ret, "WriteFile failed\n"); - - ret = fclose(stdout); - ok(ret == 0, "fclose failed\n"); - ret = GetHandleInformation(h1, &flags); - ok(ret, "GetHandleInformation failed\n"); - ret = WriteFile(h1, buffer2, strlen(buffer2), &written, 0); - ok(ret, "WriteFile failed\n"); - - ret = fclose(stdout); - ok(ret != 0, "fclose should fail\n"); - ret = GetHandleInformation(h1, &flags); - ok(ret, "GetHandleInformation failed\n"); - ret = WriteFile(h1, buffer3, strlen(buffer3), &written, 0); - ok(ret, "WriteFile failed\n"); - - ret = fclose(stderr); - ok(ret == 0, "fclose failed\n"); - ret = GetHandleInformation(h1, &flags); - ok(!ret, "GetHandleInformation should fail\n"); - ret = WriteFile(h1, buffer4, strlen(buffer4), &written, 0); - ok(!ret, "WriteFile should fail\n"); -} - static void create_io_inherit_block( STARTUPINFOA *startup, unsigned int count, const HANDLE *handles ) { static BYTE block[1024]; @@ -1470,36 +1421,6 @@ CloseHandle( hErrorFile ); DeleteFileA( "fdopen.err" ); -} - -static void test_file_refcount( STARTUPINFOA *startup, char *cmdline, const char *descr ) -{ - const char *data; - HANDLE hMixFile; - SECURITY_ATTRIBUTES sa; - PROCESS_INFORMATION proc; - - /* make file handle inheritable */ - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = TRUE; - - hMixFile = CreateFileA( "fdopen.mix", GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); - startup->dwFlags = STARTF_USESTDHANDLES; - startup->hStdInput = hMixFile; - startup->hStdOutput = hMixFile; - startup->hStdError = hMixFile; - - CreateProcessA( NULL, cmdline, NULL, NULL, TRUE, - CREATE_DEFAULT_ERROR_MODE | NORMAL_PRIORITY_CLASS, NULL, NULL, startup, &proc ); - winetest_wait_child_process( proc.hProcess ); - - data = read_file( hMixFile ); - ok( !strcmp( data, "test1test2test3" ), "%s: Wrong error data (%s)\n", descr, data ); - - CloseHandle( hMixFile ); - DeleteFileA( "fdopen.mix" ); } static void test_file_inherit( const char* selfname ) @@ -1595,12 +1516,6 @@ test_stdout_handle( &startup, cmdline, handles[1], TRUE, "large size block" ); CloseHandle( handles[1] ); DeleteFileA("fdopen.tst"); - - /* test refcount of handles */ - create_io_inherit_block( &startup, 0, NULL ); - sprintf(cmdline, "%s file refcount", selfname); - test_file_refcount( &startup, cmdline, "file refcount" ); - DeleteFileA("fdopen.tst"); } static void test_tmpnam( void ) @@ -2347,8 +2262,8 @@ fpos_t pos, pos2; fd = fileno(file); - inbuffer = calloc(bufsize + 1, 1); - outbuffer = calloc(bufsize + 1, 1); + inbuffer = calloc(1, bufsize + 1); + outbuffer = calloc(1, bufsize + 1); _snprintf(outbuffer, bufsize + 1, "0,1,2,3,4,5,6,7,8,9"); for (size = bufsize + 1; size >= bufsize - 1; size--) { @@ -2412,6 +2327,65 @@ free(tempf); } +static void test_close(void) +{ + ioinfo *stdout_info, stdout_copy, *stderr_info, stderr_copy; + int fd1, fd2, ret1, ret2, ret3, ret4; + DWORD flags; + HANDLE h; + + /* test close on fds that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + fd1 = _open_osfhandle((intptr_t)h, 0); + ok(fd1 != -1, "_open_osfhandle failed (%d)\n", errno); + fd2 = _open_osfhandle((intptr_t)h, 0); + ok(fd2 != -1, "_open_osfhandle failed (%d)\n", errno); + ok(fd1 != fd2, "fd1 == fd2\n"); + + ok((HANDLE)_get_osfhandle(fd1) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd1), h); + ok((HANDLE)_get_osfhandle(fd2) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd2), h); + ret1 = close(fd1); + ok(!ret1, "close(fd1) failed (%d)\n", errno); + ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); + ok(close(fd2), "close(fd2) succeeded\n"); + + /* test close on stdout and stderr that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + /* tests output will not be visible from now on */ + stdout_info = &__pioinfo[STDOUT_FILENO/MSVCRT_FD_BLOCK_SIZE][STDOUT_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stderr_info = &__pioinfo[STDERR_FILENO/MSVCRT_FD_BLOCK_SIZE][STDERR_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stdout_copy = *stdout_info; + stderr_copy = *stderr_info; + stdout_info->handle = h; + stderr_info->handle = h; + + ret1 = close(STDOUT_FILENO); + ret2 = GetHandleInformation(h, &flags); + ret3 = close(STDERR_FILENO); + ret4 = GetHandleInformation(h, &flags); + + *stdout_info = stdout_copy; + *stderr_info = stderr_copy; + SetStdHandle(STD_OUTPUT_HANDLE, stdout_info->handle); + SetStdHandle(STD_ERROR_HANDLE, stderr_info->handle); + /* stdout and stderr restored */ + + ok(!ret1, "close(STDOUT_FILENO) failed\n"); + ok(ret2, "GetHandleInformation failed\n"); + ok(!ret3, "close(STDERR_FILENO) failed\n"); + ok(!ret4, "GetHandleInformation succeeded\n"); + + DeleteFileA( "fdopen.tst" ); +} + START_TEST(file) { int arg_c; @@ -2430,8 +2404,6 @@ test_file_inherit_child_no(arg_v[3]); else if (strcmp(arg_v[2], "pipes") == 0) test_pipes_child(arg_c, arg_v); - else if (strcmp(arg_v[2], "refcount") == 0) - test_file_refcount_child(); else ok(0, "invalid argument '%s'\n", arg_v[2]); return; @@ -2480,6 +2452,7 @@ test_mktemp(); test__open_osfhandle(); test_write_flush(); + test_close(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order Modified: trunk/rostests/winetests/msvcrt/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/heap.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/heap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/heap.c [iso-8859-1] Sun Jul 3 11:33:21 2016 @@ -456,6 +456,29 @@ free(mem); } +static void test_calloc(void) +{ + void *ptr; + + ptr = calloc(1, 0); + ok(ptr != NULL, "got %p\n", ptr); + free(ptr); + + ptr = calloc(0, 0); + ok(ptr != NULL, "got %p\n", ptr); + free(ptr); + + ptr = calloc(0, 1); + ok(ptr != NULL, "got %p\n", ptr); + free(ptr); + + errno = 0; + ptr = calloc(~(size_t)0 / 2, ~(size_t)0 / 2); + ok(ptr == NULL || broken(ptr != NULL) /* winxp sp0 */, "got %p\n", ptr); + ok(errno == ENOMEM || broken(errno == 0) /* winxp, win2k3 */, "got errno %d\n", errno); + free(ptr); +} + START_TEST(heap) { void *mem; @@ -480,4 +503,5 @@ test_aligned(); test_sbheap(); -} + test_calloc(); +} Modified: trunk/rostests/winetests/msvcrt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/misc.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] Sun Jul 3 11:33:21 2016 @@ -180,13 +180,9 @@ ok(!strcmp(out.str, I10_OUTPUT_tests[i].out.str), "%d: out.str = %s\n", i, out.str); j = strlen(I10_OUTPUT_tests[i].remain); - if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') - todo_wine ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), - "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); - else + todo_wine_if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); - for(j=out.len+strlen(I10_OUTPUT_tests[i].remain)+1; j<sizeof(out.str); j++) if(out.str[j] != '#') Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] Sun Jul 3 11:33:21 2016 @@ -74,6 +74,7 @@ static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); +static int (__cdecl *p_mbsrtowcs_s)(size_t*,wchar_t*,size_t,const char**,size_t,mbstate_t*); static size_t (__cdecl *pwcsrtombs)(char*, const wchar_t**, size_t, int*); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); @@ -1947,6 +1948,11 @@ } pmbstr = mHiragana; + ret = p_mbsrtowcs(NULL, &pmbstr, 6, NULL); + ok(ret == 2, "mbsrtowcs did not return 2\n"); + ok(pmbstr == mHiragana, "pmbstr = %p, expected %p\n", pmbstr, mHiragana); + + pmbstr = mHiragana; ret = p_mbsrtowcs(wOut, &pmbstr, 6, NULL); ok(ret == 2, "mbsrtowcs did not return 2\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); @@ -1965,6 +1971,54 @@ ret = p_mbsrtowcs(wOut, NULL, 6, &state); ok(ret == -1, "mbsrtowcs did not return -1\n"); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + if(!p_mbsrtowcs_s) { + setlocale(LC_ALL, "C"); + win_skip("mbsrtowcs_s not available\n"); + return; + } + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, NULL, 0, NULL, 6, NULL); + ok(ret == -1, "mbsrtowcs_s did not return -1\n"); + ok(err == EINVAL, "err = %d\n", err); + err = p_mbsrtowcs_s(&ret, NULL, 1, &pmbstr, 6, NULL); + ok(ret == -1, "mbsrtowcs_s did not return -1\n"); + ok(err == EINVAL, "err = %d\n", err); + err = p_mbsrtowcs_s(&ret, wOut, 0, &pmbstr, 6, NULL); + ok(ret == -1, "mbsrtowcs_s did not return -1\n"); + ok(err == EINVAL, "err = %d\n", err); + + pmbstr = mHiragana; + errno = 0; + err = p_mbsrtowcs_s(&ret, NULL, 0, &pmbstr, 6, NULL); + ok(ret == 3, "mbsrtowcs_s did not return 3\n"); + ok(err == 0, "err = %d\n", err); + ok(pmbstr == mHiragana, "pmbstr = %p, expected %p\n", pmbstr, mHiragana); + ok(errno == 0, "errno = %d\n", errno); + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, wOut, 1, &pmbstr, 6, NULL); + ok(ret == 2, "mbsrtowcs_s did not return 2\n"); + ok(err == 0, "err = %d\n", err); + ok(!wOut[0], "wOut[0] = '%c'\n", wOut[0]); + ok(pmbstr == mHiragana+2, "pmbstr = %p, expected %p\n", pmbstr, mHiragana+2); + ok(errno == 0, "errno = %d\n", errno); + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, wOut, 2, &pmbstr, 6, NULL); + ok(ret == 3, "mbsrtowcs_s did not return 3\n"); + ok(err == 0, "err = %d\n", err); + ok(!wOut[0], "wOut[0] = '%c'\n", wOut[0]); + ok(pmbstr == mHiragana+4, "pmbstr = %p, expected %p\n", pmbstr, mHiragana+4); + ok(errno == 0, "errno = %d\n", errno); + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, wOut, 3, &pmbstr, 6, NULL); + ok(ret == 3, "mbsrtowcs_s did not return 3\n"); + ok(err == 0, "err = %d\n", err); + ok(!pmbstr, "pmbstr != NULL\n"); + ok(errno == 0, "errno = %d\n", errno); setlocale(LC_ALL, "C"); } @@ -3106,6 +3160,7 @@ p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); + p_mbsrtowcs_s = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs_s"); p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); p__atof_l = (void*)GetProcAddress(hMsvcrt, "_atof_l"); p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l");

1 0

[akhaldi] 71779: [GDI32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 CORE-11331
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:29:52 2016 New Revision: 71779 URL: http://svn.reactos.org/svn/reactos?rev=71779&view=rev Log: [GDI32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 CORE-11331 Modified: trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… ============================================================================== --- trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] Sun Jul 3 11:29:52 2016 @@ -23,15 +23,25 @@ #include <assert.h> #include <string.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" #include "wingdi.h" #include "winuser.h" #include "mmsystem.h" +#include "wine/winternl.h" +#ifndef __REACTOS__ /* CORE-11331 */ +#include "wine/ddk/d3dkmthk.h" +#endif #include "wine/test.h" +#ifndef __REACTOS__ /* CORE-11331 */ +static NTSTATUS (WINAPI *pD3DKMTCreateDCFromMemory)( D3DKMT_CREATEDCFROMMEMORY *desc ); +static NTSTATUS (WINAPI *pD3DKMTDestroyDCFromMemory)( const D3DKMT_DESTROYDCFROMMEMORY *desc ); +#endif static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); static BOOL (WINAPI *pGdiGradientFill)(HDC,TRIVERTEX*,ULONG,void*,ULONG,ULONG); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); @@ -5651,14 +5661,265 @@ HeapFree( GetProcessHeap(), 0, info ); } +#ifndef __REACTOS__ /* CORE-11331 */ +static void test_D3DKMTCreateDCFromMemory( void ) +{ + D3DKMT_DESTROYDCFROMMEMORY destroy_desc; + D3DKMT_CREATEDCFROMMEMORY create_desc; + unsigned int width_bytes; + unsigned int i, x, y, z; + DWORD expected, colour; + BYTE data[12][48]; + NTSTATUS status; + HGDIOBJ *bitmap; + DIBSECTION dib; + BOOL fail, ret; + DWORD type; + int size; + + static const struct + { + const char *name; + D3DDDIFORMAT format; + unsigned int bit_count; + DWORD mask_r, mask_g, mask_b; + NTSTATUS status; + } + test_data[] = + { + { "R8G8B8", D3DDDIFMT_R8G8B8, 24, 0x00000000, 0x00000000, 0x00000000, STATUS_SUCCESS }, + { "A8R8G8B8", D3DDDIFMT_A8R8G8B8, 32, 0x00000000, 0x00000000, 0x00000000, STATUS_SUCCESS }, + { "X8R8G8B8", D3DDDIFMT_X8R8G8B8, 32, 0x00000000, 0x00000000, 0x00000000, STATUS_SUCCESS }, + { "R5G6B5", D3DDDIFMT_R5G6B5, 16, 0x0000f800, 0x000007e0, 0x0000001f, STATUS_SUCCESS }, + { "X1R5G5B5", D3DDDIFMT_X1R5G5B5, 16, 0x00007c00, 0x000003e0, 0x0000001f, STATUS_SUCCESS }, + { "A1R5G5B5", D3DDDIFMT_A1R5G5B5, 16, 0x00007c00, 0x000003e0, 0x0000001f, STATUS_SUCCESS }, + { "R3G3B2", D3DDDIFMT_R3G3B2, 8, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "A2B10G10R10", D3DDDIFMT_A2B10G10R10, 32, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "A8B8G8R8", D3DDDIFMT_A8B8G8R8, 32, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "X8B8G8R8", D3DDDIFMT_A8B8G8R8, 32, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "A2R10G10B10", D3DDDIFMT_A2R10G10B10, 32, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "P8", D3DDDIFMT_P8, 8, 0x00000000, 0x00000000, 0x00000000, STATUS_SUCCESS }, + { "L8", D3DDDIFMT_L8, 8, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "A8L8", D3DDDIFMT_A8L8, 16, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "V8U8", D3DDDIFMT_V8U8, 16, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "Q8W8V8U8", D3DDDIFMT_Q8W8V8U8, 32, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "DXT1", D3DDDIFMT_DXT1, 4, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "DXT2", D3DDDIFMT_DXT2, 8, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "DXT3", D3DDDIFMT_DXT3, 8, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "DXT4", D3DDDIFMT_DXT4, 8, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + { "DXT5", D3DDDIFMT_DXT5, 8, 0x00000000, 0x00000000, 0x00000000, STATUS_INVALID_PARAMETER }, + }; + + if (!pD3DKMTCreateDCFromMemory) + { + win_skip("D3DKMTCreateDCFromMemory() is not implemented.\n"); + return; + } + + status = pD3DKMTCreateDCFromMemory( NULL ); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + { + memset( data, 0xaa, sizeof(data) ); + + create_desc.pMemory = data; + create_desc.Format = test_data[i].format; + create_desc.Width = 9; + create_desc.Height = 7; + create_desc.Pitch = sizeof(*data); + create_desc.hDeviceDc = NULL; + create_desc.pColorTable = NULL; + create_desc.hDc = (void *)0x010baade; + create_desc.hBitmap = (void *)0x020baade; + + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n", + test_data[i].name, status); + + create_desc.hDeviceDc = CreateCompatibleDC( NULL ); + create_desc.pMemory = NULL; + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n", + test_data[i].name, status); + + create_desc.pMemory = data; + create_desc.Height = 0; + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n", + test_data[i].name, status); + ok(create_desc.hDc == (void *)0x010baade, "%s: Got unexpected dc %p.\n", + test_data[i].name, create_desc.hDc); + ok(create_desc.hBitmap == (void *)0x020baade, "%s: Got unexpected bitmap %p.\n", + test_data[i].name, create_desc.hBitmap); + + create_desc.Height = 7; + create_desc.Width = 0; + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n", + test_data[i].name, status, test_data[i].status); + if (status == STATUS_SUCCESS) + { + destroy_desc.hDc = create_desc.hDc; + destroy_desc.hBitmap = create_desc.hBitmap; + status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); + ok(status == STATUS_SUCCESS, "%s: Got unexpected status %#x.\n", test_data[i].name, status); + create_desc.hDc = (void *)0x010baade; + create_desc.hBitmap = (void *)0x020baade; + } + + create_desc.Pitch = 0; + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n", + test_data[i].name, status); + ok(create_desc.hDc == (void *)0x010baade, "%s: Got unexpected dc %p.\n", + test_data[i].name, create_desc.hDc); + ok(create_desc.hBitmap == (void *)0x020baade, "%s: Got unexpected bitmap %p.\n", + test_data[i].name, create_desc.hBitmap); + + create_desc.Width = 9; + create_desc.Pitch = sizeof(*data); + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n", + test_data[i].name, status, test_data[i].status); + if (status == STATUS_SUCCESS) + { + ok(!!create_desc.hDc, "%s: Got unexpected dc %p.\n", + test_data[i].name, create_desc.hDc); + ok(!!create_desc.hBitmap, "%s: Got unexpected bitmap %p.\n", + test_data[i].name, create_desc.hBitmap); + } + else + { + ok(create_desc.hDc == (void *)0x010baade, "%s: Got unexpected dc %p.\n", + test_data[i].name, create_desc.hDc); + ok(create_desc.hBitmap == (void *)0x020baade, "%s: Got unexpected bitmap %p.\n", + test_data[i].name, create_desc.hBitmap); + continue; + } + + type = GetObjectType( create_desc.hDc ); + ok(type == OBJ_MEMDC, "%s: Got unexpected object type %#x.\n", test_data[i].name, type); + type = GetObjectType( create_desc.hBitmap ); + ok(type == OBJ_BITMAP, "%s: Got unexpected object type %#x.\n", test_data[i].name, type); + bitmap = GetCurrentObject( create_desc.hDc, OBJ_BITMAP ); + ok(bitmap == create_desc.hBitmap, "%s: Got unexpected bitmap %p, expected %p.\n", + test_data[i].name, bitmap, create_desc.hBitmap); + + size = GetObjectA( bitmap, sizeof(dib), &dib ); + ok(size == sizeof(dib), "%s: Got unexpected size %d.\n", test_data[i].name, size); + ok(!dib.dsBm.bmType, "%s: Got unexpected type %#x.\n", + test_data[i].name, dib.dsBm.bmType); + ok(dib.dsBm.bmWidth == create_desc.Width, "%s: Got unexpected width %d.\n", + test_data[i].name, dib.dsBm.bmWidth); + ok(dib.dsBm.bmHeight == create_desc.Height, "%s: Got unexpected height %d.\n", + test_data[i].name, dib.dsBm.bmHeight); + width_bytes = get_dib_stride( create_desc.Width, test_data[i].bit_count ); + ok(dib.dsBm.bmWidthBytes == width_bytes, "%s: Got unexpected width bytes %d.\n", + test_data[i].name, dib.dsBm.bmWidthBytes); + ok(dib.dsBm.bmPlanes == 1, "%s: Got unexpected plane count %d.\n", + test_data[i].name, dib.dsBm.bmPlanes); + ok(dib.dsBm.bmBitsPixel == test_data[i].bit_count, "%s: Got unexpected bit count %d.\n", + test_data[i].name, dib.dsBm.bmBitsPixel); + ok(dib.dsBm.bmBits == create_desc.pMemory, "%s: Got unexpected bits %p, expected %p.\n", + test_data[i].name, dib.dsBm.bmBits, create_desc.pMemory); + + ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "%s: Got unexpected size %u.\n", + test_data[i].name, dib.dsBmih.biSize); + ok(dib.dsBmih.biWidth == create_desc.Width, "%s: Got unexpected width %d.\n", + test_data[i].name, dib.dsBmih.biHeight); + ok(dib.dsBmih.biHeight == create_desc.Height, "%s: Got unexpected height %d.\n", + test_data[i].name, dib.dsBmih.biHeight); + ok(dib.dsBmih.biPlanes == 1, "%s: Got unexpected plane count %u.\n", + test_data[i].name, dib.dsBmih.biPlanes); + ok(dib.dsBmih.biBitCount == test_data[i].bit_count, "%s: Got unexpected bit count %u.\n", + test_data[i].name, dib.dsBmih.biBitCount); + ok(dib.dsBmih.biCompression == (test_data[i].bit_count == 16 ? BI_BITFIELDS : BI_RGB), + "%s: Got unexpected compression %#x.\n", + test_data[i].name, dib.dsBmih.biCompression); + ok(!dib.dsBmih.biSizeImage, "%s: Got unexpected image size %u.\n", + test_data[i].name, dib.dsBmih.biSizeImage); + ok(!dib.dsBmih.biXPelsPerMeter, "%s: Got unexpected horizontal resolution %d.\n", + test_data[i].name, dib.dsBmih.biXPelsPerMeter); + ok(!dib.dsBmih.biYPelsPerMeter, "%s: Got unexpected vertical resolution %d.\n", + test_data[i].name, dib.dsBmih.biYPelsPerMeter); + if (test_data[i].format == D3DDDIFMT_P8) + { + ok(dib.dsBmih.biClrUsed == 256, "%s: Got unexpected used colour count %u.\n", + test_data[i].name, dib.dsBmih.biClrUsed); + ok(dib.dsBmih.biClrImportant == 256, "%s: Got unexpected important colour count %u.\n", + test_data[i].name, dib.dsBmih.biClrImportant); + } + else + { + ok(!dib.dsBmih.biClrUsed, "%s: Got unexpected used colour count %u.\n", + test_data[i].name, dib.dsBmih.biClrUsed); + ok(!dib.dsBmih.biClrImportant, "%s: Got unexpected important colour count %u.\n", + test_data[i].name, dib.dsBmih.biClrImportant); + } + + ok(dib.dsBitfields[0] == test_data[i].mask_r && dib.dsBitfields[1] == test_data[i].mask_g + && dib.dsBitfields[2] == test_data[i].mask_b, + "%s: Got unexpected colour masks 0x%08x 0x%08x 0x%08x.\n", + test_data[i].name, dib.dsBitfields[0], dib.dsBitfields[1], dib.dsBitfields[2]); + ok(!dib.dshSection, "%s: Got unexpected section %p.\n", test_data[i].name, dib.dshSection); + ok(!dib.dsOffset, "%s: Got unexpected offset %u.\n", test_data[i].name, dib.dsOffset); + + ret = BitBlt( create_desc.hDc, 0, 0, 4, 10, NULL, 0, 0, BLACKNESS ); + ok(ret, "Failed to blit.\n"); + ret = BitBlt( create_desc.hDc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS ); + ok(ret, "Failed to blit.\n"); + + destroy_desc.hDc = create_desc.hDc; + destroy_desc.hBitmap = create_desc.hBitmap; + + status = pD3DKMTDestroyDCFromMemory( NULL ); + ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n", test_data[i].name, status); + status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); + ok(status == STATUS_SUCCESS, "%s: Got unexpected status %#x.\n", test_data[i].name, status); + status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); + ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n", test_data[i].name, status); + + ret = DeleteDC( create_desc.hDeviceDc ); + ok(ret, "Failed to delete dc.\n"); + + for (y = 0, fail = FALSE; y < 12 && !fail; ++y) + { + for (x = 0; x < sizeof(*data) / (test_data[i].bit_count / 8) && !fail; ++x) + { + for (z = 0, colour = 0; z < test_data[i].bit_count / 8; ++z) + { + colour = colour << 8 | data[y][x * (test_data[i].bit_count / 8) + z]; + } + + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + expected = 0xffffffff >> (32 - test_data[i].bit_count); + else if (x < 4 && y < 7) + expected = 0x00000000; + else + expected = 0xaaaaaaaa >> (32 - test_data[i].bit_count); + ok(colour == expected, "%s: Got unexpected colour 0x%08x at %u, %u, expected 0x%08x.\n", + test_data[i].name, colour, x, y, expected); + if (colour != expected) + fail = TRUE; + } + } + } +} +#endif /* __REACTOS__ */ + START_TEST(bitmap) { HMODULE hdll; hdll = GetModuleHandleA("gdi32.dll"); - pGdiAlphaBlend = (void*)GetProcAddress(hdll, "GdiAlphaBlend"); - pGdiGradientFill = (void*)GetProcAddress(hdll, "GdiGradientFill"); - pSetLayout = (void*)GetProcAddress(hdll, "SetLayout"); +#ifndef __REACTOS__ /* CORE-11331 */ + pD3DKMTCreateDCFromMemory = (void *)GetProcAddress( hdll, "D3DKMTCreateDCFromMemory" ); + pD3DKMTDestroyDCFromMemory = (void *)GetProcAddress( hdll, "D3DKMTDestroyDCFromMemory" ); +#endif + pGdiAlphaBlend = (void *)GetProcAddress( hdll, "GdiAlphaBlend" ); + pGdiGradientFill = (void *)GetProcAddress( hdll, "GdiGradientFill" ); + pSetLayout = (void *)GetProcAddress( hdll, "SetLayout" ); test_createdibitmap(); test_dibsections(); @@ -5695,4 +5956,7 @@ test_SetDIBits_RLE8(); test_SetDIBitsToDevice(); test_SetDIBitsToDevice_RLE8(); +#ifndef __REACTOS__ /* CORE-11331 */ + test_D3DKMTCreateDCFromMemory(); +#endif } Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… ============================================================================== --- trunk/rostests/winetests/gdi32/dc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dc.c [iso-8859-1] Sun Jul 3 11:29:52 2016 @@ -2,7 +2,7 @@ * Unit tests for dc functions * * Copyright (c) 2005 Huw Davies - * Copyright (c) 2005 Dmitry Timoshkov + * Copyright (c) 2005,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -812,7 +812,6 @@ ok(ret, "UnregisterClassA failed\n"); ret = GetObjectType(hdc_test); -todo_wine ok(!ret, "GetObjectType should fail for a deleted DC\n"); /* CS_OWNDC */ @@ -891,7 +890,7 @@ ret = GetBoundsRect(hdc, &rect, 0); ok(ret == DCB_RESET, "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect) || broken(EqualRect(&rect, &set_rect)), /* nt4 sp1-5 */ "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", @@ -986,7 +985,7 @@ "GetBoundsRect returned %x\n", ret); if (ret == DCB_RESET) { - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); @@ -995,7 +994,7 @@ ok(ret == (DCB_RESET | DCB_DISABLE), "SetBoundsRect returned %x\n", ret); ret = GetBoundsRect(hdc, &rect, 0); ok(ret == DCB_RESET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 0, 0, 0, 0); + SetRectEmpty(&expect); ok(EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); } @@ -1386,6 +1385,119 @@ DeleteObject( bmp ); } +static void print_something(HDC hdc) +{ + static const char psadobe[10] = "%!PS-Adobe"; + char buf[1024], *p; + char temp_path[MAX_PATH], file_name[MAX_PATH]; + DOCINFOA di; + DWORD ret; + HANDLE hfile; + + GetTempPathA(sizeof(temp_path), temp_path); + GetTempFileNameA(temp_path, "ps", 0, file_name); + + di.cbSize = sizeof(di); + di.lpszDocName = "Let's dance"; + di.lpszOutput = file_name; + di.lpszDatatype = NULL; + di.fwType = 0; + ret = StartDocA(hdc, &di); + ok(ret > 0, "StartDoc failed: %d\n", ret); + + strcpy(buf + 2, "\n% ===> before DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + strcpy(buf, "deadbeef"); + ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); + ok(ret == 1, "DOWNLOADHEADER failed\n"); + ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); + + strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + ret = EndDoc(hdc); + ok(ret == 1, "EndDoc failed\n"); + + hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + memset(buf, 0, sizeof(buf)); + ret = ReadFile(hfile, buf, sizeof(buf), &ret, NULL); + ok(ret, "ReadFile failed\n"); + CloseHandle(hfile); + + /* skip the HP PCL language selector */ + buf[sizeof(buf) - 1] = 0; + p = buf; + while (*p) + { + if (!(p[0] == 0x1b && p[1] == '%') && memcmp(p, "@PJL", 4) != 0) + break; + + p = strchr(p, '\n'); + if (!p) break; + + while (*p == '\r' || *p == '\n') p++; + } + ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); + + DeleteFileA(file_name); +} + +static void test_pscript_printer_dc(void) +{ + HDC hdc; + char buf[256]; + DWORD query, ret; + + hdc = create_printer_dc(100, FALSE); + + if (!hdc) return; + + if (!is_postscript_printer(hdc)) + { + skip("Default printer is not a PostScript device\n"); + DeleteDC( hdc ); + return; + } + + query = GETFACENAME; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(!ret, "GETFACENAME is supported\n"); + + query = DOWNLOADFACE; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "DOWNLOADFACE is not supported\n"); + + query = OPENCHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "OPENCHANNEL is not supported\n"); + + query = DOWNLOADHEADER; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "DOWNLOADHEADER is not supported\n"); + + query = CLOSECHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "CLOSECHANNEL is not supported\n"); + + query = POSTSCRIPT_PASSTHROUGH; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); + + ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); + ok(ret == 1, "GETFACENAME failed\n"); + trace("face name: %s\n", buf); + + print_something(hdc); + + DeleteDC(hdc); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1400,4 +1512,5 @@ test_desktop_colorres(); test_gamma(); test_printer_dc(); -} + test_pscript_printer_dc(); +} Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sun Jul 3 11:29:52 2016 @@ -105,6 +105,22 @@ pGetFontFileData = (void *)GetProcAddress(hgdi32, "GetFontFileData"); system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); +} + +static void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static void *heap_realloc( void *p, size_t len ) +{ + if (!p) return heap_alloc( len ); + return HeapReAlloc( GetProcessHeap(), 0, p, len ); +} + +static void heap_free( void *p ) +{ + HeapFree( GetProcessHeap(), 0, p ); } static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) @@ -1016,7 +1032,7 @@ ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX); - trace("expected %s, height %d scaled_hight %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi); + trace("expected %s, height %d scaled_height %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi); if(fd[i].dpi == tm.tmDigitizedAspectX) { @@ -2736,24 +2752,22 @@ ReleaseDC(NULL, hdc); } -#define MAX_ENUM_FONTS 4096 - struct enum_font_data { - int total; - LOGFONTA lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTA *lf; }; struct enum_fullname_data { - int total; - ENUMLOGFONTA elf[MAX_ENUM_FONTS]; + int total, size; + ENUMLOGFONTA *elf; }; struct enum_font_dataW { - int total; - LOGFONTW lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTW *lf; }; static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -2771,10 +2785,13 @@ if (0) /* Disabled to limit console spam */ trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2794,10 +2811,13 @@ if (0) /* Disabled to limit console spam */ trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2871,6 +2891,8 @@ skip("%s is not installed\n", font_name); return; } + memset( &efd, 0, sizeof(efd) ); + memset( &efdw, 0, sizeof(efdw) ); hdc = GetDC(0); @@ -3064,6 +3086,9 @@ } ReleaseDC(0, hdc); + + heap_free( efd.lf ); + heap_free( efdw.lf ); } static INT CALLBACK enum_multi_charset_font_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -3093,10 +3118,13 @@ if (type != TRUETYPE_FONTTYPE) return 1; - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -3107,10 +3135,13 @@ if (type != TRUETYPE_FONTTYPE) return 1; - if (efnd->total < MAX_ENUM_FONTS) - efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } + efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 1; } @@ -3144,7 +3175,7 @@ target.lfCharSet = ANSI_CHARSET; } - efd.total = 0; + memset(&efd, 0, sizeof(efd)); memset(&enum_font, 0, sizeof(enum_font)); strcpy(enum_font.lfFaceName, target.lfFaceName); enum_font.lfCharSet = DEFAULT_CHARSET; @@ -3152,15 +3183,14 @@ ReleaseDC(0, hdc); trace("'%s' has %d charsets.\n", target.lfFaceName, efd.total); - if (efd.total < 2) { + if (efd.total < 2) ok(0, "EnumFontFamilies is broken. Expected >= 2, got %d.\n", efd.total); - return; - } - - ok(efd.lf[0].lfCharSet == target.lfCharSet, - "(%s) got charset %d expected %d\n", - efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); - + else + ok(efd.lf[0].lfCharSet == target.lfCharSet, + "(%s) got charset %d expected %d\n", + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); + + heap_free(efd.lf); return; } @@ -5215,6 +5245,12 @@ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5230,6 +5266,12 @@ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5261,7 +5303,7 @@ memset(&lf, 0, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg should be enumerated\n"); @@ -5271,12 +5313,12 @@ ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); ok(ret, "did not expect MS Shell Dlg\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(ret, "MS Shell Dlg 2 should not be enumerated\n"); ok(!efnd.total, "MS Shell Dlg 2 should not be enumerated\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg 2"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); @@ -5286,6 +5328,7 @@ ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); ok(ret, "did not expect MS Shell Dlg 2\n"); + heap_free(efnd.elf); DeleteDC(hdc); } @@ -5396,7 +5439,7 @@ lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; strcpy(lf.lfFaceName, Family); - efnd.total = 0; + memset(&efnd, 0, sizeof(efnd)); EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); if (efnd.total == 0) skip("%s is not installed\n", lf.lfFaceName); @@ -5477,6 +5520,7 @@ HeapFree(GetProcessHeap(), 0, bufW); HeapFree(GetProcessHeap(), 0, bufA); } + heap_free(efnd.elf); DeleteDC(hdc); } @@ -6225,7 +6269,7 @@ lf.lfQuality = DEFAULT_QUALITY; lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - efd.total = 0; + memset( &efd, 0, sizeof(efd) ); EnumFontFamiliesExA(hdc, &lf, enum_font_data_proc, (LPARAM)&efd, 0); for (i = 0; i < efd.total; i++) { @@ -6239,6 +6283,7 @@ } } } + heap_free( efd.lf ); DeleteDC( hdc ); } Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sun Jul 3 11:29:52 2016 @@ -148,6 +148,13 @@ ok(!memcmp(&orig_lf, &device_lf, FIELD_OFFSET(LOGFONTA, lfOutPrecision)), "fonts don't match\n"); ok(!lstrcmpA(orig_lf.lfFaceName, device_lf.lfFaceName), "font names don't match\n"); + ok(!emr_ExtTextOutW->rclBounds.left, "emr_ExtTextOutW->rclBounds.left = %d\n", + emr_ExtTextOutW->rclBounds.left); + ok(emr_ExtTextOutW->rclBounds.right != -1, "emr_ExtTextOutW->rclBounds.right = %d\n", + emr_ExtTextOutW->rclBounds.right); + ok(emr_ExtTextOutW->rclBounds.bottom != -1, "emr_ExtTextOutW->rclBounds.bottom = %d\n", + emr_ExtTextOutW->rclBounds.bottom); + for(i = 0; i < emr_ExtTextOutW->emrtext.nChars; i++) { ok(orig_dx[i] == dx[i], "pass %d: dx[%d] (%d) didn't match %d\n", @@ -227,6 +234,20 @@ /* 2. pass custom lpDx */ ret = ExtTextOutA(hdcMetafile, 0, 20, 0, &rc, text, lstrlenA(text), dx); + ok( ret, "ExtTextOutA error %d\n", GetLastError()); + + /* 3. pass NULL lprc */ + ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); + ok( ret, "ExtTextOutA error %d\n", GetLastError()); + + /* 4. test with unmatched BeginPath/EndPath calls */ + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = EndPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = ExtTextOutA(hdcMetafile, 0, 60, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %d\n", GetLastError()); hFont = SelectObject(hdcMetafile, hFont); @@ -989,7 +1010,7 @@ /* with the nominal results. */ /* Maximum size of sample metafiles in bytes. */ -#define MF_BUFSIZE 512 +#define MF_BUFSIZE 1024 /* 8x8 bitmap data for a pattern brush */ static const unsigned char SAMPLE_PATTERN_BRUSH[] = { @@ -1269,16 +1290,16 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x6a, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xa0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x64, 0x02, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x23, 0x04, 0x00, 0x00, 0x3b, 0x02, 0x00, 0x00, - 0x75, 0x01, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x08, 0xb1, 0x05, 0x00, - 0x28, 0x11, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x30, 0xda, 0x04, 0x00, 0x4c, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1314,9 +1335,34 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0a, 0xd7, 0xa3, 0x3b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0xd7, 0x23, 0x3c, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x94, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static const unsigned char EMF_DCBRUSH_BITS[] = @@ -1409,6 +1455,97 @@ 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_POLYPOLYLINE_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x61, 0x01, 0x00, 0x00, 0xc2, 0x02, 0x00, 0x00, + 0x7a, 0xd4, 0x13, 0x00, 0xe8, 0x44, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x84, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xa1, 0x05, 0x00, 0x00, 0x47, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc1, 0x07, 0x00, + 0x2c, 0x84, 0x04, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x14, 0x00, + 0x5a, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x64, 0x00, 0xc8, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_GRADIENTFILL_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x2b, 0x01, 0x00, 0x00, 0x35, 0x01, 0x00, 0x00, + 0x23, 0x00, 0x00, 0x00, 0x61, 0x01, 0x00, 0x00, + 0x31, 0x29, 0x00, 0x00, 0xa3, 0x2a, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x05, 0x00, 0x00, 0x46, 0x03, 0x00, 0x00, + 0xda, 0x01, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x15, 0x3c, 0x07, 0x00, + 0xcb, 0x82, 0x04, 0x00, 0x76, 0x00, 0x00, 0x00, + 0x8c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x2b, 0x01, 0x00, 0x00, + 0x35, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0x80, 0x00, 0x00, 0x01, 0x80, + 0xc8, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, + 0xb4, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, + 0x34, 0x12, 0x78, 0x56, 0xbc, 0x9a, 0xf0, 0xde, + 0x2c, 0x01, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x9a, 0x01, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -1757,6 +1894,14 @@ broken(emh1->nSize - diff_nt4 == emh2->nSize) || broken(emh1->nSize - diff_9x == emh2->nSize), "expected nSize %u, got %u\n", emh1->nSize, emh2->nSize); + ok(emh1->rclBounds.left == emh2->rclBounds.left, "%s: expected rclBounds.left = %d, got %d\n", + desc, emh1->rclBounds.left, emh2->rclBounds.left); + ok(emh1->rclBounds.top == emh2->rclBounds.top, "%s: expected rclBounds.top = %d, got %d\n", + desc, emh1->rclBounds.top, emh2->rclBounds.top); + ok(emh1->rclBounds.right == emh2->rclBounds.right, "%s: expected rclBounds.right = %d, got %d\n", + desc, emh1->rclBounds.right, emh2->rclBounds.right); + ok(emh1->rclBounds.bottom == emh2->rclBounds.bottom, "%s: expected rclBounds.bottom = %d, got %d\n", + desc, emh1->rclBounds.bottom, emh2->rclBounds.bottom); ok(emh1->dSignature == emh2->dSignature, "expected dSignature %u, got %u\n", emh1->dSignature, emh2->dSignature); ok(emh1->nBytes == emh2->nBytes || broken(emh1->nBytes - diff_nt4 == emh2->nBytes) || @@ -1805,6 +1950,7 @@ 0, /* biClrImportant */ }; void *bits; + XFORM xform; BOOL ret; hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -1812,6 +1958,7 @@ hdcBitmap = CreateCompatibleDC(hdcDisplay); ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); + ok(SetGraphicsMode(hdcBitmap, GM_ADVANCED), "SetGraphicsMode failed\n"); bmih.biXPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSX), 100, 3937); bmih.biYPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSY), 100, 3937); hBitmap = CreateDIBSection(hdcDisplay, (const BITMAPINFO *)&bmih, @@ -1829,6 +1976,19 @@ ok( ret, "BitBlt(SRCCOPY) failed\n" ); ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, WHITENESS); ok( ret, "BitBlt(WHITENESS) failed\n" ); + + ok(SetMapMode(hdcBitmap, MM_ANISOTROPIC), "SetMapMode failed\n"); + ok(SetWindowOrgEx(hdcBitmap, 0, 0, NULL), "SetWindowOrgEx failed\n"); + ok(SetWindowExtEx(hdcBitmap, 400, 400, NULL), "SetWindowExtEx failed\n"); + ok(SetViewportOrgEx(hdcBitmap, 0, 0, NULL), "SetViewportOrgEx failed\n"); + ok(SetViewportExtEx(hdcBitmap, BMP_DIM, BMP_DIM, NULL), "SetViewportExtEx failed\n"); + memset(&xform, 0, sizeof(xform)); + xform.eM11 = 0.5; + xform.eM22 = 1.0; + ok(SetWorldTransform(hdcBitmap, &xform), "SetWorldTransform failed\n"); + + ret = StretchBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, 400, 400, SRCCOPY); + ok( ret, "StretchBlt(SRCCOPY) failed\n" ); hMetafile = CloseEnhMetaFile(hdcMetafile); ok( hMetafile != 0, "CloseEnhMetaFile failed\n" ); @@ -2775,6 +2935,63 @@ DeleteMetaFile(hmf); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); +} + +static const unsigned char MF_PATH_BITS[] = +{ + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0x02, + 0x32, 0x00, 0x32, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x13, 0x02, 0x96, 0x00, 0x32, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x13, 0x02, 0x96, 0x00, 0x96, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x13, 0x02, 0x32, 0x00, + 0x96, 0x00, 0x05, 0x00, 0x00, 0x00, 0x13, 0x02, + 0x32, 0x00, 0x32, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x1b, 0x04, 0x14, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static void test_mf_GetPath(void) +{ + HDC hdc; + HMETAFILE hmf; + BOOL ret; + int size; + + SetLastError(0xdeadbeef); + hdc = CreateMetaFileA(NULL); + ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); + + ret = BeginPath(hdc); + ok(!ret, "BeginPath on metafile DC should fail\n"); + ret = MoveToEx(hdc, 50, 50, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(hdc, 50, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 150, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 150, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 50, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + Rectangle(hdc, 10, 10, 20, 20); + EndPath(hdc); + + size = GetPath(hdc, NULL, NULL, 0); + ok( size == -1, "GetPath returned %d.\n", size); + + hmf = CloseMetaFile(hdc); + ok(hmf != 0, "CloseMetaFile error %d\n", GetLastError()); + + if (compare_mf_bits (hmf, MF_PATH_BITS, sizeof(MF_PATH_BITS), "mf_GetPath") != 0) + { + dump_mf_bits(hmf, "mf_GetPath"); + EnumMetaFile(0, hmf, mf_enum_proc, 0); + } + + ret = DeleteMetaFile(hmf); + ok( ret, "DeleteMetaFile error %d\n", GetLastError()); } static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData) @@ -3483,16 +3700,16 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xf8, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0c, 0x02, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0x07, 0x00, 0x00, 0xd3, 0x03, 0x00, 0x00, - 0xfc, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, - 0xd3, 0xf3, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, + 0x40, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x04, 0x00, + 0x80, 0xa9, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, @@ -3506,14 +3723,51 @@ 0x32, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, - 0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x13, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x5a, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static void test_emf_GetPath(void) { + POINT pts[4] = {{10, 10}, {20, 10}, {10, 20}, {20, 20}}; + DWORD counts[2] = {2, 2}; HDC hdcMetafile; HENHMETAFILE hemf; BOOL ret; @@ -3523,7 +3777,8 @@ hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - BeginPath(hdcMetafile); + ret = BeginPath(hdcMetafile); + ok(ret, "BeginPath error %d\n", GetLastError()); ret = MoveToEx(hdcMetafile, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 150); @@ -3535,10 +3790,17 @@ ret = LineTo(hdcMetafile, 50, 50); ok( ret, "LineTo error %d.\n", GetLastError()); Rectangle(hdcMetafile, 10, 10, 20, 20); + Arc(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); + Chord(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); + Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); + Ellipse(hdcMetafile, 10, 10, 20, 20); + RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); + Polyline(hdcMetafile, pts, 4); + PolyPolyline(hdcMetafile, pts, counts, 2); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - ok( size == 9, "GetPath returned %d.\n", size); + todo_wine ok( size == 77, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -3550,6 +3812,104 @@ } DeleteEnhMetaFile(hemf); +} + +static void test_emf_PolyPolyline(void) +{ + HDC hdcMetafile; + HENHMETAFILE hemf; + POINT pts[4] = {{10, 20}, {100, 200}, {0x9000,300}, {400, 500}}; + DWORD counts[2]; + BOOL ret; + + SetLastError(0xdeadbeef); + hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + ret = PolyPolyline(hdcMetafile, NULL, NULL, 0); + ok( !ret, "PolyPolyline\n" ); + + SetLastError( 0xdeadbeef ); + counts[0] = 0; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + counts[0] = 1; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + counts[0] = 2; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + counts[0] = 2; + counts[1] = 2; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( ret, "PolyPolyline\n" ); + + hemf = CloseEnhMetaFile(hdcMetafile); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if(compare_emf_bits(hemf, EMF_POLYPOLYLINE_BITS, sizeof(EMF_POLYPOLYLINE_BITS), + "emf_PolyPolyline", FALSE) != 0) + { + dump_emf_bits(hemf, "emf_PolyPolyline"); + dump_emf_records(hemf, "emf_PolyPolyline"); + } + + DeleteEnhMetaFile(hemf); +} + +static void test_emf_GradientFill(void) +{ + HDC mf; + HENHMETAFILE hemf; + TRIVERTEX v[] = + { + { 1, 10, 0xff00, 0x8000, 0x0000, 0x8001 }, + { 200, 210, 0x0000, 0x0000, 0xff00, 0xff00 }, + { 180, 190, 0x1234, 0x5678, 0x9abc, 0xdef0 }, + { 300, 310, 0xff00, 0xff00, 0xff00, 0x0000 }, + { 400, 410, 0xff00, 0xff00, 0xff00, 0x0000 } + }; + GRADIENT_TRIANGLE tri[] = { { 0, 1, 2 }, { 3, 1, 0 } }; + BOOL ret; + + mf = CreateEnhMetaFileA( GetDC( 0 ), NULL, NULL, NULL ); + ok( mf != 0, "CreateEnhMetaFileA error %d\n", GetLastError() ); + + /* Don't test the GRADIENT_FILL_RECT_ modes since a Windows bug + * means it allocates three mesh indices rather than two per + * rectangle. This results in uninitialised values being written + * to the EMF which is rather difficult to test against. + * + * Note also that the final vertex here is not required, yet it is + * written to the EMF, but is not considered in the bounds + * calculation. + */ + ret = GdiGradientFill( mf, v, sizeof(v) / sizeof(v[0]), tri, sizeof(tri) / sizeof(tri[0]), + GRADIENT_FILL_TRIANGLE ); + ok( ret, "GradientFill\n" ); + + hemf = CloseEnhMetaFile( mf ); + ok( hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError() ); + + if (compare_emf_bits( hemf, EMF_GRADIENTFILL_BITS, sizeof(EMF_GRADIENTFILL_BITS), + "emf_GradientFill", FALSE ) != 0) + { + dump_emf_bits( hemf, "emf_GradientFill" ); + dump_emf_records( hemf, "emf_GradientFill" ); + } + + DeleteEnhMetaFile( hemf ); } START_TEST(metafile) @@ -3566,6 +3926,8 @@ test_emf_clipping(); test_emf_polybezier(); test_emf_GetPath(); + test_emf_PolyPolyline(); + test_emf_GradientFill(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -3577,6 +3939,7 @@ test_SetMetaFileBits(); test_mf_ExtTextOut_on_path(); test_mf_clipping(); + test_mf_GetPath(); /* For metafile conversions */ test_mf_conversions();

1 0

[akhaldi] 71778: [WINHTTP_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:21:35 2016 New Revision: 71778 URL: http://svn.reactos.org/svn/reactos?rev=71778&view=rev Log: [WINHTTP_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Sun Jul 3 11:21:35 2016 @@ -1011,11 +1011,13 @@ ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret || proxy_active(), "succeeded unexpectedly\n"); - - size = 0; - ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); - ok(!ret, "succeeded unexpectedly\n"); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "header query failed %u\n", GetLastError()); + ok(status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status); WinHttpCloseHandle(req);

1 0

[akhaldi] 71777: [PSDK] Update ntsecpkg.h. CORE-11368
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:19:58 2016 New Revision: 71777 URL: http://svn.reactos.org/svn/reactos?rev=71777&view=rev Log: [PSDK] Update ntsecpkg.h. CORE-11368 Modified: trunk/reactos/sdk/include/psdk/ntsecpkg.h Modified: trunk/reactos/sdk/include/psdk/ntsecpkg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntsecpkg.… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntsecpkg.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntsecpkg.h [iso-8859-1] Sun Jul 3 11:19:58 2016 @@ -37,6 +37,7 @@ #define SECPKG_INTERFACE_VERSION_4 0x80000 #define SECPKG_INTERFACE_VERSION_5 0x100000 #define SECPKG_INTERFACE_VERSION_6 0x200000 +#define SECPKG_INTERFACE_VERSION_7 0x400000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -164,10 +165,16 @@ } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; -typedef struct _SECPKG_TARGETINFO { +typedef struct _SECPKG_TARGETINFO { PSID DomainSid; PCWSTR ComputerName; } SECPKG_TARGETINFO, *PSECPKG_TARGETINFO; + +typedef struct _SECPKG_POST_LOGON_USER_INFO { + ULONG Flags; + LUID LogonId; + LUID LinkedLogonId; +} SECPKG_POST_LOGON_USER_INFO, *PSECPKG_POST_LOGON_USER_INFO; /* callbacks implemented by SSP/AP dlls and called by the LSA */ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, @@ -382,6 +389,7 @@ PUCHAR); typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PSECPKG_TARGETINFO); +typedef NTSTATUS (NTAPI LSA_AP_POST_LOGON_USER)(PSECPKG_POST_LOGON_USER_INFO); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -452,6 +460,8 @@ /* Packages with version SECPKG_INTERFACE_VERSION_5 end here */ SpValidateTargetInfoFn *ValidateTargetInfo; /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ + LSA_AP_POST_LOGON_USER* PostLogonUser; + /* Packages with version SECPKG_INTERFACE_VERSION_7 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

[akhaldi] 71776: [STDOLE32.TLB] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:18:44 2016 New Revision: 71776 URL: http://svn.reactos.org/svn/reactos?rev=71776&view=rev Log: [STDOLE32.TLB] Sync with Wine Staging 1.9.11. CORE-11368 Added: trunk/reactos/sdk/include/psdk/stdole32.idl (with props) Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/cmake/widl-support.cmake Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Sun Jul 3 11:18:44 2016 @@ -20,121 +20,4 @@ #pragma makedep regtypelib -[ - uuid(00020430-0000-0000-C000-000000000046), - restricted, - version(1.0), - helpstring("OLE Automation") -] -library stdole -{ - /* typedefs aren't stored in the type library. - These type names are known by the type compiler so it - doesn't really matter what we define them as. */ - - typedef void *VARIANT; - typedef wchar_t *BSTR; - typedef unsigned long SCODE; - typedef unsigned long HRESULT; - - typedef struct GUID { - unsigned long Data1; - unsigned short Data2; - unsigned short Data3; - unsigned char Data4[ 8 ]; - } GUID; - - typedef struct DISPPARAMS { - VARIANT *rgvarg; - long *rgdispidNamedArgs; - unsigned int cArgs; - unsigned int cNamedArgs; - } DISPPARAMS; - - typedef struct EXCEPINFO { - unsigned short wCode; - unsigned short wReserved; - BSTR bstrSource; - BSTR bstrDescription; - BSTR bstrHelpFile; - unsigned long dwHelpContext; - void *pvReserved; - void *pfnDeferredFillIn; - SCODE scode; - } EXCEPINFO; - - [ - odl, - uuid(00000000-0000-0000-C000-000000000046) - ] - interface IUnknown - { - [restricted] - HRESULT QueryInterface( - [in] GUID *riid, - [out] void **ppvObj); - - [restricted] - unsigned long AddRef(); - - [restricted] - unsigned long Release(); - } - - [ - odl, - uuid(00020400-0000-0000-C000-000000000046) - ] - interface IDispatch : IUnknown - { - [restricted] - HRESULT GetTypeInfoCount( - [out] unsigned int *pctinfo); - - [restricted] - HRESULT GetTypeInfo( - [in] unsigned int itinfo, - [in] unsigned long lcid, - [out] void **pptinfo); - - [restricted] - HRESULT GetIDsOfNames( - [in] GUID *riid, - [in] char **rgszNames, - [in] unsigned int cNames, - [in] unsigned long lcid, - [out] long *rgdispid); - - [restricted] - HRESULT Invoke( - [in] long dispidMember, - [in] GUID *riid, - [in] unsigned long lcid, - [in] unsigned short wFlags, - [in] DISPPARAMS *pdispparams, - [out] VARIANT *pvarResult, - [out] EXCEPINFO *pexcepinfo, - [out] unsigned int *puArgErr); - - } - - [ - odl, - uuid(00020404-0000-0000-C000-000000000046) - ] - interface IEnumVARIANT : IUnknown - { - HRESULT Next( - [in] unsigned long celt, - [in] VARIANT *rgvar, - [out] unsigned long *pceltFetched); - - HRESULT Skip( - [in] unsigned long celt); - - HRESULT Reset(); - - HRESULT Clone( - [out] IEnumVARIANT **ppenum); - } -}; +#include "stdole32.idl" 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] Sun Jul 3 11:18:44 2016 @@ -183,7 +183,7 @@ reactos/dll/win32/softpub # Synced to WineStaging-1.9.4 reactos/dll/win32/spoolss # Synced to WineStaging-1.9.4 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.4 -reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.4 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/sti # Synced to WineStaging-1.9.4 reactos/dll/win32/sxs # Synced to WineStaging-1.9.4 reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11 Modified: trunk/reactos/sdk/cmake/widl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/widl-support.cma… ============================================================================== --- trunk/reactos/sdk/cmake/widl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/widl-support.cmake [iso-8859-1] Sun Jul 3 11:18:44 2016 @@ -12,6 +12,9 @@ get_includes(INCLUDES) get_defines(DEFINES) foreach(FILE ${ARGN}) + if(${FILE} STREQUAL "std_ole_v1.idl") + set(IDL_FLAGS ${IDL_FLAGS} --oldtlb) + endif() get_filename_component(NAME ${FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb Added: trunk/reactos/sdk/include/psdk/stdole32.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/stdole32.… ============================================================================== --- trunk/reactos/sdk/include/psdk/stdole32.idl (added) +++ trunk/reactos/sdk/include/psdk/stdole32.idl [iso-8859-1] Sun Jul 3 11:18:44 2016 @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#if 0 +#pragma makedep install +#pragma makedep typelib +#endif + +[ + uuid(00020430-0000-0000-C000-000000000046), + restricted, + version(1.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef void *VARIANT; + typedef wchar_t *BSTR; + typedef unsigned long SCODE; + typedef unsigned long HRESULT; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } +}; Propchange: trunk/reactos/sdk/include/psdk/stdole32.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 71775: [WIDL] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: akhaldi Date: Sun Jul 3 11:16:23 2016 New Revision: 71775 URL: http://svn.reactos.org/svn/reactos?rev=71775&view=rev Log: [WIDL] Sync with Wine Staging 1.9.11. CORE-11368 Added: trunk/reactos/sdk/tools/widl/write_sltg.c (with props) Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/tools/widl/CMakeLists.txt trunk/reactos/sdk/tools/widl/header.c trunk/reactos/sdk/tools/widl/parser.h trunk/reactos/sdk/tools/widl/parser.l trunk/reactos/sdk/tools/widl/parser.tab.c trunk/reactos/sdk/tools/widl/parser.tab.h trunk/reactos/sdk/tools/widl/parser.y trunk/reactos/sdk/tools/widl/parser.yy.c trunk/reactos/sdk/tools/widl/typelib.c trunk/reactos/sdk/tools/widl/typelib.h trunk/reactos/sdk/tools/widl/typelib_struct.h trunk/reactos/sdk/tools/widl/widl.c trunk/reactos/sdk/tools/widl/widl.h trunk/reactos/sdk/tools/widl/widltypes.h trunk/reactos/sdk/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/sdk/tools/widl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/CMakeLists.… Modified: trunk/reactos/sdk/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/header.c?re… Modified: trunk/reactos/sdk/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.h?re… Modified: trunk/reactos/sdk/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.l?re… Modified: trunk/reactos/sdk/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.tab.… Modified: trunk/reactos/sdk/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.tab.… Modified: trunk/reactos/sdk/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.y?re… Modified: trunk/reactos/sdk/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.yy.c… Modified: trunk/reactos/sdk/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/typelib.c?r… Modified: trunk/reactos/sdk/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/typelib.h?r… Modified: trunk/reactos/sdk/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/typelib_str… Modified: trunk/reactos/sdk/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/widl.c?rev=… Modified: trunk/reactos/sdk/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/widl.h?rev=… Modified: trunk/reactos/sdk/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/widltypes.h… Modified: trunk/reactos/sdk/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/write_msft.… Added: trunk/reactos/sdk/tools/widl/write_sltg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/write_sltg.…

1 0

[ekohl] 71774: [TRANSLATION] Romanian resources maintenance. Patch by Ștefan Fulea. CORE-11439 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: ekohl Date: Sun Jul 3 09:51:22 2016 New Revision: 71774 URL: http://svn.reactos.org/svn/reactos?rev=71774&view=rev Log: [TRANSLATION] Romanian resources maintenance. Patch by Ștefan Fulea. CORE-11439 #resolve #comment Thanks a lot! Added: trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/network/telnet/telnet.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/system/subst/lang/ro-RO.rc trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/base/applications/cacls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -1,11 +1,4 @@ -/* - * FILE: base/applications/cacls/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) - * CHANGE LOG: 2011-08-20 initial translation - * 2011-10-17 diacritics change - */ - +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE @@ -18,7 +11,7 @@ /T ModificÄ ACL pentru fiÈierele specificate Ã®n\n\ directorul curent Èi toate subdirectoarele sale.\n\ /E EditeazÄ ACL curentÄ evitÃ¢nd astfel Ã®nlocuirea ei.\n\ - /C ContinuÄ Èi la erori de acces interzis.\n\ + /C ContinuÄ Èi la erori de acces respins.\n\ /G utilizator:acces AcordÄ drepturile de acces specificate pentru utilizator.\n\ acces poate fi de: R Citire\n\ W Scriere\n\ Modified: trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -7,7 +7,7 @@ COMP [/L] [/A] [data1] [data2]\n\n\ data1 Calea Èi numele primului fiÈier de comparat.\n\ data2 Calea Èi numele celui de-al doilea fiÈier de comparat.\n\ - /A AfiÈeazÄ diferenÈele Ã®n caractere ASCII (default: hexadecimal).\n\ + /A AfiÈeazÄ diferenÈele Ã®n caractere ASCII (implicit: hexazecimal).\n\ /L AfiÈeazÄ numÄrul liniei pentru diferenÈe.\n" IDS_INVALIDSWITCH "Parametru nevalid - /%c\n" IDS_BADSYNTAX "SintaxÄ eronatÄ\n" Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -30,12 +30,12 @@ STRING_DELETE_VALUE, "Sigur doriÈi Ètergerea valorii de registru Â«%1Â»?" STRING_DELETE_VALUEALL, "Sigur doriÈi Ètergerea tuturor valorilor de registru din Â«%1Â»?" STRING_DELETE_SUBKEY, "Sigur doriÈi Ètergerea cheii de registru Â«%1Â»?" - STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n" - STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'. An unexpected error occurred.\n" - STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n" - STRING_MATCHES_FOUND, "Search complete. Number of matches found: %1!d!\n" - STRING_INVALID_SYNTAX, "reg: Invalid syntax. " - STRING_INVALID_OPTION, "reg: Invalid option [%1]. " - STRING_REG_HELP, "Type ""REG /?"" for help.\n" - STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" + STRING_INVALID_STRING, "reg: OpÈiunea [/d] trebuie urmatÄ de un Èir valid\n" + STRING_VALUEALL_FAILED, "reg: Nu se pot Èterge toate valorile de registru din Â«%1Â». A survenit o eroare neaÈteptatÄ.\n" + STRING_GENERAL_FAILURE, "reg: Nu se poate completa operaÈia specificatÄ. A survenit o eroare neaÈteptatÄ.\n" + STRING_MATCHES_FOUND, "CÄutare efectuatÄ. NumÄrul de potriviri gÄsite: %1!d!\n" + STRING_INVALID_SYNTAX, "reg: SintaxÄ nerespectatÄ. " + STRING_INVALID_OPTION, "reg: OpÈiune nevalidÄ [%1]. " + STRING_REG_HELP, "TastaÈi Â«REG /?Â» pentru mai multe informaÈii.\n" + STRING_FUNC_HELP, "TastaÈi Â«REG %1 /?Â» pentru mai multe informaÈii.\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -7,5 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Eroare: ComandÄ nerecunoscutÄ.\n" STRING_ALIAS_NOT_FOUND, "Eroare: Nu se poate gÄsi alias.\n" STRING_INVALID_QUERY, "Eroare: Cerere nevalidÄ.\n" - STRING_INVALID_PATH, "Invalid syntax for PATH\n" + STRING_INVALID_PATH, "ConÈinutul din Â«PATHÂ» este sintactic nevalid.\n" } Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -1,4 +1,7 @@ -/* 2011.10.18 - Fulea Ètefan: minor changes */ +/* + * Translators: Petru Dimitriu (petrimetri at gmail dot com) + * Ètefan Fulea (stefan dot fulea at mail dot md) + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -37,17 +40,17 @@ BEGIN DEFPUSHBUTTON "Ã&nchide", IDOK, 96, 161, 50, 14 PUSHBUTTON "&Manualâ¦", IDC_BUTTON_HELP, 38, 161, 50, 14 - LTEXT "Factoru&l de mÄrire:", IDC_STATIC, 6, 8, 68, 8 + LTEXT "&Factorul de mÄrire:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "UrmÄrire", IDC_STATIC, 7, 25, 139, 59 GROUPBOX "Prezentare", IDC_STATIC, 7, 87, 139, 57 CONTROL "UrmÄreÈte &cursorul Èoricelului", IDC_FOLLOWMOUSECHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 42, 114, 10 - CONTROL "UrmÄreÈte &focalizarea tastaturii", IDC_FOLLOWKEYBOARDCHECK, "Button", + CONTROL "UrmÄreÈte f&ocalizarea tastaturii", IDC_FOLLOWKEYBOARDCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 54, 114, 10 - CONTROL "UrmÄreÈte editarea &textului", IDC_FOLLOWTEXTEDITINGCHECK, "Button", + CONTROL "UrmÄreÈte &editarea textului", IDC_FOLLOWTEXTEDITINGCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 66, 114, 10 - CONTROL "&InverseazÄ culorile", IDC_INVERTCOLORSCHECK, "Button", + CONTROL "In&verseazÄ culorile", IDC_INVERTCOLORSCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 102, 114, 10 CONTROL "&PorneÈte minimizat", IDC_STARTMINIMIZEDCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 114, 114, 10 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -9,7 +9,7 @@ BEGIN POPUP "&Jurnal" BEGIN - MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED + MENUITEM "&PÄstrare jurnal de evenimente caâ¦", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "ÃnlÄt&urÄ toate evenimentele", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR @@ -97,7 +97,7 @@ IDS_APP_TITLE "Observator de evenimente" IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\" IDS_STATUS_MSG "%s are %lu eveniment(e)" - IDS_EVENTSTRINGIDNOTFOUND "Nu se poate gÄsi descrierea evenimentului cu ID-ul ( %lu ) Ã®n sursa ( %s ). Este posibil ca Ã®n calculatorul local sÄ nu existe informaÈiile de registru necesare sau fiÈierele dll de mesaje sÄ afiÈeze mesaje de la un calculator din reÈea.\n\nThe following information is part of the event:\n\n" + IDS_EVENTSTRINGIDNOTFOUND "Nu se poate gÄsi descrierea evenimentului cu ID-ul ( %lu ) Ã®n sursa ( %s ). Este posibil ca Ã®n calculatorul local sÄ nu existe informaÈiile de registru necesare sau fiÈierele dll de mesaje sÄ afiÈeze mesaje de la un calculator din reÈea.\n\nInformaÈii aferente evenimentului:\n\n" IDS_EVENTLOG_ERROR_TYPE "Eroare" IDS_EVENTLOG_WARNING_TYPE "Avertisment" IDS_EVENTLOG_INFORMATION_TYPE "InformaÈie" Added: trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -0,0 +1,97 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + MSG_COPYRIGHT "Telnet Win32 v2.1b2, Drept de autor (C) 2000 Paul Brannan <pbranna(a)clemson.edu>\nÈi echipa. Acest program nu are ataÈatÄ ABSOLUT NICI O GARANÈIE; pentru detalii\ncitiÈi LICENSE.TXT. " + MSG_COPYRIGHT_1 "Acesta este un program gratuit, aveÈi libertatea de a-l re-\ndistribui sub anumite condiÈii.\n\n" + MSG_USAGE "Utilizare: TELNET [parametri] [gazdÄ [port]]\n\n parametri\n -d:FIÈIER.EXT Scrie toate datele recepÈionate Ã®n Â«FIÈIER.EXTÂ».\n gazdÄ Numele gazdei sau adresa IP a gazdei aflate la distanÈÄ.\n" + MSG_USAGE_1 " port Portul de serviciu (implicit pentru telnet este portul 23).\n\n" + MSG_HELP "Comenzile pot fi abreviate. Acestea sunt:\n \ncl[ose] Ãnchide conexiunea curentÄ.\nop[en] ConecteazÄ la un sit.\nq[uit] IeÈire din telnet.\n" + MSG_HELP_1 "ke[ys] AfiÈeazÄ/altereazÄ configuraÈii de taste.\nse[t] AfiÈeazÄ/altereazÄ opÈiunile de configurare.\nz SuspendÄ.\n? h[elp] AfiÈeazÄ informaÈiile de utilizare.\n" + MSG_INVCMD "ComandÄ nevalidÄ. TastaÈi ? pentru informaÈii.\n" + MSG_ERROR "%1 a eÈuat.\n" + MSG_INFO "%1\n" + MSG_WARNING "%1\n" + MSG_TRYING "Se Ã®ncearcÄ %1.%2.%3.%4:%5...\n" + MSG_CONNECTED "Conectat la %1. Pentru ieÈire apÄsaÈi ALT-%2.\n" + MSG_TERMBYREM "Conexiune Ã®ncheiatÄ.\n" + MSG_KEYMAP "Se Ã®ncarcÄ %1 de la %2.\n" + MSG_ERRKEYMAP "EÈec la Ã®ncÄrcarea configuraÈiei de taste.\n" + MSG_DUMPFILE "Se scriu Ã®n fiÈierul %1 informaÈii de ieÈire.\n" + MSG_CONFIG "Se Ã®ncarcÄ din %1 opÈiunile de configurare.\n" + MSG_NOINI "Eroare la Ã®ncÄrcarea fiÈierului de configurare %1.\nSe Ã®ncarcÄ opÈiunile implicite.\n" + MSG_BADVAL "Avertisment: variabila %1 nu este validÄ.\n" + MSG_NOSPAWN "Nu se reuÈeÈte lansarea procesului.\n" + MSG_RESOLVING "Se cautÄ gazda: %1..." + MSG_NOSERVICE "Nu se poate gÄsi serviciul TCP %1.\n" + MSG_SIZEALIAS "Avertisment: dimensiunea de alias %1 este prea mare, se ignorÄ.\n" + MSG_ERRPIPE "Eroare: nu se reuÈeÈte lansarea procesului pentru conexiune.\n" + MSG_BADUSAGE "Eroare: utilizare nevalidÄ a comenzii.\n" + MSG_ALREADYCONNECTED "Conexiunea la %1 a fost deja stabilitÄ.\n" + MSG_WSAEINTR "Apel de funcÈie Ã®ntrerupt.\n" + MSG_WSAEBADF "WSAEBADF\n" + MSG_WSAEACCESS "Acces respins.\n" + MSG_WSAEDEFAULT "WSAEDEFAULT\n" + MSG_WSAEINVAL "Argument nevalid.\n" + MSG_WSAEMFILE "Prea multe fiÈiere deschise.\n" + MSG_WSAEWOULDBLOCK "Resursa nu este momentan disponibilÄ.\n" + MSG_WSAEINPROGRESS "OperaÈia este Ã®n curs de execuÈie.\n" + MSG_WSAEALREADY "OperaÈia este deja Ã®n curs de execuÈie.\n" + MSG_WSAENOTSOCK "OperaÈia de soclu nu poate fi aplicatÄ pe non-soclu.\n" + MSG_WSAEDESTADDRREQ "Este necesarÄ adresa de destinaÈie.\n" + MSG_WSAEMSGSIZE "Mesajul este prea lung.\n" + MSG_WSAEPROTOTYPE "Protocolul este nepotrivit pentru soclu.\n" + MSG_WSAENOPROTOOPT "OpÈiunea de protocol nu este validÄ.\n" + MSG_WSAEPROTONOTSUPPORT "Protocolul nu este recunoscut.\n" + MSG_WSAESOCKNOTSUPPORT "Tipul de soclu nu este recunoscut.\n" + MSG_WSAEOPNOTSUPP "OperaÈia nu este recunoscutÄ.\n" + MSG_WSAEPFNOTSUPPORT "Familia de protocoale nu este cunoscutÄ.\n" + MSG_WSAEAFNOTSUPPORT "Familia de adrese nu este cunoscutÄ de familia de protocoale.\n" + MSG_WSAEADDRINUSE "Adresa este deja Ã®n uz.\n" + MSG_WSAEADDRNOTAVAIL "Nu se poate atribui adresa solicitatÄ.\n" + MSG_WSAENETDOWN "ReÈeaua este scoasÄ din funcÈiune.\n" + MSG_WSAENETUNREACH "ReÈeaua nu poate fi accesatÄ.\n" + MSG_WSAENETRESET "Conexiunea de reÈea a cÄzut la Ã®ntrerupere.\n" + MSG_WSAECONNABORTED "Conexiunea a fost Ã®ntreruptÄ de program.\n" + MSG_WSAECONNRESET "Conexiunea a fost Ã®ntreruptÄ de partener.\n" + MSG_WSAENOBUFS "Nu existÄ memorie intermediarÄ disponibilÄ.\n" + MSG_WSAEISCONN "Soclul este deja Ã®n conexiune.\n" + MSG_WSAENOTCONN "Soclul nu este Ã®n conexiune.\n" + MSG_WSAESHUTDOWN "Nu se poate transmite dupÄ Ã®nchiderea soclului.\n" + MSG_WSAETOOMANYREFS "WSAETOOMANYREFS\n" + MSG_WSAETIMEDOUT "Conexiunea a expirat.\n" + MSG_WSAECONNREFUSED "Conexiunea este refuzatÄ.\n" + MSG_WSAELOOP "WSAELOOP\n" + MSG_WSAENAMETOOLONG "Numele este prea lung.\n" + MSG_WSAEHOSTDOWN "Gazda nu este disponibilÄ.\n" + MSG_WSAEHOSTUNREACH "Nu existÄ canale disponibile cÄtre gazdÄ.\n" + MSG_WSAESYSNOTREADY "Subsistemul de reÈea nu este disponibil.\n" + MSG_WSAVERNOTSUPPORTED "Versiunea pentru WINSOCK.DLL nu este compatibilÄ.\n" + MSG_WSANOTINITIALISED "IniÈializarea cu succes Ã®ncÄ nu a avut loc.\n" + MSG_WSAHOST_NOT_FOUND "Gazda nu a fost gÄsitÄ.\n" + MSG_WSATRY_AGAIN "Gazda ne-autoritatÄ nu a fost gÄsitÄ.\n" + MSG_WSANO_RECOVERY "Eroare, stare nerecuperabilÄ.\n" + MSG_WSANO_DATA "Numeele este valid, nu existÄ date de tipul solicitat.\n" + MSG_KEYNOVAL "[GLOBAL]: Nu existÄ valoare pentru %1.\n" + MSG_KEYBADVAL "[GLOBAL]: Valoarea pentru %1 este eronatÄ.\n" + MSG_KEYBADSTRUCT "%1: StructurÄ eronatÄ.\n" + MSG_KEYBADCHARS "%1: Caractere eronate? %1 -> %3.\n" + MSG_KEYUNEXPLINE "RÃ¢nd neprevÄzut Â«%1Â».\n" + MSG_KEYUNEXPEOF "SfÃ¢rÈit neprevÄzut de fiÈier.\n" + MSG_KEYUNEXPTOK "Simbol neprevÄzut %1.\n" + MSG_KEYUNEXPTOKIN "Simbol neprevÄzut la %1.\n" + MSG_KEYUNEXP "SfÃ¢rÈit neprevÄzut de fiÈier sau simbol.\n" + MSG_KEYNOGLOBAL "Nu existÄ definiÈie pentru [GLOBAL]!\n" + MSG_KEYNOCONFIG "Nu existÄ [CONFIG %1].\n" + MSG_KEYUSECONFIG "Utilizare configuraÈie: %1.\n" + MSG_KEYNOSWKEY "Nu existÄ tastÄ de comutare pentru Â«%1Â».\n" + MSG_KEYCANNOTDEF "Se ignorÄ, nu se definesc taste de comutare Ã®n configuraÈia implicitÄ.\n" + MSG_KEYDUPSWKEY "Duplicare tastÄ de comutare.\n" + MSG_KEYUNKNOWNMAP "%1 este o configuraÈie de taste necunoscutÄ.\n" + MSG_KEYNOCHARMAPS "Nu au fost Ã®ncÄrcate configuraÈii de caractere.\n" + MSG_KEYNOKEYMAPS "Nu au fost Ã®ncÄrcate configuraÈii de taste.\n" + MSG_KEYNUMMAPS "Ãn total existÄ %1 configuraÈii.\n" + MSG_KEYBADMAP "NumÄr de configuraÈie de taste nevalid, Ã®ncercaÈi Â«keys displayÂ»\n" + MSG_KEYMAPSWITCHED "ConfiguraÈia de taste a fost comutatÄ.\n" +END Propchange: trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/telnet/telnet.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -16,6 +16,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -553,7 +553,7 @@ STRING_REPLACE_ERROR2 "Calea nu este gÄsitÄ - %s\n" STRING_REPLACE_ERROR3 "Numele fiÈierului, directorului sau eticheta volumului este incorectÄ.\n" STRING_REPLACE_ERROR4 "CombinaÈia de argumente nu este validÄ!\n" - STRING_REPLACE_ERROR5 "Acces nepermis - %s\n" + STRING_REPLACE_ERROR5 "Acces respins - %s\n" STRING_REPLACE_ERROR6 "FiÈierele nu au fost gÄsite - %s\n" STRING_REPLACE_ERROR7 "Eroare ExtinsÄ 32\n" STRING_CMD_INFOLINE " Interpretorul de comenzi ReactOS TastaÈi HELP = Ajutor " Modified: trunk/reactos/base/system/subst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ro-… ============================================================================== --- trunk/reactos/base/system/subst/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -7,8 +7,8 @@ IDS_INCORRECT_PARAMETER_COUNT "NumÄr eronat de parametri - %s\n" IDS_INVALID_PARAMETER "NumÄr eronat de parametri - %s\n" IDS_INVALID_PARAMETER2 "Parametru eronat - %s\n" - IDS_PATH_NOT_FOUND "Path not found - %s\n" - IDS_ACCESS_DENIED "Access denied - %s\n" + IDS_PATH_NOT_FOUND "Cale inexistentÄ - %s\n" + IDS_ACCESS_DENIED "Acces respins - %s\n" IDS_DRIVE_ALREADY_SUBSTED "Unitatea este deja SUBSTituitÄ\n" IDS_FAILED_WITH_ERRORCODE "OperaÈia a eÈuat. Codul de eroare 0x%x: %s\n" IDS_USAGE "Substituie un director cu o unitate de stocare.\n\n\ Modified: trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -83,44 +83,44 @@ IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53, 7, 240, 20 - AUTORADIOBUTTON "Typical Settings", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Custom Settings", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Creates network connetions using the Client for ReactOS Networks, File and Print Sharing for ReactOS Networks, and the TCP/IP transport protocol with automatic addressing.", IDC_STATIC, 65, 45, 240, 30 - LTEXT "Allows you to manually configure network components.", IDC_STATIC, 65, 90, 243, 20 + LTEXT "AlegeÈi o configuraÈie tipicÄ sau una particularizatÄ:", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "ConfiguraÈie tipicÄ", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ConfiguraÈie particularizatÄ", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "CreazÄ conexiuni de reÈea utilizÃ¢nd Clientela de reÈele ReactOS, Partajarea de fiÈiere Èi imprimante pentru reÈele ReactOS, Èi (protocolul) TCP/IP pentru adresare automatÄ.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "Permite configurarea manualÄ a componentelor de reÈea.", IDC_STATIC, 65, 90, 243, 20 END IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20 - LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20 - LTEXT "Components checked are used by this connection:", IDC_STATIC, 33, 12, 253, 20 + LTEXT "Pentru dispozitiv:", IDC_STATIC, 33, 2, 160, 20 + LTEXT "nespecificat", IDC_NETWORK_DEVICE, 135, 2, 253, 20 + LTEXT "AceastÄ conexiune utilizeazÄ urmÄtoarele componente bifate:", IDC_STATIC, 33, 12, 253, 20 CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 - PUSHBUTTON "&Install...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP - GROUPBOX "Description", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX + PUSHBUTTON "&Instalareâ¦", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&DezinstaleazÄ", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&ProprietÄÈi", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + GROUPBOX "Descriere", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX END IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want this computer to be a member of a domain?\n\ -(You can obtain this information from your network administator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP - LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 + LTEXT "DoriÈi ca acest calculator sÄ fie membru al unui domeniu?\n\ +(PuteÈi afla aceastÄ informaÈie de la administratorul de reÈea.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Nu, acest calculator va fi parte a unui grup de lucru.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Da, acest calculator va fi parte a unui domeniu.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "Grup de Lucru sau Nume de Domeniu:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: If this computer isn't going to be part of a network, you don't have sufficient rights to join a domain, or you don't know what to enter, then just choose workgroup for now. These options can be changed at a later time.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "NOTÄ: DacÄ acest calculator nu va fi parte a unei reÈele, nu sunt disponibile privelegiile necesare apartenenÈei la un domeniu, sau nu cunoaÈteÈi ce sÄ specificaÈi, lÄsaÈi valoarea implicitÄ. VeÈi putea modifica aceastÄ opÈiune mai tÃ¢rziu.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -170,12 +170,12 @@ STRINGTABLE BEGIN - IDS_NETWORKSETTINGSTITLE "Network Settings" - IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." - IDS_NETWORKCOMPONENTTITLE "Network Components" - IDS_NETWORKCOMPONENTSUBTITLE "Determine which networking components are used on your computer. To add new components, click on Install." - IDS_NETWORKDOMAINTITLE "Workgroup or Computer Domain" - IDS_NETWORKDOMAINSUBTITLE "A domain is a group of computers defined by a network administator. A workgroup is a group of computers sharing the same workgroup name." - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_WZD_DOMAIN_NAME "Setup cannot continue until you\nenter the name of your domain\nor workgroup." + IDS_NETWORKSETTINGSTITLE "ConfiguraÈie de reÈea" + IDS_NETWORKSETTINGSSUBTITLE "Instalare Èi configurare reÈea pentru conectarea la alte reÈele, calculatoare Èi Internet." + IDS_NETWORKCOMPONENTTITLE "Componente de reÈea" + IDS_NETWORKCOMPONENTSUBTITLE "Determinare componente de reÈea necesare calculatorului. Pentru adÄugare de noi componente, apÄsaÈi âInstalareâ." + IDS_NETWORKDOMAINTITLE "Grup de lucru sau domeniu de calculator" + IDS_NETWORKDOMAINSUBTITLE "Un domeniu sau un grup de calculatoare definit de administratorul de reÈea. Un grup de lucru este un grup de calculatoare avÃ¢nd acelaÈi nume de grup." + IDS_REACTOS_SETUP "Asistent de instalare ReactOS" + IDS_WZD_DOMAIN_NAME "Asistentul nu poate continua pÃ¢nÄ\nnu veÈi introduce un nume de domeniu\nsau grup de lucru." END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -684,7 +684,7 @@ IDS_RENAME "Rede&numeÈte" IDS_PASTE "&LipeÈte" - IDS_CREATEFOLDER_DENIED "Nu s-a putut crea dosar nou: Eroare de permisiune." + IDS_CREATEFOLDER_DENIED "Nu s-a putut crea dosar nou: Acces respins." IDS_CREATEFOLDER_CAPTION "Eroare la crearea unui nou dosar" IDS_DELETEITEM_CAPTION "Confirmarea Ètergerii fiÈierului" IDS_DELETEFOLDER_CAPTION "Confirmarea Ètergerii dosarului" Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -1163,6 +1163,9 @@ COMMUNICATIONS=CommunicaÈii GAMES=Jocuri +README_TITLE=De citit +README_DESC=FiÈier de informare ReactOS + CMD_TITLE=Linie de comandÄ CMD_DESC=Mediu textual cu operaÈii lansate de la linia de comandÄ. EXPLORER_TITLE=Explorator ReactOS

1 0

[tfaber] 71773: [KMTESTS] - Addendum to r71770 CORE-11509
by tfaber＠svn.reactos.org 03 Jul '16

03 Jul '16

Author: tfaber Date: Sun Jul 3 09:23:37 2016 New Revision: 71773 URL: http://svn.reactos.org/svn/reactos?rev=71773&view=rev Log: [KMTESTS] - Addendum to r71770 CORE-11509 Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun Jul 3 09:23:37 2016 @@ -54,6 +54,7 @@ KMT_TESTFUNC Test_NpfsVolumeInfo; KMT_TESTFUNC Test_ObHandle; KMT_TESTFUNC Test_ObReference; +KMT_TESTFUNC Test_ObSymbolicLink; KMT_TESTFUNC Test_ObType; KMT_TESTFUNC Test_ObTypeClean; KMT_TESTFUNC Test_ObTypeNoClean; @@ -122,6 +123,7 @@ { "NpfsVolumeInfo", Test_NpfsVolumeInfo }, { "ObHandle", Test_ObHandle }, { "ObReference", Test_ObReference }, + { "ObSymbolicLink", Test_ObSymbolicLink }, { "ObType", Test_ObType }, { "-ObTypeClean", Test_ObTypeClean }, { "-ObTypeNoClean", Test_ObTypeNoClean },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs