Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[ekohl] 73996: [USETUP] Define the language specific keyboard layout first. The US keyboard layout should always be the last one (aka fallback). Other languages will probably need the same fix! COR...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 27 12:57:05 2017 New Revision: 73996 URL: http://svn.reactos.org/svn/reactos?rev=73996&view=rev Log: [USETUP] Define the language specific keyboard layout first. The US keyboard layout should always be the last one (aka fallback). Other languages will probably need the same fix! CORE-10064 #resolve Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Mon Feb 27 12:57:05 2017 @@ -2,8 +2,8 @@ MUI_LAYOUTS ruRULayouts[] = { + { L"0419", L"00000419" }, { L"0409", L"00000409" }, - { L"0419", L"00000419" }, { NULL, NULL } };

7 years, 10 months

[gadamopoulos] 73995: [COMCTL32_APITEST]: Add one more test for BCM_GETIDEALSIZE, it is as if it completely ignores BS_BITMAP.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 27 11:06:45 2017 New Revision: 73995 URL: http://svn.reactos.org/svn/reactos?rev=73995&view=rev Log: [COMCTL32_APITEST]: Add one more test for BCM_GETIDEALSIZE, it is as if it completely ignores BS_BITMAP. Modified: trunk/rostests/apitests/comctl32/button.c Modified: trunk/rostests/apitests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.… ============================================================================== --- trunk/rostests/apitests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/button.c [iso-8859-1] Mon Feb 27 11:06:45 2017 @@ -122,6 +122,9 @@ DestroyWindow(hwnd1); + + + hwnd1 = CreateWindowW(L"Button", L"", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -166,6 +169,28 @@ DestroyWindow(hwnd1); + + + + hwnd1 = CreateWindowW(L"Button", L" ", BS_BITMAP , 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + SendMessageW(hwnd1, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + + /* In xp and 2k3 the image is ignored, in vista+ its width is added to the text width */ + ok_size(s, textent.cx + 2 * wi.cxWindowBorders - 1 + 2, + textent.cy + 2 * wi.cyWindowBorders + 1 + 2); /* the last +2 is the text margin */ + + DestroyWindow(hwnd1); + + + + hwnd1 = CreateWindowW(L"Button", L" ", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -218,6 +243,9 @@ textent.cy + 2 * wi.cyWindowBorders + 1); DestroyWindow(hwnd1); + + + /* Test again with some real text to see if the formula is correct */ hwnd1 = CreateWindowW(L"Button", L"Some test text", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL);

7 years, 10 months

[gadamopoulos] 73994: [COMCTL32_APITEST]: -Add tests for BCM_GETIDEALSIZE for non themed v6 buttons.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 27 10:53:59 2017 New Revision: 73994 URL: http://svn.reactos.org/svn/reactos?rev=73994&view=rev Log: [COMCTL32_APITEST]: -Add tests for BCM_GETIDEALSIZE for non themed v6 buttons. Added: trunk/rostests/apitests/comctl32/test.bmp (with props) Modified: trunk/rostests/apitests/comctl32/CMakeLists.txt trunk/rostests/apitests/comctl32/button.c trunk/rostests/apitests/comctl32/comctl32_apitest.rc Modified: trunk/rostests/apitests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/CMakeLists.txt [iso-8859-1] Mon Feb 27 10:53:59 2017 @@ -2,5 +2,5 @@ add_executable(comctl32_apitest button.c testlist.c comctl32_apitest.rc) target_link_libraries(comctl32_apitest wine) set_module_type(comctl32_apitest win32cui) -add_importlibs(comctl32_apitest user32 msvcrt kernel32 ntdll) +add_importlibs(comctl32_apitest uxtheme comctl32 user32 gdi32 msvcrt kernel32 ntdll) add_rostests_file(TARGET comctl32_apitest) Modified: trunk/rostests/apitests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.… ============================================================================== --- trunk/rostests/apitests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/button.c [iso-8859-1] Mon Feb 27 10:53:59 2017 @@ -8,8 +8,10 @@ #include "wine/test.h" #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #define ok_rect(rc, l,r,t,b) ok((rc.left == (l)) && (rc.right == (r)) && (rc.top == (t)) && (rc.bottom == (b)), "Wrong rect. expected %d, %d, %d, %d got %ld, %ld, %ld, %ld\n", l,t,r,b, rc.left, rc.top, rc.right, rc.bottom) +#define ok_size(s, width, height) ok((s.cx == (width) && s.cy == (height)), "Expected size (%lu,%lu) got (%lu,%lu)\n", width, height, s.cx, s.cy) void Test_TextMargin() { @@ -72,7 +74,7 @@ imlData.himl = (HIMAGELIST)0xdead; ret = SendMessageW(hwnd1, BCM_SETIMAGELIST, 0, (LPARAM)&imlData); - ok (ret == TRUE, "Expected BCM_SETIMAGELIST to fail\n"); /* This works in win10 */ + ok (ret == TRUE, "Expected BCM_SETIMAGELIST to fail\n"); ret = SendMessageW(hwnd1, BCM_GETIMAGELIST, 0, (LPARAM)&imlData); ok (ret == TRUE, "Expected BCM_GETIMAGELIST to succeed\n"); @@ -83,6 +85,157 @@ imlData.himl = 0; ret = SendMessageW(hwnd1, BCM_SETIMAGELIST, 0, (LPARAM)&imlData); ok (ret == FALSE, "Expected BCM_SETIMAGELIST to fail\n"); /* This works in win10 */ + + DestroyWindow(hwnd1); +} + +void Test_GetIdealSizeNoThemes() +{ + HWND hwnd1; + BOOL ret; + SIZE s, textent; + HFONT font; + HDC hdc; + WINDOWINFO wi; + HANDLE hbmp; + HIMAGELIST himl; + BUTTON_IMAGELIST imlData; + RECT rc; + + hwnd1 = CreateWindowW(L"Button", L" ", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + font = (HFONT)SendMessageW(hwnd1, WM_GETFONT, 0, 0); + hdc = GetDC(hwnd1); + SelectObject(hdc, font); + GetTextExtentPoint32W(hdc, L" ", 1, &textent); + + memset(&wi, 0, sizeof(wi)); + GetWindowInfo(hwnd1, &wi); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 2 * wi.cxWindowBorders - 1 + 2, + textent.cy + 2 * wi.cyWindowBorders + 1 + 2); /* the last +2 is the text margin */ + + DestroyWindow(hwnd1); + + hwnd1 = CreateWindowW(L"Button", L"", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok (s.cx > 80, "Expected big cx\n"); + ok (s.cy > 80, "Expected big cy\n"); + + s.cx = 1; + s.cy = 1; + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok (s.cx > 80, "Expected big cx\n"); + ok (s.cy > 80, "Expected big cy\n"); + + hbmp = LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(5), IMAGE_BITMAP, 0, 0, 0); + ok (hbmp != 0, "Expected LoadImage to succeed\n"); + + SendMessageW(hwnd1, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok (s.cx > 80, "Expected big cx\n"); + ok (s.cy > 80, "Expected big cy\n"); + + himl = ImageList_LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(5), 1, 1, 0, IMAGE_BITMAP, 0); + ok (himl != 0, "Expected ImageList_LoadImage to succeed\n"); + + memset(&imlData, 0, sizeof(imlData)); + imlData.himl = himl; + ret = SendMessageW(hwnd1, BCM_SETIMAGELIST, 0, (LPARAM)&imlData); + ok (ret == TRUE, "Expected BCM_SETIMAGELIST to fail\n"); /* This works in win10 */ + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok (s.cx > 80, "Expected big cx\n"); + ok (s.cy > 80, "Expected big cy\n"); + + DestroyWindow(hwnd1); + + hwnd1 = CreateWindowW(L"Button", L" ", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + SetRect(&rc, 0,0,0,0); + ret = SendMessageW(hwnd1, BCM_SETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_SETTEXTMARGIN to succeed\n"); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 2 * wi.cxWindowBorders - 1, + textent.cy + 2 * wi.cyWindowBorders + 1); + + SetRect(&rc, 50,50,50,50); + ret = SendMessageW(hwnd1, BCM_SETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_SETTEXTMARGIN to succeed\n"); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 2 * wi.cxWindowBorders - 1 + 100, + textent.cy + 2 * wi.cyWindowBorders + 1 + 100); + + SetRect(&rc, 0,0,0,0); + ret = SendMessageW(hwnd1, BCM_SETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_SETTEXTMARGIN to succeed\n"); + + ret = SendMessageW(hwnd1, BCM_SETIMAGELIST, 0, (LPARAM)&imlData); + ok (ret == TRUE, "Expected BCM_SETIMAGELIST to fail\n"); /* This works in win10 */ + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 2 * wi.cxWindowBorders, /* we get an extra pixel due to the iml */ + textent.cy + 2 * wi.cyWindowBorders + 1); + + s.cx = 1; + s.cy = 1; + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 2 * wi.cxWindowBorders, + textent.cy + 2 * wi.cyWindowBorders + 1); + + s.cx = 100; + s.cy = 100; + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 2 * wi.cxWindowBorders, + textent.cy + 2 * wi.cyWindowBorders + 1); + + DestroyWindow(hwnd1); + + /* Test again with some real text to see if the formula is correct */ + hwnd1 = CreateWindowW(L"Button", L"Some test text", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + font = (HFONT)SendMessageW(hwnd1, WM_GETFONT, 0, 0); + hdc = GetDC(hwnd1); + SelectObject(hdc, font); + GetTextExtentPoint32W(hdc, L"Some test text", 14, &textent); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 2 * wi.cxWindowBorders - 1 + 2, /* the last +2 is the text margin */ + textent.cy + 2 * wi.cyWindowBorders + 1 + 2); + + DestroyWindow(hwnd1); } START_TEST(button) @@ -90,5 +243,6 @@ LoadLibraryW(L"comctl32.dll"); /* same as statically linking to comctl32 and doing InitCommonControls */ Test_TextMargin(); Test_Imagelist(); -} - + Test_GetIdealSizeNoThemes(); +} + Modified: trunk/rostests/apitests/comctl32/comctl32_apitest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/comctl3… ============================================================================== --- trunk/rostests/apitests/comctl32/comctl32_apitest.rc [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/comctl32_apitest.rc [iso-8859-1] Mon Feb 27 10:53:59 2017 @@ -5,3 +5,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include <reactos/manifest_exe.rc> + +5 BITMAP "test.bmp" Added: trunk/rostests/apitests/comctl32/test.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/test.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/comctl32/test.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

7 years, 10 months

[ekohl] 73993: [RAPPS_NEW][USRMGR] Missing italian translations in ReactOS. CORE-9725 #resolve #comment Thanks a lot for making this mess! Please don't ever reopen this task again! Create a new one...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 27 09:45:24 2017 New Revision: 73993 URL: http://svn.reactos.org/svn/reactos?rev=73993&view=rev Log: [RAPPS_NEW][USRMGR] Missing italian translations in ReactOS. CORE-9725 #resolve #comment Thanks a lot for making this mess! Please don't ever reopen this task again! Create a new one instead! Modified: trunk/reactos/base/applications/rapps_new/lang/it-IT.rc trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc Modified: trunk/reactos/base/applications/rapps_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] Mon Feb 27 09:45:24 2017 @@ -202,6 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita." IDS_INTEG_CHECK_TITLE "Verifica integrità pacchetto..." IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrità, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non è raccomandata." - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." -END + IDS_INTERRUPTED_DOWNLOAD "Lo scaricamento è stato interrotto. Verificare la connessione a Internet." + IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito." +END Modified: trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc [iso-8859-1] Mon Feb 27 09:45:24 2017 @@ -12,7 +12,7 @@ PUSHBUTTON "N&uovo...", IDC_USERS_ADD, 87, 98, 50, 14 PUSHBUTTON "&Rimuovi", IDC_USERS_REMOVE, 141, 98, 50, 14 PUSHBUTTON "Pr&oprietÃ ", IDC_USERS_PROPERTIES, 195, 98, 50, 14 - AUTOCHECKBOX "Richiesta la passwod all'avvio del sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + AUTOCHECKBOX "Richiesta la password all'avvio del sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED PUSHBUTTON "Resetta Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED END @@ -81,7 +81,7 @@ EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 78, 81, 160, 13, ES_AUTOHSCROLL COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "to:", -1, 112, 101, 12, 8 + LTEXT "a:", -1, 112, 101, 12, 8 EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 130, 99, 108, 13, ES_AUTOHSCROLL END @@ -110,7 +110,7 @@ EDITTEXT IDC_EDIT_PASSWORD2, 107, 25, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD RTEXT "Ripeti Password:", -1, 7, 28, 96, 8 DEFPUSHBUTTON "OK", IDOK, 156, 53, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 210, 53, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 210, 53, 50, 14 END IDD_USER_NEW DIALOGEX 0, 0, 267, 200 @@ -133,7 +133,7 @@ AUTOCHECKBOX "Password mai richiesta", IDC_USER_NEW_NEVER_EXPIRES, 7, 137, 200, 10, WS_DISABLED AUTOCHECKBOX "Account Ã¨ disabilitato", IDC_USER_NEW_DISABLED, 7, 151, 200, 10 DEFPUSHBUTTON "OK", IDOK, 156, 179, 50, 14, WS_DISABLED - PUSHBUTTON "Cancella", IDCANCEL, 210, 179, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 210, 179, 50, 14 END IDD_GROUP_NEW DIALOGEX 0, 0, 267, 74 @@ -146,7 +146,7 @@ EDITTEXT IDC_GROUP_NEW_DESCRIPTION, 107, 25, 153, 14, ES_AUTOHSCROLL RTEXT "Descrizione:", -1, 7, 28, 96, 8 DEFPUSHBUTTON "OK", IDOK, 156, 53, 50, 14, WS_DISABLED - PUSHBUTTON "Cancella", IDCANCEL, 210, 53, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 210, 53, 50, 14 END IDD_USER_ADD_MEMBERSHIP DIALOGEX 0, 0, 252, 223 @@ -158,7 +158,7 @@ CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE DEFPUSHBUTTON "OK", IDOK, 141, 197, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 195, 197, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 195, 197, 50, 14 END /* Menus */ @@ -173,7 +173,7 @@ BEGIN MENUITEM "Nuovo membro", IDM_GROUP_ADD_MEMBER, GRAYED MENUITEM SEPARATOR - MENUITEM "Cancella", IDM_GROUP_DELETE + MENUITEM "Elimina", IDM_GROUP_DELETE MENUITEM "Rinomina", IDM_GROUP_RENAME MENUITEM SEPARATOR MENUITEM "ProprietÃ ", IDM_GROUP_PROPERTIES @@ -190,7 +190,7 @@ BEGIN MENUITEM "Cambia Password", IDM_USER_CHANGE_PASSWORD MENUITEM SEPARATOR - MENUITEM "Cancella", IDM_USER_DELETE + MENUITEM "Elimina", IDM_USER_DELETE MENUITEM "Rinomina", IDM_USER_RENAME MENUITEM SEPARATOR MENUITEM "ProprietÃ ", IDM_USER_PROPERTIES @@ -201,13 +201,13 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Utenti:" - IDS_CPLDESCRIPTION "Gestisci utenti e gruppi." + IDS_CPLNAME "Account utente" + IDS_CPLDESCRIPTION "Gestione utenti e gruppi." END STRINGTABLE BEGIN IDS_NAME "Nome" - IDS_FULLNAME "Pieno nome" + IDS_FULLNAME "Nome completo" IDS_DESCRIPTION "Descrizione" END

7 years, 10 months

[akhaldi] 73992: [UXTHEME_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:49:49 2017 New Revision: 73992 URL: http://svn.reactos.org/svn/reactos?rev=73992&view=rev Log: [UXTHEME_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/uxtheme/CMakeLists.txt trunk/rostests/winetests/uxtheme/system.c trunk/rostests/winetests/uxtheme/testlist.c Modified: trunk/rostests/winetests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/CMakeLi… ============================================================================== --- trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] Sun Feb 26 20:49:49 2017 @@ -1,5 +1,5 @@ add_executable(uxtheme_winetest system.c testlist.c) set_module_type(uxtheme_winetest win32cui) -add_importlibs(uxtheme_winetest uxtheme user32 msvcrt kernel32) +add_importlibs(uxtheme_winetest user32 gdi32 uxtheme msvcrt kernel32) add_rostests_file(TARGET uxtheme_winetest) Modified: trunk/rostests/winetests/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/system.… ============================================================================== --- trunk/rostests/winetests/uxtheme/system.c [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/system.c [iso-8859-1] Sun Feb 26 20:49:49 2017 @@ -27,13 +27,30 @@ #include "wine/test.h" static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); - -#define UXTHEME_GET_PROC(func) p ## func = (void*)GetProcAddress(hUxtheme, #func); +static HPAINTBUFFER (WINAPI *pBeginBufferedPaint)(HDC, const RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *); +static HRESULT (WINAPI *pBufferedPaintClear)(HPAINTBUFFER, const RECT *); +static HRESULT (WINAPI *pEndBufferedPaint)(HPAINTBUFFER, BOOL); +static HRESULT (WINAPI *pGetBufferedPaintBits)(HPAINTBUFFER, RGBQUAD **, int *); +static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); +static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); +static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static void init_funcs(void) { HMODULE hUxtheme = GetModuleHandleA("uxtheme.dll"); - UXTHEME_GET_PROC(OpenThemeDataEx) + +#define UXTHEME_GET_PROC(func) p ## func = (void*)GetProcAddress(hUxtheme, #func) + UXTHEME_GET_PROC(BeginBufferedPaint); + UXTHEME_GET_PROC(BufferedPaintClear); + UXTHEME_GET_PROC(EndBufferedPaint); + UXTHEME_GET_PROC(GetBufferedPaintBits); + UXTHEME_GET_PROC(GetBufferedPaintDC); + UXTHEME_GET_PROC(GetBufferedPaintTargetDC); + UXTHEME_GET_PROC(GetBufferedPaintTargetRect); + UXTHEME_GET_PROC(BufferedPaintClear); + + UXTHEME_GET_PROC(OpenThemeDataEx); +#undef UXTHEME_GET_PROC } static void test_IsThemed(void) @@ -180,6 +197,10 @@ ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", GetLastError()); + + /* Close invalid handle */ + hRes = CloseThemeData((HTHEME)0xdeadbeef); + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); if (!bThemeActive) { @@ -506,6 +527,178 @@ ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } +static void test_buffered_paint(void) +{ + BP_PAINTPARAMS params = { 0 }; + BP_BUFFERFORMAT format; + HDC target, src, hdc; + HPAINTBUFFER buffer; + RECT rect, rect2; + RGBQUAD *bits; + HRESULT hr; + int row; + + if (!pBeginBufferedPaint) + { + win_skip("Buffered painting API is not supported.\n"); + return; + } + + buffer = pBeginBufferedPaint(NULL, NULL, BPBF_COMPATIBLEBITMAP, + NULL, NULL); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + target = CreateCompatibleDC(0); + buffer = pBeginBufferedPaint(target, NULL, BPBF_COMPATIBLEBITMAP, + NULL, NULL); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + params.cbSize = sizeof(params); + buffer = pBeginBufferedPaint(target, NULL, BPBF_COMPATIBLEBITMAP, + &params, NULL); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(target, NULL, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + /* target rect is mandatory */ + SetRectEmpty(&rect); + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + /* inverted rectangle */ + SetRect(&rect, 10, 0, 5, 5); + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + SetRect(&rect, 0, 10, 5, 0); + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + /* valid rectangle, no target dc */ + SetRect(&rect, 0, 0, 5, 5); + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(NULL, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + SetRect(&rect, 0, 0, 5, 5); + src = NULL; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer != NULL, "Unexpected buffer %p\n", buffer); + ok(src != NULL, "Expected buffered dc\n"); + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + + SetRect(&rect, 0, 0, 5, 5); + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer != NULL, "Unexpected buffer %p\n", buffer); + + /* clearing */ + hr = pBufferedPaintClear(NULL, NULL); +todo_wine + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + + hr = pBufferedPaintClear(buffer, NULL); +todo_wine + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + + /* access buffer attributes */ + hdc = pGetBufferedPaintDC(buffer); + ok(hdc == src, "Unexpected hdc, %p, buffered dc %p\n", hdc, src); + + hdc = pGetBufferedPaintTargetDC(buffer); + ok(hdc == target, "Unexpected target hdc %p, original %p\n", hdc, target); + + hr = pGetBufferedPaintTargetRect(NULL, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintTargetRect(buffer, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintTargetRect(NULL, &rect2); + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + + SetRectEmpty(&rect2); + hr = pGetBufferedPaintTargetRect(buffer, &rect2); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + ok(EqualRect(&rect, &rect2), "Wrong target rect\n"); + + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + + /* invalid buffer handle */ + hr = pEndBufferedPaint(NULL, FALSE); + ok(hr == E_INVALIDARG, "Unexpected return code %#x\n", hr); + + hdc = pGetBufferedPaintDC(NULL); + ok(hdc == NULL, "Unexpected hdc %p\n", hdc); + + hdc = pGetBufferedPaintTargetDC(NULL); + ok(hdc == NULL, "Unexpected target hdc %p\n", hdc); + + hr = pGetBufferedPaintTargetRect(NULL, &rect2); + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintTargetRect(NULL, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + bits = (void *)0xdeadbeef; + row = 10; + hr = pGetBufferedPaintBits(NULL, &bits, &row); + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + ok(row == 10, "Unexpected row count %d\n", row); + ok(bits == (void *)0xdeadbeef, "Unepexpected data pointer %p\n", bits); + + hr = pGetBufferedPaintBits(NULL, NULL, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintBits(NULL, &bits, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintBits(NULL, NULL, &row); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + /* access buffer bits */ + for (format = BPBF_COMPATIBLEBITMAP; format <= BPBF_TOPDOWNMONODIB; format++) + { + buffer = pBeginBufferedPaint(target, &rect, format, &params, &src); + + /* only works for DIB buffers */ + bits = NULL; + row = 0; + hr = pGetBufferedPaintBits(buffer, &bits, &row); + if (format == BPBF_COMPATIBLEBITMAP) + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + else + { + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + ok(bits != NULL, "Bitmap bits %p\n", bits); + ok(row >= (rect.right - rect.left), "format %d: bitmap width %d\n", format, row); + } + + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + } + + DeleteDC(target); +} + START_TEST(system) { init_funcs(); @@ -541,4 +734,6 @@ /* CloseThemeData */ trace("Starting test_CloseThemeData()\n"); test_CloseThemeData(); -} + + test_buffered_paint(); +} Modified: trunk/rostests/winetests/uxtheme/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/testlis… ============================================================================== --- trunk/rostests/winetests/uxtheme/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/testlist.c [iso-8859-1] Sun Feb 26 20:49:49 2017 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_system(void);

7 years, 10 months

[akhaldi] 73991: [CMD_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:47:12 2017 New Revision: 73991 URL: http://svn.reactos.org/svn/reactos?rev=73991&view=rev Log: [CMD_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/cmd/test_builtins.cmd trunk/rostests/winetests/cmd/test_builtins.cmd.exp Modified: trunk/rostests/winetests/cmd/test_builtins.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] Sun Feb 26 20:47:12 2017 @@ -31,6 +31,12 @@ echo @tab@word echo@tab@@tab@word echo @tab@ on @space@ +@echo --- @ with chains and brackets +(echo the @ character chains until&&@echo we leave the current depth||( +echo hidden +@echo hidden +))&&echo and can hide brackets||(@echo command hidden)||@(echo brackets hidden) +@echo --- @echo off echo off@tab@@space@ @@ -245,6 +251,193 @@ echo %ErrorLevel% set WINE_FOO= +echo ------------ Testing chains ------------ +rem The chain operators have the following bottom-up precedence: +rem 'else' precedes nothing and matches the closest unmatched 'if' in the same bracket depth +rem '&' precedes 'else' +rem '||' precedes '&' and 'else' +rem '&&' precedes '||', '&' and 'else' +rem '|' precedes '&&', '||', '&' and 'else' +rem +rem Example: 'if 1==1 if 2==2 if 3==3 a | b && c || d & e else f else g' is interpreted as +rem 'if 1==1 (if 2==2 (if 3==3 ((((a | b) && c) || d) & e) else f) else g)' +goto :cfailend +:cfail +echo %1 +call :setError 1 +goto :eof +:cfailend +echo --- chain success +echo a1&echo a2 +echo b1&&echo b2 +echo c1||echo c2 +echo --- +echo d1&echo d2&echo d3 +echo e1&echo e2&&echo e3 +echo f1&echo f2||echo f3 +echo --- +echo g1&&echo g2&echo g3 +echo h1&&echo h2&&echo h3 +echo i1&&echo i2||echo i3 +echo --- +echo j1||echo j2&echo j3 +echo --- +echo k1||echo k2&&echo k3 +echo --- +echo l1||echo l2||echo l3 +echo --- +echo --- chain failure +call :cfail a1&call :cfail a2 +call :cfail b1&&call :cfail b2 +echo --- +call :cfail c1||call :cfail c2 +call :cfail d1&call :cfail d2&call :cfail d3 +call :cfail e1&call :cfail e2&&call :cfail e3 +echo --- +call :cfail f1&call :cfail f2||call :cfail f3 +call :cfail g1&&call :cfail g2&call :cfail g3 +echo --- +call :cfail h1&&call :cfail h2&&call :cfail h3 +echo --- +call :cfail i1&&call :cfail i2||call :cfail i3 +echo --- +call :cfail j1||call :cfail j2&call :cfail j3 +call :cfail k1||call :cfail k2&&call :cfail k3 +echo --- +call :cfail l1||call :cfail l2||call :cfail l3 +echo --- chain brackets +rem Brackets are like regular commands, they support redirections +rem and have the same precedence as regular commands. +echo a1&(echo a2&echo a3) +echo b1&(echo b2&&echo b3) +echo c1&(echo c2||echo c3) +echo --- +echo d1&&(echo d2&echo d3) +echo e1&&(echo e2&&echo e3) +echo f1&&(echo f2||echo f3) +echo --- +echo g1||(echo g2&echo g3) +echo --- +echo h1||(echo h2&&echo h3) +echo --- +echo i1||(echo i2||echo i3) +echo --- +call :cfail j1&(call :cfail j2&call :cfail j3) +call :cfail k1&(call :cfail k2&&call :cfail k3) +echo --- +call :cfail l1&(call :cfail l2||call :cfail l3) +call :cfail m1&&(call :cfail m2&call :cfail m3) +echo --- +call :cfail n1&&(call :cfail n2&&call :cfail n3) +echo --- +call :cfail o1&&(call :cfail o2||call :cfail o3) +echo --- +call :cfail p1||(call :cfail p2&call :cfail p3) +call :cfail q1||(call :cfail q2&&call :cfail q3) +echo --- +call :cfail r1||(call :cfail r2||call :cfail r3) +echo --- chain pipe +rem Piped commands run at the same time, so the print order varies. +rem Additionally, they don't run in the batch script context, as shown by +rem 'call :existing_label|echo read the error message'. +(echo a 1>&2|echo a 1>&2) 2>&1 +echo --- +echo b1|echo b2 +echo c1&&echo c2|echo c3 +echo d1||echo d2|echo d3 +echo --- +echo e1&echo e2|echo e3 +echo f1|echo f2&&echo f3 +echo g1|echo g2||echo g3 +echo --- +echo h1|echo h2&echo h3 +echo i1|echo i2|echo i3 +echo --- chain pipe input +rem The output data of the left side of a pipe can disappear, probably +rem because it finished too fast and closed the pipe before it could be read, +rem which means we can get broken results for the tests of this section. +echo @echo off> tmp.cmd +echo set IN=X>> tmp.cmd +echo set /p IN=%%1:>> tmp.cmd +echo setlocal EnableDelayedExpansion>> tmp.cmd +echo echo [!IN!,%%1]>> tmp.cmd +echo endlocal>> tmp.cmd +echo set IN=>> tmp.cmd +echo a1|cmd /ctmp.cmd a2 +echo b1|cmd /ctmp.cmd b2|cmd /ctmp.cmd b3 +echo c1|cmd /ctmp.cmd c2|cmd /ctmp.cmd c3|cmd /ctmp.cmd c4 +echo d1|call tmp.cmd d2 +echo e1|call tmp.cmd e2|call tmp.cmd e3 +echo f1|call tmp.cmd f2|call tmp.cmd f3|call tmp.cmd f4 +rem FIXME these 3 tests cause "unexpected end of output" +rem test : echo g1|tmp.cmd g2 +rem result: g2:[g1,g2] +rem test : echo h1|tmp.cmd h2|tmp.cmd h3 +rem result: h3:[h2:[h1,h2],h3]@or_broken@h3:[h2:,h3] +rem test : echo i1|tmp.cmd i2|tmp.cmd i3|tmp.cmd i4 +rem result: i4:[i3:[i2:[i1,i2],i3],i4]@or_broken@i4:[i3:[i2:,i3],i4]@or_broken@i4:[i3:,i4] +del tmp.cmd +echo --- chain else +rem Command arguments are gready and eat up the 'else' unless terminated by +rem brackets, which means the 'else' can only be recognized when the +rem 'if true' command chain ends with brackets. +if 1==1 if 2==2 if 3==3 (echo a1) else (echo a2) else echo a3 +if 1==1 if 2==2 if 3==0 (echo b1) else (echo b2) else echo b3 +echo --- +if 1==1 if 2==0 if 3==3 (echo c1) else (echo c2) else echo c3 +echo --- +if 1==1 if 2==0 if 3==0 (echo d1) else (echo d2) else echo d3 +echo --- +if 1==0 if 2==2 if 3==3 (echo e1) else (echo e2) else echo e3 +echo --- +if 1==0 if 2==2 if 3==0 (echo f1) else (echo f2) else echo f3 +echo --- +if 1==0 if 2==0 if 3==3 (echo g1) else (echo g2) else echo g3 +echo --- +if 1==0 if 2==0 if 3==0 (echo h1) else (echo h2) else echo h3 +echo --- +echo --- chain else (if true) +if 1==1 echo a1 else echo a2 +if 1==1 echo b1|echo b2 else echo b3 +if 1==1 echo c1&&echo c2 else echo c3 +if 1==1 echo d1||echo d2 else echo d3 +echo --- +if 1==1 echo e1&echo e2 else echo e3 +if 1==1 echo f1 else echo f2|echo f3 +if 1==1 echo g1 else echo g2&&echo g3 +if 1==1 echo h1 else echo h2||echo h3 +echo --- +if 1==1 echo i1 else echo i2&echo i3 +if 1==1 echo j1|(echo j2) else echo j3 +echo --- +if 1==1 echo k1&&(echo k2) else echo k3 +if 1==1 echo l1||(echo l2) else echo l3 +echo --- +if 1==1 echo m1&(echo m2) else echo m3 +if 1==1 (echo n1) else echo n2|echo n3 +if 1==1 (echo o1) else echo o2&&echo o3 +if 1==1 (echo p1) else echo p2||echo p3 +if 1==1 (echo q1) else echo q2&echo q3 +echo --- chain else (if false) +if 1==0 echo a1 else echo a2 +if 1==0 echo b1|echo b2 else echo b3 +if 1==0 echo c1&&echo c2 else echo c3 +if 1==0 echo d1||echo d2 else echo d3 +if 1==0 echo e1&echo e2 else echo e3 +if 1==0 echo f1 else echo f2|echo f3 +if 1==0 echo g1 else echo g2&&echo g3 +if 1==0 echo h1 else echo h2||echo h3 +if 1==0 echo i1 else echo i2&echo i3 +if 1==0 echo j1|(echo j2) else echo j3 +echo --- +if 1==0 echo k1&&(echo k2) else echo k3 +if 1==0 echo l1||(echo l2) else echo l3 +if 1==0 echo m1&(echo m2) else echo m3 +if 1==0 (echo n1) else echo n2|echo n3 +if 1==0 (echo o1) else echo o2&&echo o3 +if 1==0 (echo p1) else echo p2||echo p3 +echo --- +if 1==0 (echo q1) else echo q2&echo q3 echo ------------ Testing 'set' ------------ call :setError 0 rem Remove any WINE_FOO* WINE_BA* environment variables from shell before proceeding @@ -2391,6 +2584,22 @@ copy ..\file1+..\file2 file12_eof2 >nul 2>&1 call :CheckFileSize file12_eof2 14 +rem Test copying when destination is one of the sources. +rem Concat file1+file2+file3 into file1, should produce file1+file2+file3 = 24 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file1 >nul 2>&1 +call :CheckFileSize file1 24 + +rem Concat file1+file2+file3 into file2, should produce file1+file3 = 16 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file2 >nul 2>&1 +call :CheckFileSize file2 16 + +rem Concat file1+file2+file3 into file3, should produce file1+file2 = 13 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file3 >nul 2>&1 +call :CheckFileSize file3 13 + rem -------------------------------------------------------------- rem Show ascii source copy stops at first EOF, binary does the lot rem -------------------------------------------------------------- Modified: trunk/rostests/winetests/cmd/test_builtins.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] Sun Feb 26 20:47:12 2017 @@ -88,6 +88,13 @@ @tab@word @pwd@>echo @tab@ on @space@@space@ +--- @ with chains and brackets + +@todo_wine@@pwd@>(echo the @ character chains until && ) && echo and can hide brackets || () ||@space@ +@todo_wine@the @ character chains until +@todo_wine@we leave the current depth +@todo_wine@and can hide brackets +@todo_wine@--- noecho1 noecho2 echo3 @@ -241,6 +248,199 @@ WINE_FOO=bar ^| baz bar | baz 0 +------------ Testing chains ------------ +--- chain success +a1 +a2 +b1 +b2 +c1 +@todo_wine@--- +d1 +d2 +d3 +e1 +e2 +e3 +f1 +f2 +@todo_wine@--- +g1 +g2 +g3 +h1 +h2 +h3 +i1 +i2 +@todo_wine@--- +j1 +@todo_wine@j3 +@todo_wine@--- +k1 +@todo_wine@--- +l1 +@todo_wine@--- +--- chain failure +a1 +a2 +b1 +@todo_wine@--- +c1 +c2 +d1 +d2 +d3 +e1 +e2 +@todo_wine@--- +f1 +f2 +f3 +g1 +@todo_wine@g3 +@todo_wine@--- +h1 +@todo_wine@--- +i1 +@todo_wine@i3 +@todo_wine@--- +j1 +j2 +j3 +k1 +k2 +@todo_wine@--- +l1 +l2 +l3 +--- chain brackets +a1 +a2 +a3 +b1 +b2 +b3 +c1 +c2 +@todo_wine@--- +d1 +d2 +d3 +e1 +e2 +e3 +f1 +f2 +@todo_wine@--- +g1 +@todo_wine@--- +h1 +@todo_wine@--- +i1 +@todo_wine@--- +j1 +j2 +j3 +k1 +k2 +@todo_wine@--- +l1 +l2 +l3 +m1 +@todo_wine@--- +n1 +@todo_wine@--- +o1 +@todo_wine@--- +p1 +p2 +p3 +q1 +q2 +@todo_wine@--- +r1 +r2 +r3 +--- chain pipe +@todo_wine@a@space@ +@todo_wine@a@space@ +--- +b2 +c1 +c3 +d1 +@todo_wine@--- +e1 +e3 +f2 +f3 +g2 +@todo_wine@--- +h2 +h3 +i3 +--- chain pipe input +a2:[a1,a2] +b3:[b2:[b1,b2],b3]@or_broken@b3:[b2:,b3] +c4:[c3:[c2:[c1,c2],c3],c4]@or_broken@c4:[c3:[c2:,c3],c4]@or_broken@c4:[c3:,c4] +d2:[d1,d2] +e3:[e2:[e1,e2],e3]@or_broken@e3:[e2:,e3] +f4:[f3:[f2:[f1,f2],f3],f4]@or_broken@f4:[f3:[f2:,f3],f4]@or_broken@f4:[f3:,f4] +--- chain else +a1 +b2 +@todo_wine@--- +@todo_wine@c3 +@todo_wine@--- +@todo_wine@d3 +@todo_wine@--- +@todo_wine@--- +@todo_wine@--- +@todo_wine@--- +@todo_wine@--- +--- chain else (if true) +a1 else echo a2 +b2 else echo b3 +c1 +c2 else echo c3 +d1 +@todo_wine@--- +e1 +e2 else echo e3 +f3 +g1 else echo g2 +g3 +h1 else echo h2 +@todo_wine@--- +i1 else echo i2 +i3 +@todo_wine@j2@space@ +@todo_wine@--- +k1 +k2 +l1 +@todo_wine@--- +m1 +m2 +n1 +o1 +p1 +q1 +--- chain else (if false) +@todo_wine@j3 +--- +k3 +l3 +m3 +n3 +o2 +o3 +p2 +@todo_wine@--- +q2 +q3 ------------ Testing 'set' ------------ 1 0 @@ -331,7 +531,7 @@ @todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' -'--a------'@or_broken@'--a--------'@or_broken@'%~ai' +'--a------'@or_broken@'--a--------'@or_broken@'--a--c---'@or_broken@'%~ai' '5'@or_broken@'%~zi' ''@or_broken@'%~ti' ''@or_broken@'%~ti' @@ -1262,6 +1462,9 @@ Passed: file size check on file12_plus_eof [14]@or_broken@Skipping file size check on NT4 Passed: file size check on file12_no_eof [13]@or_broken@Skipping file size check on NT4 Passed: file size check on file12_eof2 [14]@or_broken@Skipping file size check on NT4 +Passed: file size check on file1 [24]@or_broken@Skipping file size check on NT4 +Passed: file size check on file2 [16]@or_broken@Skipping file size check on NT4 +Passed: file size check on file3 [13]@or_broken@Skipping file size check on NT4 Passed: file size check on file1_binary_srccopy [6]@or_broken@Skipping file size check on NT4 Passed: file size check on file1_ascii_srccopy [5]@or_broken@Skipping file size check on NT4 Passed: file size check on file123_default_copy [25]@or_broken@Skipping file size check on NT4

7 years, 10 months

[akhaldi] 73990: [XMLLITE] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:41:49 2017 New Revision: 73990 URL: http://svn.reactos.org/svn/reactos?rev=73990&view=rev Log: [XMLLITE] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sun Feb 26 20:41:49 2017 @@ -432,6 +432,13 @@ ok(hr == S_FALSE, "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + /* crashes on XP, 2k3, works on newer versions */ + if (0) + { + hr = IXmlReader_GetNodeType(reader, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + } + resolver = (void*)0xdeadbeef; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1141,11 +1148,114 @@ IXmlReader_Release(reader); } -static const char test_dtd[] = +static const char test_public_dtd[] = + "<!DOCTYPE testdtd PUBLIC \"pubid\" \"externalid uri\" >"; + +static void test_read_public_dtd(void) +{ + static const WCHAR sysvalW[] = {'e','x','t','e','r','n','a','l','i','d',' ','u','r','i',0}; + static const WCHAR pubvalW[] = {'p','u','b','i','d',0}; + static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; + static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; + static const WCHAR pubW[] = {'P','U','B','L','I','C',0}; + IXmlReader *reader; + const WCHAR *str; + XmlNodeType type; + IStream *stream; + UINT len, count; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); + ok(hr == S_OK, "got 0x%8x\n", hr); + + stream = create_stream_on_data(test_public_dtd, sizeof(test_public_dtd)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got 0x%8x\n", hr); + ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + + count = 0; + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 2, "got %d\n", count); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(pubW), "got %u\n", len); + ok(!lstrcmpW(str, pubW), "got %s\n", wine_dbgstr_w(str)); + + len = 0; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(pubvalW), "got %u\n", len); + ok(!lstrcmpW(str, pubvalW), "got %s\n", wine_dbgstr_w(str)); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(sysW), "got %u\n", len); + ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); + + len = 0; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(sysvalW), "got %u\n", len); + ok(!lstrcmpW(str, sysvalW), "got %s\n", wine_dbgstr_w(str)); + + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(len == lstrlenW(dtdnameW), "got %u\n", len); + ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); +} + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(dtdnameW), "got %u\n", len); + ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + +static const char test_system_dtd[] = "<!DOCTYPE testdtd SYSTEM \"externalid uri\" >" ""; -static void test_read_dtd(void) +static void test_read_system_dtd(void) { static const WCHAR sysvalW[] = {'e','x','t','e','r','n','a','l','i','d',' ','u','r','i',0}; static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; @@ -1163,7 +1273,7 @@ hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); ok(hr == S_OK, "got 0x%8x\n", hr); - stream = create_stream_on_data(test_dtd, sizeof(test_dtd)); + stream = create_stream_on_data(test_system_dtd, sizeof(test_system_dtd)); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); @@ -1264,7 +1374,8 @@ if (test->hr_broken) ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + todo_wine_if(test->hr == NC_E_UNDECLAREDPREFIX) + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1735,8 +1846,7 @@ hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); + hr = IXmlReader_Read(reader, NULL); if (test->hr_broken) ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); @@ -1747,6 +1857,10 @@ const WCHAR *str; WCHAR *str_exp; UINT len; + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "Failed to get node type, %#x\n", hr); ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); @@ -1807,6 +1921,176 @@ IXmlReader_Release(reader); } +static void test_prefix(void) +{ + static const struct + { + const char *xml; + const char *prefix1; + const char *prefix2; + const char *prefix3; + } prefix_tests[] = + { + { "", "", "", "xml" }, + }; + IXmlReader *reader; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { + const WCHAR *prefix; + XmlNodeType type; + WCHAR *expected; + IStream *stream; + + stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "Read() failed, %#x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix1); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); + + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix2); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "MoveToNextAttribute() failed, %#x.\n", hr); + + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix3); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + + IStream_Release(stream); + } + + IXmlReader_Release(reader); +} + +static void test_namespaceuri(void) +{ + struct uri_test + { + const char *xml; + const char *uri[5]; + } uri_tests[] = + { + { "<a xmlns=\"defns a\"><c xmlns=\"defns c\"/></a>", + { "defns a", "defns b", "defns c", "defns b", "defns a" }}, + { "<r:a xmlns=\"defns a\" xmlns:r=\"ns r\"/>", + { "ns r" }}, + { "<r:a xmlns=\"defns a\" xmlns:r=\"ns r\"></r:a>", + { "ns r", "defns a", "ns r" }}, + { "<a xmlns=\"defns a\" xmlns:r=\"ns r\"><r:b/></a>", + { "defns a", "ns r", "defns a" }}, + { "<a><c/></a>", + { "", "", "", "", "" }}, + }; + IXmlReader *reader; + XmlNodeType type; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { + IStream *stream = create_stream_on_data(uri_tests[i].xml, strlen(uri_tests[i].xml) + 1); + unsigned int j = 0; + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + while (IXmlReader_Read(reader, &type) == S_OK) { + const WCHAR *uri, *local; + WCHAR *uriW; + + ok(type == XmlNodeType_Element || type == XmlNodeType_EndElement, "Unexpected node type %d.\n", type); + + hr = IXmlReader_GetLocalName(reader, &local, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + uriW = a2w(uri_tests[i].uri[j]); + ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri)); + free_str(uriW); + + j++; + } + + IStream_Release(stream); + } + + IXmlReader_Release(reader); +} + +static void test_read_charref(void) +{ + static const char testA[] = "<a b=\"c\">ǳă</a>"; + static const WCHAR chardataW[] = {0x01f3,0x0103,0}; + const WCHAR *value; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(testA, sizeof(testA)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected node type %d\n", type); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Text, "Unexpected node type %d\n", type); + + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(value, chardataW), "Text value : %s\n", wine_dbgstr_w(value)); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type); + + IXmlReader_Release(reader); + IStream_Release(stream); +} + START_TEST(reader) { test_reader_create(); @@ -1816,7 +2100,8 @@ test_read_cdata(); test_read_comment(); test_read_pi(); - test_read_dtd(); + test_read_system_dtd(); + test_read_public_dtd(); test_read_element(); test_isemptyelement(); test_read_text(); @@ -1825,4 +2110,7 @@ test_readvaluechunk(); test_read_xmldeclaration(); test_reader_properties(); -} + test_prefix(); + test_namespaceuri(); + test_read_charref(); +}

7 years, 10 months

[akhaldi] 73989: [XMLLITE] Sync with Wine Staging 2.2. CORE-12823 455f5f2 xmllite: Handle char references within text nodes. 33d8a32 xmllite/reader: Handle NULL node type argument in Read(). 1ed063...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:41:20 2017 New Revision: 73989 URL: http://svn.reactos.org/svn/reactos?rev=73989&view=rev Log: [XMLLITE] Sync with Wine Staging 2.2. CORE-12823 455f5f2 xmllite: Handle char references within text nodes. 33d8a32 xmllite/reader: Handle NULL node type argument in Read(). 1ed0631 xmllite/reader: Handle NULL argument in GetNodeType(). dcf1469 xmllite: A spelling fix in a comment. f900879 xmllite: Hr was uninitialized in error path (Coverity). 831c202 xmllite: Add maintainer entry. 682d4f1 xmllite: Allow prefixed element names. 9b98d69 xmllite: Fix setting local name when parsing QName. 20c575e xmllite: Improve GetValue() for namespace definition nodes. 13afa65 xmllite: Implement GetNamespaceUri(). 249b7a9 xmllite: Free prefix and local name too when clearing element list. 585735a xmllite: Update prefix when moving to first attribute. 0575a4b xmllite: Use a helper to move to first attribute to avoid extra traces. 65ee2b7 xmllite: Keep namespace list updated when going through document tree. 18d6def xmllite: Keep a list of namespace definitions. 635c409 xmllite: Store prefix for elements. f185dd5 xmllite: Store empty element fields separately. a39251b xmllite: Improve writer methods tracing. 65cbc12 xmllite: Parse URLs in `DOCTYPE PUBLIC` DTDs. Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Sun Feb 26 20:41:20 2017 @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012-2013 Nikolay Sivov + * Copyright 2010, 2012-2013, 2016 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -206,11 +206,16 @@ } strval; static WCHAR emptyW[] = {0}; +static WCHAR xmlW[] = {'x','m','l',0}; +static WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const strval strval_empty = { emptyW }; +static const strval strval_xml = { xmlW, 3 }; +static const strval strval_xmlns = { xmlnsW, 5 }; struct attribute { struct list entry; + strval prefix; strval localname; strval value; }; @@ -218,8 +223,17 @@ struct element { struct list entry; + strval prefix; + strval localname; strval qname; - strval localname; +}; + +struct ns +{ + struct list entry; + strval prefix; + strval uri; + struct element *element; }; typedef struct @@ -239,11 +253,14 @@ struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list nsdef; + struct list ns; struct list elements; strval strvalues[StringValue_Last]; UINT depth; UINT max_depth; - BOOL empty_element; + BOOL is_empty_element; + struct element empty_element; UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -271,6 +288,14 @@ return m_alloc(reader->imalloc, len); } +static inline void *reader_alloc_zero(xmlreader *reader, size_t len) +{ + void *ret = reader_alloc(reader, len); + if (ret) + memset(ret, 0, len); + return ret; +} + static inline void reader_free(xmlreader *reader, void *mem) { m_free(reader->imalloc, mem); @@ -349,13 +374,17 @@ /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ -static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *value) { struct attribute *attr; attr = reader_alloc(reader, sizeof(*attr)); if (!attr) return E_OUTOFMEMORY; + if (prefix) + attr->prefix = *prefix; + else + memset(&attr->prefix, 0, sizeof(attr->prefix)); attr->localname = *localname; attr->value = *value; list_add_tail(&reader->attrs, &attr->entry); @@ -419,11 +448,13 @@ struct element *elem, *elem2; LIST_FOR_EACH_ENTRY_SAFE(elem, elem2, &reader->elements, struct element, entry) { + reader_free_strvalued(reader, &elem->prefix); + reader_free_strvalued(reader, &elem->localname); reader_free_strvalued(reader, &elem->qname); reader_free(reader, elem); } list_init(&reader->elements); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; } static HRESULT reader_inc_depth(xmlreader *reader) @@ -437,54 +468,139 @@ if (reader->depth > 1) reader->depth--; } -static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *localname) -{ - struct element *elem; +static HRESULT reader_push_ns(xmlreader *reader, const strval *prefix, const strval *uri, BOOL def) +{ + struct ns *ns; HRESULT hr; - elem = reader_alloc(reader, sizeof(*elem)); - if (!elem) return E_OUTOFMEMORY; - - hr = reader_strvaldup(reader, qname, &elem->qname); + ns = reader_alloc(reader, sizeof(*ns)); + if (!ns) return E_OUTOFMEMORY; + + if (def) + memset(&ns->prefix, 0, sizeof(ns->prefix)); + else { + hr = reader_strvaldup(reader, prefix, &ns->prefix); + if (FAILED(hr)) { + reader_free(reader, ns); + return hr; + } + } + + hr = reader_strvaldup(reader, uri, &ns->uri); if (FAILED(hr)) { - reader_free(reader, elem); + reader_free_strvalued(reader, &ns->prefix); + reader_free(reader, ns); return hr; } - hr = reader_strvaldup(reader, localname, &elem->localname); - if (FAILED(hr)) - { - reader_free_strvalued(reader, &elem->qname); - reader_free(reader, elem); - return hr; - } + ns->element = NULL; + list_add_head(def ? &reader->nsdef : &reader->ns, &ns->entry); + return hr; +} + +static void reader_free_element(xmlreader *reader, struct element *element) +{ + reader_free_strvalued(reader, &element->prefix); + reader_free_strvalued(reader, &element->localname); + reader_free_strvalued(reader, &element->qname); + reader_free(reader, element); +} + +static void reader_mark_ns_nodes(xmlreader *reader, struct element *element) +{ + struct ns *ns; + + LIST_FOR_EACH_ENTRY(ns, &reader->ns, struct ns, entry) { + if (ns->element) + break; + ns->element = element; + } + + LIST_FOR_EACH_ENTRY(ns, &reader->nsdef, struct ns, entry) { + if (ns->element) + break; + ns->element = element; + } +} + +static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *localname, + strval *qname) +{ + struct element *element; + HRESULT hr; if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); - if (FAILED(hr)) { - reader_free(reader, elem); + if (FAILED(hr)) return hr; + } + + element = reader_alloc_zero(reader, sizeof(*element)); + if (!element) { + hr = E_OUTOFMEMORY; + goto failed; + } + + if ((hr = reader_strvaldup(reader, prefix, &element->prefix)) != S_OK || + (hr = reader_strvaldup(reader, localname, &element->localname)) != S_OK || + (hr = reader_strvaldup(reader, qname, &element->qname)) != S_OK) + { + reader_free_element(reader, element); + goto failed; + } + + list_add_head(&reader->elements, &element->entry); + reader_mark_ns_nodes(reader, element); + reader->is_empty_element = FALSE; + +failed: + reader_dec_depth(reader); + return hr; +} + +static void reader_pop_ns_nodes(xmlreader *reader, struct element *element) +{ + struct ns *ns, *ns2; + + LIST_FOR_EACH_ENTRY_SAFE_REV(ns, ns2, &reader->ns, struct ns, entry) { + if (ns->element != element) + break; + + list_remove(&ns->entry); + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } + + if (!list_empty(&reader->nsdef)) { + ns = LIST_ENTRY(list_head(&reader->nsdef), struct ns, entry); + if (ns->element == element) { + list_remove(&ns->entry); + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); } } - - list_add_head(&reader->elements, &elem->entry); - reader->empty_element = FALSE; - return hr; } static void reader_pop_element(xmlreader *reader) { - struct element *elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); - - if (elem) - { - list_remove(&elem->entry); - reader_free_strvalued(reader, &elem->qname); - reader_free_strvalued(reader, &elem->localname); - reader_free(reader, elem); - reader_dec_depth(reader); - } + struct element *element; + + if (list_empty(&reader->elements)) + return; + + element = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + list_remove(&element->entry); + + reader_pop_ns_nodes(reader, element); + reader_free_element(reader, element); + reader_dec_depth(reader); + + /* It was a root element, the rest is expected as Misc */ + if (list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; } /* Always make a copy, cause strings are supposed to be null terminated. Null pointer for 'value' @@ -1031,7 +1147,7 @@ /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -1107,7 +1223,7 @@ /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1149,7 +1265,7 @@ /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1591,8 +1707,9 @@ reader_skipn(reader, 1); cur = reader_get_ptr(reader); } - reader_init_strvalue(start, reader_get_cur(reader)-start, literal); + if (*cur == quote) reader_skipn(reader, 1); + TRACE("%s\n", debug_strval(reader, literal)); return S_OK; } @@ -1602,34 +1719,38 @@ { static WCHAR systemW[] = {'S','Y','S','T','E','M',0}; static WCHAR publicW[] = {'P','U','B','L','I','C',0}; - strval name; + strval name, sys; HRESULT hr; int cnt; - if (reader_cmp(reader, systemW)) - { - if (reader_cmp(reader, publicW)) - return S_FALSE; - else - { - strval pub; - - /* public id */ - reader_skipn(reader, 6); - cnt = reader_skipspaces(reader); - if (!cnt) return WC_E_WHITESPACE; - - hr = reader_parse_pub_literal(reader, &pub); - if (FAILED(hr)) return hr; - - reader_init_cstrvalue(publicW, strlenW(publicW), &name); - return reader_add_attr(reader, &name, &pub); - } - } - else - { - strval sys; - + if (!reader_cmp(reader, publicW)) { + strval pub; + + /* public id */ + reader_skipn(reader, 6); + cnt = reader_skipspaces(reader); + if (!cnt) return WC_E_WHITESPACE; + + hr = reader_parse_pub_literal(reader, &pub); + if (FAILED(hr)) return hr; + + reader_init_cstrvalue(publicW, strlenW(publicW), &name); + hr = reader_add_attr(reader, NULL, &name, &pub); + if (FAILED(hr)) return hr; + + cnt = reader_skipspaces(reader); + if (!cnt) return S_OK; + + /* optional system id */ + hr = reader_parse_sys_literal(reader, &sys); + if (FAILED(hr)) return S_OK; + + reader_init_cstrvalue(systemW, strlenW(systemW), &name); + hr = reader_add_attr(reader, NULL, &name, &sys); + if (FAILED(hr)) return hr; + + return S_OK; + } else if (!reader_cmp(reader, systemW)) { /* system id */ reader_skipn(reader, 6); cnt = reader_skipspaces(reader); @@ -1639,10 +1760,10 @@ if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, &name, &sys); - } - - return hr; + return reader_add_attr(reader, NULL, &name, &sys); + } + + return S_FALSE; } /* [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' intSubset ']' S?)? '>' */ @@ -1786,8 +1907,6 @@ reader_init_strvalue(0, 0, prefix); } } - - reader_init_strvalue(start, reader_get_cur(reader)-start, local); if (prefix->len) TRACE("qname %s:%s\n", debug_strval(reader, prefix), debug_strval(reader, local)); @@ -2012,23 +2131,18 @@ [15 NS] Attribute ::= NSAttName Eq AttValue | QName Eq AttValue */ static HRESULT reader_parse_attribute(xmlreader *reader) { - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; - strval prefix, local, qname, xmlns, value; + strval prefix, local, qname, value; + BOOL ns = FALSE, nsdef = FALSE; HRESULT hr; hr = reader_parse_qname(reader, &prefix, &local, &qname); if (FAILED(hr)) return hr; - reader_init_cstrvalue((WCHAR*)xmlnsW, 5, &xmlns); - - if (strval_eq(reader, &prefix, &xmlns)) - { - FIXME("namespace definitions not supported\n"); - return E_NOTIMPL; - } - - if (strval_eq(reader, &qname, &xmlns)) - FIXME("default namespace definitions not supported\n"); + if (strval_eq(reader, &prefix, &strval_xmlns)) + ns = TRUE; + + if (strval_eq(reader, &qname, &strval_xmlns)) + ns = nsdef = TRUE; hr = reader_parse_eq(reader); if (FAILED(hr)) return hr; @@ -2036,8 +2150,11 @@ hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; + if (ns) + reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); + TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &local, &value); + return reader_add_attr(reader, &prefix, &local, &value); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2060,7 +2177,11 @@ { /* skip '/>' */ reader_skipn(reader, 2); - reader->empty_element = TRUE; + reader->is_empty_element = TRUE; + reader->empty_element.prefix = *prefix; + reader->empty_element.localname = *local; + reader->empty_element.qname = *qname; + reader_mark_ns_nodes(reader, &reader->empty_element); return S_OK; } @@ -2069,7 +2190,7 @@ { /* skip '>' */ reader_skipn(reader, 1); - return reader_push_element(reader, qname, local); + return reader_push_element(reader, prefix, local, qname); } hr = reader_parse_attribute(reader); @@ -2104,9 +2225,7 @@ hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); if (FAILED(hr)) return hr; - /* FIXME: need to check for defined namespace to reject invalid prefix, - currently reject all prefixes */ - if (prefix.len) return NC_E_UNDECLAREDPREFIX; + /* FIXME: need to check for defined namespace to reject invalid prefix */ /* if we got empty element and stack is empty go straight to Misc */ if (empty && list_empty(&reader->elements)) @@ -2116,8 +2235,8 @@ reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); - reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); break; } @@ -2153,13 +2272,8 @@ elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); if (!strval_eq(reader, &elem->qname, &qname)) return WC_E_ELEMENTMATCH; - reader_pop_element(reader); - - /* It was a root element, the rest is expected as Misc */ - if (list_empty(&reader->elements)) - reader->instate = XmlReadInState_MiscEnd; - reader->nodetype = XmlNodeType_EndElement; + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); @@ -2258,6 +2372,8 @@ while (*ptr) { + static const WCHAR ampW[] = {'&',0}; + /* CDATA closing sequence ']]>' is not allowed */ if (ptr[0] == ']' && ptr[1] == ']' && ptr[2] == '>') return WC_E_CDSECTEND; @@ -2274,11 +2390,15 @@ return S_OK; } - reader_skipn(reader, 1); - /* this covers a case when text has leading whitespace chars */ if (!is_wchar_space(*ptr)) reader->nodetype = XmlNodeType_Text; - ptr++; + + if (!reader_cmp(reader, ampW)) + reader_parse_reference(reader); + else + reader_skipn(reader, 1); + + ptr = reader_get_ptr(reader); } return S_OK; @@ -2289,7 +2409,6 @@ { static const WCHAR cdstartW[] = {'<','!','[','C','D','A','T','A','[',0}; static const WCHAR etagW[] = {'<','/',0}; - static const WCHAR ampW[] = {'&',0}; if (reader->resumestate != XmlReadResumeState_Initial) { @@ -2324,9 +2443,6 @@ if (!reader_cmp(reader, cdstartW)) return reader_parse_cdata(reader); - if (!reader_cmp(reader, ampW)) - return reader_parse_reference(reader); - if (!reader_cmp(reader, ltW)) return reader_parse_element(reader); @@ -2336,10 +2452,17 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) { + XmlNodeType nodetype = reader_get_nodetype(reader); HRESULT hr; if (!is_reader_pending(reader)) reader_clear_attrs(reader); + + /* When moving from EndElement or empty element, pop its own namespace definitions */ + if (nodetype == XmlNodeType_Element && reader->is_empty_element) + reader_pop_ns_nodes(reader, &reader->empty_element); + else if (nodetype == XmlNodeType_EndElement) + reader_pop_element(reader); while (1) { @@ -2453,6 +2576,22 @@ return ref; } +static void reader_clear_ns(xmlreader *reader) +{ + struct ns *ns, *ns2; + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->ns, struct ns, entry) { + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->nsdef, struct ns, entry) { + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } +} + static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); @@ -2467,6 +2606,7 @@ if (This->resolver) IXmlResolver_Release(This->resolver); if (This->mlang) IUnknown_Release(This->mlang); reader_clear_attrs(This); + reader_clear_ns(This); reader_clear_elements(This); reader_free_strvalues(This); reader_free(This, This); @@ -2629,7 +2769,8 @@ if (hr == S_OK) { TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); - *nodetype = This->nodetype; + if (nodetype) + *nodetype = This->nodetype; } return hr; @@ -2638,24 +2779,36 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) { xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, node_type); + + if (!node_type) + return E_INVALIDARG; *node_type = reader_get_nodetype(This); return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } +static HRESULT reader_move_to_first_attribute(xmlreader *reader) +{ + if (!reader->attr_count) + return S_FALSE; + + reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); + reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); + reader_set_strvalue(reader, StringValue_LocalName, &reader->attr->localname); + reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); + + return S_OK; +} + static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)\n", This); - if (!This->attr_count) return S_FALSE; - This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); - reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); - - return S_OK; + return reader_move_to_first_attribute(This); } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) @@ -2668,12 +2821,13 @@ if (!This->attr_count) return S_FALSE; if (!This->attr) - return IXmlReader_MoveToFirstAttribute(iface); + return reader_move_to_first_attribute(This); next = list_next(&This->attrs, &This->attr->entry); if (next) { This->attr = LIST_ENTRY(next, struct attribute, entry); + reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); reader_set_strvalue(This, StringValue_Value, &This->attr->value); } @@ -2692,7 +2846,6 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - struct element *elem; TRACE("(%p)\n", This); @@ -2700,11 +2853,16 @@ This->attr = NULL; /* FIXME: support other node types with 'attributes' like DTD */ - elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); - if (elem) - { - reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); - reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + if (This->is_empty_element) { + reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); + reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); + } + else { + struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + if (element) { + reader_set_strvalue(This, StringValue_LocalName, &element->localname); + reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); + } } return S_OK; @@ -2720,12 +2878,103 @@ return S_OK; } -static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, - LPCWSTR *namespaceUri, - UINT *namespaceUri_length) -{ - FIXME("(%p %p %p): stub\n", iface, namespaceUri, namespaceUri_length); - return E_NOTIMPL; +static struct ns *reader_lookup_ns(xmlreader *reader, const strval *prefix) +{ + struct list *nslist = prefix ? &reader->ns : &reader->nsdef; + struct ns *ns; + + LIST_FOR_EACH_ENTRY_REV(ns, nslist, struct ns, entry) { + if (strval_eq(reader, prefix, &ns->prefix)) + return ns; + } + + return NULL; +} + +static struct ns *reader_lookup_nsdef(xmlreader *reader) +{ + if (list_empty(&reader->nsdef)) + return NULL; + + return LIST_ENTRY(list_head(&reader->nsdef), struct ns, entry); +} + +static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR **uri, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + const strval *prefix = &This->strvalues[StringValue_Prefix]; + XmlNodeType nodetype; + struct ns *ns; + UINT length; + + TRACE("(%p %p %p)\n", iface, uri, len); + + if (!len) + len = &length; + + *uri = NULL; + *len = 0; + + switch ((nodetype = reader_get_nodetype(This))) + { + case XmlNodeType_Attribute: + { + static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + '2','0','0','0','/','x','m','l','n','s','/',0}; + static const WCHAR xml_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + 'X','M','L','/','1','9','9','8','/','n','a','m','e','s','p','a','c','e',0}; + const strval *local = &This->strvalues[StringValue_LocalName]; + + /* check for reserved prefixes first */ + if ((strval_eq(This, prefix, &strval_empty) && strval_eq(This, local, &strval_xmlns)) || + strval_eq(This, prefix, &strval_xmlns)) + { + *uri = xmlns_uriW; + *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; + } + else if (strval_eq(This, prefix, &strval_xml)) { + *uri = xml_uriW; + *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; + } + + if (!*uri) { + ns = reader_lookup_ns(This, prefix); + if (ns) { + *uri = ns->uri.str; + *len = ns->uri.len; + } + else { + *uri = emptyW; + *len = 0; + } + } + } + break; + case XmlNodeType_Element: + case XmlNodeType_EndElement: + { + ns = reader_lookup_ns(This, prefix); + + /* pick top default ns if any */ + if (!ns) + ns = reader_lookup_nsdef(This); + + if (ns) { + *uri = ns->uri.str; + *len = ns->uri.len; + } + else { + *uri = emptyW; + *len = 0; + } + } + break; + default: + FIXME("Unhandled node type %d\n", nodetype); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) @@ -2746,6 +2995,18 @@ *prefix = This->strvalues[StringValue_Prefix].str; if (len) *len = This->strvalues[StringValue_Prefix].len; return S_OK; +} + +static BOOL is_namespace_definition(xmlreader *reader) +{ + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; + + if (reader_get_nodetype(reader) != XmlNodeType_Attribute) + return FALSE; + + return ((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns)); } static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) @@ -2778,6 +3039,18 @@ val->str = ptr; } + /* For namespace definition attributes return values from namespace list */ + if (is_namespace_definition(reader)) { + const strval *local = &reader->strvalues[StringValue_LocalName]; + struct ns *ns; + + ns = reader_lookup_ns(reader, local); + if (!ns) + ns = reader_lookup_nsdef(reader); + + val = &ns->uri; + } + *value = val->str; if (len) *len = val->len; return S_OK; @@ -2826,7 +3099,7 @@ TRACE("(%p)\n", This); /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense when current node is start tag of an element */ - return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->empty_element : FALSE; + return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->is_empty_element : FALSE; } static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) @@ -3006,10 +3279,12 @@ list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->nsdef); + list_init(&reader->ns); list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256; - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++) Modified: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Sun Feb 26 20:41:20 2017 @@ -437,7 +437,7 @@ { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlWriter)) @@ -453,23 +453,23 @@ static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - LONG ref; - - TRACE("%p\n", This); - - ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->>(%u)\n", This, ref); + if (ref == 0) { struct element *element, *element2; IMalloc *imalloc = This->imalloc; - IXmlWriter_Flush(iface); + writeroutput_flush_stream(This->output); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); /* element stack */ 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 Feb 26 20:41:20 2017 @@ -218,7 +218,7 @@ reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.11 reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.2 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.11 -reactos/dll/win32/xmllite # Synced to WineStaging-1.9.23 +reactos/dll/win32/xmllite # Synced to WineStaging-2.2 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73988: [XINPUT1_3_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:37:54 2017 New Revision: 73988 URL: http://svn.reactos.org/svn/reactos?rev=73988&view=rev Log: [XINPUT1_3_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/xinput1_3/xinput.c Modified: trunk/rostests/winetests/xinput1_3/xinput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xinput1_3/xinpu… ============================================================================== --- trunk/rostests/winetests/xinput1_3/xinput.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xinput1_3/xinput.c [iso-8859-1] Sun Feb 26 20:37:54 2017 @@ -32,29 +32,57 @@ static DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD, GUID*, GUID*); static DWORD (WINAPI *pXInputGetBatteryInformation)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); +static void dump_gamepad(XINPUT_GAMEPAD *data) +{ + trace("-- Gamepad Variables --\n"); + trace("Gamepad.wButtons: %#x\n", data->wButtons); + trace("Gamepad.bLeftTrigger: %d\n", data->bLeftTrigger); + trace("Gamepad.bRightTrigger: %d\n", data->bRightTrigger); + trace("Gamepad.sThumbLX: %d\n", data->sThumbLX); + trace("Gamepad.sThumbLY: %d\n", data->sThumbLY); + trace("Gamepad.sThumbRX: %d\n", data->sThumbRX); + trace("Gamepad.sThumbRY: %d\n\n", data->sThumbRY); +} + static void test_set_state(void) { XINPUT_VIBRATION vibrator; DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); + vibrator.wLeftMotorSpeed = 32767; + vibrator.wRightMotorSpeed = 32767; + result = pXInputSetState(controllerNum, &vibrator); + if (result == ERROR_DEVICE_NOT_CONNECTED) continue; + + Sleep(250); vibrator.wLeftMotorSpeed = 0; vibrator.wRightMotorSpeed = 0; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); - + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); + + /* Disabling XInput here, queueing a vibration and then re-enabling XInput + * is used to prove that vibrations are auto enabled when resuming XInput. + * If XInputEnable(1) is removed below the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); + Sleep(250); vibrator.wLeftMotorSpeed = 65535; vibrator.wRightMotorSpeed = 65535; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); if (pXInputEnable) pXInputEnable(1); + Sleep(250); + + vibrator.wLeftMotorSpeed = 0; + vibrator.wRightMotorSpeed = 0; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); } result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator); @@ -68,8 +96,7 @@ XINPUT_STATE state; XINPUT_STATE_EX state_ex; } xinput; - DWORD controllerNum, i; - DWORD result; + DWORD controllerNum, i, result, good = XUSER_MAX_COUNT; for (i = 0; i < (pXInputGetStateEx ? 2 : 1); i++) { @@ -92,18 +119,14 @@ trace("-- Results for controller %d --\n", controllerNum); if (i == 0) + { + good = controllerNum; trace("XInputGetState: %d\n", result); + } else trace("XInputGetStateEx: %d\n", result); trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); - trace("Gamepad Variables --\n"); - trace("Gamepad.wButtons: %#x\n", xinput.state.Gamepad.wButtons); - trace("Gamepad.bLeftTrigger: 0x%08x\n", xinput.state.Gamepad.bLeftTrigger); - trace("Gamepad.bRightTrigger: 0x%08x\n", xinput.state.Gamepad.bRightTrigger); - trace("Gamepad.sThumbLX: %d\n", xinput.state.Gamepad.sThumbLX); - trace("Gamepad.sThumbLY: %d\n", xinput.state.Gamepad.sThumbLY); - trace("Gamepad.sThumbRX: %d\n", xinput.state.Gamepad.sThumbRX); - trace("Gamepad.sThumbRY: %d\n", xinput.state.Gamepad.sThumbRY); + dump_gamepad(&xinput.state.Gamepad); } } @@ -120,6 +143,28 @@ result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &xinput.state_ex); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } + + if (winetest_interactive && good < XUSER_MAX_COUNT) + { + DWORD now = GetTickCount(), packet = 0; + XINPUT_GAMEPAD *game = &xinput.state.Gamepad; + + trace("You have 20 seconds to test the joystick freely\n"); + do + { + Sleep(100); + pXInputGetState(good, &xinput.state); + if (xinput.state.dwPacketNumber == packet) + continue; + + packet = xinput.state.dwPacketNumber; + trace("Buttons 0x%04X Triggers %3d/%3d LT %6d/%6d RT %6d/%6d\n", + game->wButtons, game->bLeftTrigger, game->bRightTrigger, + game->sThumbLX, game->sThumbLY, game->sThumbRX, game->sThumbRY); + } + while(GetTickCount() - now < 20000); + trace("Test over...\n"); + } } static void test_get_keystroke(void) @@ -128,7 +173,7 @@ DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); @@ -153,7 +198,7 @@ DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); @@ -163,7 +208,11 @@ if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); - } + continue; + } + + /* Important to show that the results changed between 1.3 and 1.4 XInput version */ + dump_gamepad(&capabilities.Gamepad); } ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); @@ -175,18 +224,31 @@ { DWORD controllerNum; DWORD result; - GUID soundRender; - GUID soundCapture; - - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) - { + GUID soundRender, soundCapture; + GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; + GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; + + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetDSoundAudioDeviceGuids failed with (%d)\n", result); if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); - } + continue; + } + + if (!IsEqualGUID(&soundRender, &emptyGuid)) + ok(!IsEqualGUID(&soundRender, &testGuid), "Broken GUID returned for sound render device\n"); + else + trace("Headset phone not attached\n"); + + if (!IsEqualGUID(&soundCapture, &emptyGuid)) + ok(!IsEqualGUID(&soundCapture, &testGuid), "Broken GUID returned for sound capture device\n"); + else + trace("Headset microphone not attached\n"); } result = pXInputGetDSoundAudioDeviceGuids(XUSER_MAX_COUNT+1, &soundRender, &soundCapture); @@ -199,7 +261,7 @@ DWORD result; XINPUT_BATTERY_INFORMATION batteryInfo; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&batteryInfo, sizeof(XINPUT_BATTERY_INFORMATION));

7 years, 10 months

[akhaldi] 73987: [XINPUT1_3] Sync with Wine Staging 2.2. CORE-12823 8936a84 xinput1_3: Avoid spamming FIXME for XInputGetKeystroke. 1640c9c xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() defini...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:37:15 2017 New Revision: 73987 URL: http://svn.reactos.org/svn/reactos?rev=73987&view=rev Log: [XINPUT1_3] Sync with Wine Staging 2.2. CORE-12823 8936a84 xinput1_3: Avoid spamming FIXME for XInputGetKeystroke. 1640c9c xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition. Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] Sun Feb 26 20:37:15 2017 @@ -50,7 +50,7 @@ return TRUE; } -void WINAPI XInputEnable(BOOL enable) +void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) { /* Setting to false will stop messages from XInputSetState being sent to the controllers. Setting to true will send the last vibration @@ -112,7 +112,10 @@ DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) { - FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); + static int warn_once; + + if (!warn_once++) + FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; 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 Feb 26 20:37:15 2017 @@ -216,7 +216,7 @@ reactos/dll/win32/wuapi # Synced to WineStaging-1.9.11 reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.9.11 reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.11 -reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.9.23 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.2 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.11 reactos/dll/win32/xmllite # Synced to WineStaging-1.9.23

7 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017