Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 58617: [SAMSRV] Add LogonHours attribute to new user accounts.
by ekohl＠svn.reactos.org 30 Mar '13

30 Mar '13

Author: ekohl Date: Sat Mar 30 20:53:47 2013 New Revision: 58617 URL: http://svn.reactos.org/svn/reactos?rev=58617&view=rev Log: [SAMSRV] Add LogonHours attribute to new user accounts. Modified: trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Mar 30 20:53:47 2013 @@ -229,6 +229,7 @@ ULONG UserAccountControl) { SAM_USER_FIXED_DATA FixedUserData; + UCHAR LogonHours[23]; LPWSTR lpEmptyString = L""; DWORD dwDisposition; WCHAR szAccountKeyName[32]; @@ -343,7 +344,17 @@ (LPVOID)lpEmptyString, sizeof(WCHAR)); - /* FIXME: Set LogonHours attribute*/ + /* Set LogonHours attribute */ + *((PUSHORT)LogonHours) = 168; + memset(&(LogonHours[2]), 0xff, 21); + + RegSetValueEx(hAccountKey, + L"LogonHours", + 0, + REG_BINARY, + (LPVOID)LogonHours, + sizeof(LogonHours)); + /* FIXME: Set Groups attribute*/ /* Set LMPwd attribute*/

1 0

[hbelusca] 58616: [CONSRV] Move frontend (i.e. gui or tui) code to a dedicated directory.
by hbelusca＠svn.reactos.org 30 Mar '13

30 Mar '13

Author: hbelusca Date: Sat Mar 30 20:40:08 2013 New Revision: 58616 URL: http://svn.reactos.org/svn/reactos?rev=58616&view=rev Log: [CONSRV] Move frontend (i.e. gui or tui) code to a dedicated directory. Added: branches/ros-csrss/win32ss/user/consrv/frontends/ (with props) branches/ros-csrss/win32ss/user/consrv/frontends/frontends.rc (with props) branches/ros-csrss/win32ss/user/consrv/frontends/gui/ (with props) branches/ros-csrss/win32ss/user/consrv/frontends/gui/consolecpl.h - copied unchanged from r58606, branches/ros-csrss/win32ss/user/consrv/consolecpl.h branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c - copied, changed from r58615, branches/ros-csrss/win32ss/user/consrv/guisettings.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.h - copied unchanged from r58606, branches/ros-csrss/win32ss/user/consrv/guisettings.h branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c - copied, changed from r58615, branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.h - copied, changed from r58606, branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.rc - copied, changed from r58606, branches/ros-csrss/win32ss/user/consrv/consrv.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ - copied from r58606, branches/ros-csrss/win32ss/user/consrv/lang/ branches/ros-csrss/win32ss/user/consrv/frontends/gui/res/ - copied from r58606, branches/ros-csrss/win32ss/user/consrv/res/ branches/ros-csrss/win32ss/user/consrv/frontends/gui/resource.h - copied unchanged from r58606, branches/ros-csrss/win32ss/user/consrv/resource.h branches/ros-csrss/win32ss/user/consrv/frontends/gui/rsrc.rc - copied unchanged from r58606, branches/ros-csrss/win32ss/user/consrv/rsrc.rc branches/ros-csrss/win32ss/user/consrv/frontends/tui/ (with props) branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c - copied, changed from r58606, branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h - copied, changed from r58606, branches/ros-csrss/win32ss/user/consrv/tuiconsole.h Removed: branches/ros-csrss/win32ss/user/consrv/consolecpl.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/guisettings.c branches/ros-csrss/win32ss/user/consrv/guisettings.h branches/ros-csrss/win32ss/user/consrv/res/ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt branches/ros-csrss/dll/cpl/console/console.h branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.rc branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc branches/ros-csrss/win32ss/user/consrv/lang/he-IL.rc branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc branches/ros-csrss/win32ss/user/consrv/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/CMake… Modified: branches/ros-csrss/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/C… Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Removed: branches/ros-csrss/win32ss/user/consrv/consolecpl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/consrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Added: branches/ros-csrss/win32ss/user/consrv/frontends/frontends.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… Copied: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c (from r58615, branches/ros-csrss/win32ss/user/consrv/guisettings.c) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… Copied: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c (from r58615, branches/ros-csrss/win32ss/user/consrv/guiconsole.c) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… Copied: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.h (from r58606, branches/ros-csrss/win32ss/user/consrv/guiconsole.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… Copied: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.rc (from r58606, branches/ros-csrss/win32ss/user/consrv/consrv.rc) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… Copied: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c (from r58606, branches/ros-csrss/win32ss/user/consrv/tuiconsole.c) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… Copied: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.h (from r58606, branches/ros-csrss/win32ss/user/consrv/tuiconsole.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… Removed: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Removed: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Removed: branches/ros-csrss/win32ss/user/consrv/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Removed: branches/ros-csrss/win32ss/user/consrv/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r… Removed: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… Removed: branches/ros-csrss/win32ss/user/consrv/tuiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t…

1 0

[hbelusca] 58615: [CONSOLE.DLL] - Fix passing and retrieving gui terminal front-end information. - Fix default (global) console parameters saving. [CONSRV] - PSEH2-protect calls to CreateRemoteThre...
by hbelusca＠svn.reactos.org 30 Mar '13

30 Mar '13

Author: hbelusca Date: Sat Mar 30 18:44:56 2013 New Revision: 58615 URL: http://svn.reactos.org/svn/reactos?rev=58615&view=rev Log: [CONSOLE.DLL] - Fix passing and retrieving gui terminal front-end information. - Fix default (global) console parameters saving. [CONSRV] - PSEH2-protect calls to CreateRemoteThread when 1. calling console app. control handlers and 2. retrieving console settings from console.dll. - Introduce a new way of locking consoles when being used, and store them in a list. Added: branches/ros-csrss/win32ss/user/consrv/console.h (with props) Modified: branches/ros-csrss/dll/cpl/console/console.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guisettings.c branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c Modified: branches/ros-csrss/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… ============================================================================== --- branches/ros-csrss/dll/cpl/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/console.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -86,6 +86,8 @@ InitConsoleDefaults(PCONSOLE_PROPS pConInfo) { PGUI_CONSOLE_INFO GuiInfo = NULL; + + /* FIXME: Get also the defaults from the registry */ /* Initialize the default properties */ pConInfo->ci.HistoryBufferSize = 50; @@ -108,7 +110,8 @@ /* Adapted for holding GUI terminal information */ pConInfo->TerminalInfo.Size = sizeof(GUI_CONSOLE_INFO); GuiInfo = pConInfo->TerminalInfo.TermInfo = (PGUI_CONSOLE_INFO)(pConInfo + 1); - GuiInfo->FaceName[0] = L'\0'; + wcsncpy(GuiInfo->FaceName, L"Fixedsys", LF_FACESIZE); // HACK: !! + // GuiInfo->FaceName[0] = L'\0'; GuiInfo->FontFamily = FF_DONTCARE; GuiInfo->FontSize = 0; GuiInfo->FontWeight = FW_DONTCARE; @@ -166,16 +169,35 @@ ApplyConsoleInfo(HWND hwndDlg, PCONSOLE_PROPS pConInfo) { - INT_PTR res = 0; - - res = DialogBox(hApplet, MAKEINTRESOURCE(IDD_APPLYOPTIONS), hwndDlg, ApplyProc); - if (res == IDCANCEL) - { - /* Don't destroy when user presses cancel */ - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); - return TRUE; - } - else if (res == IDC_RADIO_APPLY_ALL || res == IDC_RADIO_APPLY_CURRENT) + BOOL SetParams = FALSE; + BOOL SaveParams = FALSE; + + /* + * If we are setting the default parameters, just save them, + * otherwise display the save-confirmation dialog. + */ + if (pConInfo->ShowDefaultParams) + { + SetParams = TRUE; + SaveParams = TRUE; + } + else + { + INT_PTR res = DialogBox(hApplet, MAKEINTRESOURCE(IDD_APPLYOPTIONS), hwndDlg, ApplyProc); + + SetParams = (res != IDCANCEL); + SaveParams = (res == IDC_RADIO_APPLY_ALL); + + if (SetParams == FALSE) + { + /* Don't destroy when user presses cancel */ + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); + // return TRUE; + } + } + + // if (res == IDC_RADIO_APPLY_ALL || res == IDC_RADIO_APPLY_CURRENT) + if (SetParams) { HANDLE hSection; PCONSOLE_PROPS pSharedInfo; @@ -207,10 +229,15 @@ /* We are applying the chosen configuration */ pConInfo->AppliedConfig = TRUE; - /* Copy the console info into the section */ + /* + * Copy the console information into the section and + * offsetize the address of terminal-specific information. + * Do not perform the offsetization in pConInfo as it is + * likely to be reused later on. Instead, do it in pSharedInfo + * after having copied all the data. + */ RtlCopyMemory(pSharedInfo, pConInfo, sizeof(CONSOLE_PROPS) + sizeof(GUI_CONSOLE_INFO)); - /* Offsetize */ - pSharedInfo->TerminalInfo.TermInfo = (PVOID)((ULONG_PTR)pSharedInfo->TerminalInfo.TermInfo - (ULONG_PTR)pSharedInfo); + pSharedInfo->TerminalInfo.TermInfo = (PVOID)((ULONG_PTR)pConInfo->TerminalInfo.TermInfo - (ULONG_PTR)pConInfo); /* Unmap it */ UnmapViewOfFile(pSharedInfo); @@ -220,11 +247,10 @@ SendMessage(pConInfo->hConsoleWindow, PM_APPLY_CONSOLE_INFO, (WPARAM)hSection, - (LPARAM)(res == IDC_RADIO_APPLY_ALL)); + (LPARAM)SaveParams); /* Close the section and return */ CloseHandle(hSection); - return TRUE; } return TRUE; Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -685,7 +685,6 @@ return STATUS_INVALID_PARAMETER; } - // if (Request->Data.ReadConsoleRequest.NrCharactersRead * sizeof(WCHAR) > nNumberOfCharsToRead * CharSize) if (ReadConsoleRequest->NrCharactersRead > ReadConsoleRequest->NrCharactersToRead) { return STATUS_INVALID_PARAMETER; @@ -808,7 +807,7 @@ PCONSOLE_FLUSHINPUTBUFFER FlushInputBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FlushInputBufferRequest; PLIST_ENTRY CurrentEntry; PCONSOLE_INPUT_BUFFER InputBuffer; - ConsoleInput* Input; + ConsoleInput* Event; DPRINT("SrvFlushConsoleInputBuffer\n"); @@ -823,14 +822,12 @@ while (!IsListEmpty(&InputBuffer->InputEvents)) { CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); - Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - /* Destroy the event */ - RtlFreeHeap(ConSrvHeap, 0, Input); + Event = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); + RtlFreeHeap(ConSrvHeap, 0, Event); } ResetEvent(InputBuffer->ActiveEvent); ConSrvReleaseInputBuffer(InputBuffer, TRUE); - return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -147,12 +147,27 @@ PVOID OldData; /* Reserved */ } FRONTEND_IFACE, *PFRONTEND_IFACE; +#if 0 // Temporarily put in consrv.h +/* + * WARNING: Change the state of the console ONLY when the console is locked ! + */ +typedef enum _CONSOLE_STATE +{ + CONSOLE_INITIALIZING, /* Console is initializing */ + CONSOLE_RUNNING , /* Console running */ + CONSOLE_TERMINATING , /* Console about to be destroyed (but still not) */ + CONSOLE_IN_DESTRUCTION /* Console in destruction */ +} CONSOLE_STATE, *PCONSOLE_STATE; +#endif + typedef struct _CONSOLE { - LONG ReferenceCount; /* Is incremented each time a handle to a screen-buffer or the input buffer of this console gets referenced, or the console gets locked */ + LONG ReferenceCount; /* Is incremented each time a handle to something in the console (a screen-buffer or the input buffer of this console) gets referenced */ CRITICAL_SECTION Lock; - - struct _CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */ + CONSOLE_STATE State; /* State of the console */ + + // struct _CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */ + LIST_ENTRY Entry; /* Entry in the list of consoles */ LIST_ENTRY ProcessList; /* List of processes owning the console. The first one is the so-called "Console Leader Process" */ FRONTEND_IFACE TermIFace; /* Frontend-specific interface */ @@ -218,11 +233,6 @@ #define PAUSED_FROM_SELECTION 0x4 /* console.c */ -VOID WINAPI ConSrvDeleteConsole(PCONSOLE Console); -VOID WINAPI ConSrvInitConsoleSupport(VOID); -NTSTATUS WINAPI ConSrvInitConsole(OUT PCONSOLE* NewConsole, - IN OUT PCONSOLE_START_INFO ConsoleStartInfo, - IN PCSR_PROCESS ConsoleLeaderProcess); VOID FASTCALL ConioPause(PCONSOLE Console, UINT Flags); VOID FASTCALL ConioUnpause(PCONSOLE Console, UINT Flags); ULONG FASTCALL ConSrvConsoleProcessCtrlEvent(PCONSOLE Console, Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -1278,15 +1278,18 @@ DPRINT("SrvCreateConsoleScreenBuffer\n"); - RtlEnterCriticalSection(&ProcessData->HandleTableLock); + // RtlEnterCriticalSection(&ProcessData->HandleTableLock); Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return Status; } + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + /* if (Console->ActiveBuffer) { ScreenBufferSize = Console->ActiveBuffer->ScreenBufferSize; @@ -1298,6 +1301,23 @@ IsCursorVisible = Console->ActiveBuffer->CursorInfo.bVisible; CursorSize = Console->ActiveBuffer->CursorInfo.dwSize; + } + */ + + // This is Windows' behaviour + { + ScreenBufferSize = Console->ConsoleSize; // Use the current console size + if (ScreenBufferSize.X == 0) ScreenBufferSize.X = 1; + if (ScreenBufferSize.Y == 0) ScreenBufferSize.Y = 1; + + if (Console->ActiveBuffer) + { + ScreenAttrib = Console->ActiveBuffer->ScreenDefaultAttrib; + PopupAttrib = Console->ActiveBuffer->PopupDefaultAttrib; + + IsCursorVisible = Console->ActiveBuffer->CursorInfo.bVisible; + CursorSize = Console->ActiveBuffer->CursorInfo.dwSize; + } } Status = ConSrvCreateScreenBuffer(Console, @@ -1309,6 +1329,7 @@ CursorSize); if (NT_SUCCESS(Status)) { + /* Insert the new handle inside the process handles table */ Status = ConSrvInsertObject(ProcessData, &CreateScreenBufferRequest->OutputHandle, &Buff->Header, @@ -1317,10 +1338,11 @@ CreateScreenBufferRequest->ShareMode); } + // ConSrvReleaseConsole(Console, TRUE); + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + ConSrvReleaseConsole(Console, TRUE); - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Status; } Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -21,11 +21,18 @@ #include "tuiconsole.h" #endif +#include "console.h" + #include <shlwapi.h> #include <shlobj.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY ConsoleList; /* The list of all the allocated consoles */ +/*static*/ RTL_RESOURCE ListLock; /* PRIVATE FUNCTIONS **********************************************************/ @@ -44,26 +51,43 @@ DWORD Timeout) { ULONG Status = ERROR_SUCCESS; - HANDLE Thread; - - DPRINT("ConSrvConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->Process->ClientId.UniqueProcess); + + DPRINT("ConSrvConsoleCtrlEventTimeout Parent ProcessId = %x\n", ProcessData->Process->ClientId.UniqueProcess); if (ProcessData->CtrlDispatcher) { - Thread = CreateRemoteThread(ProcessData->Process->ProcessHandle, NULL, 0, - ProcessData->CtrlDispatcher, - UlongToPtr(Event), 0, NULL); - if (NULL == Thread) - { - Status = GetLastError(); - DPRINT1("Failed thread creation (Error: 0x%x)\n", Status); - } - else - { - DPRINT("We succeeded at creating ProcessData->CtrlDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); - WaitForSingleObject(Thread, Timeout); - CloseHandle(Thread); - } + _SEH2_TRY + { + HANDLE Thread = NULL; + + _SEH2_TRY + { + Thread = CreateRemoteThread(ProcessData->Process->ProcessHandle, NULL, 0, + ProcessData->CtrlDispatcher, + UlongToPtr(Event), 0, NULL); + if (NULL == Thread) + { + Status = GetLastError(); + DPRINT1("Failed thread creation (Error: 0x%x)\n", Status); + } + else + { + DPRINT("ProcessData->CtrlDispatcher remote thread creation succeeded, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); + WaitForSingleObject(Thread, Timeout); + } + } + _SEH2_FINALLY + { + CloseHandle(Thread); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = RtlNtStatusToDosError(_SEH2_GetExceptionCode()); + DPRINT1("ConSrvConsoleCtrlEventTimeout - Caught an exception, Status = %08X\n", Status); + } + _SEH2_END; } return Status; @@ -84,6 +108,10 @@ ULONG Status = ERROR_SUCCESS; PLIST_ENTRY current_entry; PCONSOLE_PROCESS_DATA current; + + /* If the console is already being destroyed, just return */ + if (!ConSrvValidateConsole(Console, CONSOLE_RUNNING, FALSE)) + return STATUS_UNSUCCESSFUL; /* * Loop through the process list, from the most recent process @@ -139,6 +167,18 @@ CsrDereferenceWait(&Console->WriteWaitQueue); } } +} + +VOID WINAPI +ConSrvInitConsoleSupport(VOID) +{ + DPRINT("CONSRV: ConSrvInitConsoleSupport()\n"); + + /* Initialize the console list and its lock */ + InitializeListHead(&ConsoleList); + RtlInitializeResource(&ListLock); + + /* Should call LoadKeyboardLayout */ } static BOOL @@ -346,6 +386,7 @@ /* * Initialize the console */ + Console->State = CONSOLE_INITIALIZING; InitializeCriticalSection(&Console->Lock); Console->ReferenceCount = 0; InitializeListHead(&Console->ProcessList); @@ -428,6 +469,9 @@ RtlCreateUnicodeString(&Console->Title, ConsoleInfo.ConsoleTitle); } + /* Lock the console until its initialization is finished */ + // EnterCriticalSection(&Console->Lock); + /* * If we are not in GUI-mode, start the text-mode terminal emulator. * If we fail, try to start the GUI-mode terminal emulator. @@ -480,14 +524,33 @@ RtlFreeUnicodeString(&Console->OriginalTitle); ConioDeleteScreenBuffer(NewBuffer); CloseHandle(Console->InputBuffer.ActiveEvent); + // LeaveCriticalSection(&Console->Lock); DeleteCriticalSection(&Console->Lock); RtlFreeHeap(ConSrvHeap, 0, Console); return Status; } } + DPRINT1("Terminal initialized\n"); + + /* All went right, so add the console to the list */ + ConSrvLockConsoleListExclusive(); + DPRINT1("Insert in the list\n"); + InsertTailList(&ConsoleList, &Console->Entry); + + /* The initialization is finished */ + DPRINT1("Change state\n"); + Console->State = CONSOLE_RUNNING; + + /* Unlock the console */ + // LeaveCriticalSection(&Console->Lock); + + /* Unlock the console list */ + ConSrvUnlockConsoleList(); + /* Copy buffer contents to screen */ ConioDrawConsole(Console); + DPRINT1("Console drawn\n"); /* Return the newly created console to the caller and a success code too */ *NewConsole = Console; @@ -495,30 +558,100 @@ } VOID WINAPI -ConSrvInitConsoleSupport(VOID) -{ - DPRINT("CONSRV: ConSrvInitConsoleSupport()\n"); - - /* Should call LoadKeyboardLayout */ -} - -VOID WINAPI ConSrvDeleteConsole(PCONSOLE Console) { - ConsoleInput *Event; - - DPRINT("ConSrvDeleteConsole\n"); - - /* Drain input event queue */ - while (Console->InputBuffer.InputEvents.Flink != &Console->InputBuffer.InputEvents) - { - Event = (ConsoleInput *) Console->InputBuffer.InputEvents.Flink; - Console->InputBuffer.InputEvents.Flink = Console->InputBuffer.InputEvents.Flink->Flink; - Console->InputBuffer.InputEvents.Flink->Flink->Blink = &Console->InputBuffer.InputEvents; + PLIST_ENTRY CurrentEntry; + ConsoleInput* Event; + + DPRINT1("ConSrvDeleteConsole\n"); + + /* + * Forbid validation of any console by other threads + * during the deletion of this console. + */ + ConSrvLockConsoleListExclusive(); + + /* Check the existence of the console, and if it's ok, continue */ + if (!ConSrvValidatePointer(Console)) + { + /* Unlock the console list and return */ + ConSrvUnlockConsoleList(); + return; + } + + /* + * If the console is already being destroyed + * (thus not running), just return. + */ + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + { + /* Unlock the console list and return */ + ConSrvUnlockConsoleList(); + return; + } + + /* + * We are about to be destroyed. Signal it to other people + * so that they can terminate what they are doing, and that + * they cannot longer validate the console. + */ + Console->State = CONSOLE_TERMINATING; + + /* + * Allow other threads to finish their job: basically, unlock + * all other calls to EnterCriticalSection(&Console->Lock); by + * ConSrvValidateConsole(Unsafe) functions so that they just see + * that we are not in CONSOLE_RUNNING state anymore, or unlock + * other concurrent calls to ConSrvDeleteConsole so that they + * can see that we are in fact already deleting the console. + */ + LeaveCriticalSection(&Console->Lock); + ConSrvUnlockConsoleList(); + + /* FIXME: Send a terminate message to all the processes owning this console */ + + /* Cleanup the UI-oriented part */ + ConioCleanupConsole(Console); + + /*** + * Check that the console is in terminating state before continuing + * (the cleanup code must not change the state of the console... + * ...unless to cancel console deletion ?). + ***/ + + ConSrvLockConsoleListExclusive(); + + /* Re-check the existence of the console, and if it's ok, continue */ + if (!ConSrvValidatePointer(Console)) + { + /* Unlock the console list and return */ + ConSrvUnlockConsoleList(); + return; + } + + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_TERMINATING, TRUE)) + { + ConSrvUnlockConsoleList(); + return; + } + + /* We are in destruction */ + Console->State = CONSOLE_IN_DESTRUCTION; + + /* Remove the console from the list */ + RemoveEntryList(&Console->Entry); + + /* Reset the count to be sure */ + Console->ReferenceCount = 0; + + /* Discard all entries in the input event queue */ + while (!IsListEmpty(&Console->InputBuffer.InputEvents)) + { + CurrentEntry = RemoveHeadList(&Console->InputBuffer.InputEvents); + Event = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); RtlFreeHeap(ConSrvHeap, 0, Event); } - ConioCleanupConsole(Console); if (Console->LineBuffer) RtlFreeHeap(ConSrvHeap, 0, Console->LineBuffer); while (!IsListEmpty(&Console->HistoryBuffers)) @@ -532,12 +665,22 @@ CloseHandle(Console->InputBuffer.ActiveEvent); if (Console->UnpauseEvent) CloseHandle(Console->UnpauseEvent); - DeleteCriticalSection(&Console->Lock); RtlFreeUnicodeString(&Console->OriginalTitle); RtlFreeUnicodeString(&Console->Title); IntDeleteAllAliases(Console->Aliases); + + DPRINT1("ConSrvDeleteConsole - Unlocking\n"); + LeaveCriticalSection(&Console->Lock); + DPRINT1("ConSrvDeleteConsole - Destroying lock\n"); + DeleteCriticalSection(&Console->Lock); + DPRINT1("ConSrvDeleteConsole - Lock destroyed ; freeing console\n"); + RtlFreeHeap(ConSrvHeap, 0, Console); + DPRINT1("ConSrvDeleteConsole - Console freed\n"); + + /* Unlock the console list and return */ + ConSrvUnlockConsoleList(); } @@ -545,56 +688,59 @@ CSR_API(SrvOpenConsole) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PCONSOLE_OPENCONSOLE OpenConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.OpenConsoleRequest; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCONSOLE Console; + + DWORD DesiredAccess = OpenConsoleRequest->Access; + DWORD ShareMode = OpenConsoleRequest->ShareMode; + Object_t *Object; OpenConsoleRequest->ConsoleHandle = INVALID_HANDLE_VALUE; + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } + RtlEnterCriticalSection(&ProcessData->HandleTableLock); - if (ProcessData->Console) - { - DWORD DesiredAccess = OpenConsoleRequest->Access; - DWORD ShareMode = OpenConsoleRequest->ShareMode; - - PCONSOLE Console = ProcessData->Console; - Object_t *Object; - - EnterCriticalSection(&Console->Lock); - - if (OpenConsoleRequest->HandleType == HANDLE_OUTPUT) - { - Object = &Console->ActiveBuffer->Header; - } - else // HANDLE_INPUT - { - Object = &Console->InputBuffer.Header; - } - - if (((DesiredAccess & GENERIC_READ) && Object->ExclusiveRead != 0) || - ((DesiredAccess & GENERIC_WRITE) && Object->ExclusiveWrite != 0) || - (!(ShareMode & FILE_SHARE_READ) && Object->AccessRead != 0) || - (!(ShareMode & FILE_SHARE_WRITE) && Object->AccessWrite != 0)) - { - DPRINT1("Sharing violation\n"); - Status = STATUS_SHARING_VIOLATION; - } - else - { - Status = ConSrvInsertObject(ProcessData, - &OpenConsoleRequest->ConsoleHandle, - Object, - DesiredAccess, - OpenConsoleRequest->Inheritable, - ShareMode); - } - - LeaveCriticalSection(&Console->Lock); + /* + * Open a handle to either the active screen buffer or the input buffer. + */ + if (OpenConsoleRequest->HandleType == HANDLE_OUTPUT) + { + Object = &Console->ActiveBuffer->Header; + } + else // HANDLE_INPUT + { + Object = &Console->InputBuffer.Header; + } + + if (((DesiredAccess & GENERIC_READ) && Object->ExclusiveRead != 0) || + ((DesiredAccess & GENERIC_WRITE) && Object->ExclusiveWrite != 0) || + (!(ShareMode & FILE_SHARE_READ) && Object->AccessRead != 0) || + (!(ShareMode & FILE_SHARE_WRITE) && Object->AccessWrite != 0)) + { + DPRINT1("Sharing violation\n"); + Status = STATUS_SHARING_VIOLATION; + } + else + { + Status = ConSrvInsertObject(ProcessData, + &OpenConsoleRequest->ConsoleHandle, + Object, + DesiredAccess, + OpenConsoleRequest->Inheritable, + ShareMode); } RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + ConSrvReleaseConsole(Console, TRUE); return Status; } @@ -758,7 +904,6 @@ CSR_API(SrvFreeConsole) { - DPRINT1("SrvFreeConsole\n"); ConSrvRemoveConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process)); return STATUS_SUCCESS; } @@ -798,7 +943,6 @@ } ConSrvReleaseObject(Object, TRUE); - return Status; } @@ -831,7 +975,6 @@ } ConSrvReleaseObject(Object, TRUE); - return Status; } Added: branches/ros-csrss/win32ss/user/consrv/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.h (added) +++ branches/ros-csrss/win32ss/user/consrv/console.h [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -1,0 +1,52 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/console.h + * PURPOSE: Consoles Management + * PROGRAMMERS: Hermes Belusca-Maito + */ + +#pragma once + +#define ConSrvLockConsoleListExclusive() \ + RtlAcquireResourceExclusive(&ListLock, TRUE) + +#define ConSrvLockConsoleListShared() \ + RtlAcquireResourceShared(&ListLock, TRUE) + +#define ConSrvUnlockConsoleList() \ + RtlReleaseResource(&ListLock) + +extern LIST_ENTRY ConsoleList; +extern RTL_RESOURCE ListLock; + +#if 0 +/* + * WARNING: Change the state of the console ONLY when the console is locked ! + */ +typedef enum _CONSOLE_STATE +{ + CONSOLE_INITIALIZING, /* Console is initializing */ + CONSOLE_RUNNING , /* Console running */ + CONSOLE_TERMINATING , /* Console about to be destroyed (but still not) */ + CONSOLE_IN_DESTRUCTION /* Console in destruction */ +} CONSOLE_STATE, *PCONSOLE_STATE; +#endif + + +VOID WINAPI ConSrvInitConsoleSupport(VOID); +NTSTATUS WINAPI ConSrvInitConsole(OUT PCONSOLE* NewConsole, + IN OUT PCONSOLE_START_INFO ConsoleStartInfo, + IN PCSR_PROCESS ConsoleLeaderProcess); +VOID WINAPI ConSrvDeleteConsole(PCONSOLE Console); +BOOL FASTCALL ConSrvValidatePointer(PCONSOLE Console); +BOOL FASTCALL ConSrvValidateConsoleState(PCONSOLE Console, + CONSOLE_STATE ExpectedState); +BOOL FASTCALL ConSrvValidateConsoleUnsafe(PCONSOLE Console, + CONSOLE_STATE ExpectedState, + BOOL LockConsole); +BOOL FASTCALL ConSrvValidateConsole(PCONSOLE Console, + CONSOLE_STATE ExpectedState, + BOOL LockConsole); + +/* EOF */ Propchange: branches/ros-csrss/win32ss/user/consrv/console.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -34,6 +34,9 @@ /* Public Win32K Headers */ #include <ntuser.h> +/* PSEH for SEH Support */ +#include <pseh/pseh2.h> + /* CSRSS Header */ #include <csr/csrsrv.h> @@ -91,6 +94,20 @@ LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS. } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA; + + +#if 1 // Temporarily put there. +/* + * WARNING: Change the state of the console ONLY when the console is locked ! + */ +typedef enum _CONSOLE_STATE +{ + CONSOLE_INITIALIZING, /* Console is initializing */ + CONSOLE_RUNNING , /* Console running */ + CONSOLE_TERMINATING , /* Console about to be destroyed (but still not) */ + CONSOLE_IN_DESTRUCTION /* Console in destruction */ +} CONSOLE_STATE, *PCONSOLE_STATE; +#endif /* alias.c */ @@ -177,12 +194,12 @@ PHANDLE pInputHandle, PHANDLE pOutputHandle, PHANDLE pErrorHandle); -VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS FASTCALL ConSrvGetConsole(PCONSOLE_PROCESS_DATA ProcessData, struct _CONSOLE** Console, BOOL LockConsole); VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* Console, - BOOL IsConsoleLocked); + BOOL WasConsoleLocked); +VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS NTAPI ConSrvNewProcess(PCSR_PROCESS SourceProcess, PCSR_PROCESS TargetProcess); Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -10,6 +10,7 @@ #include "consrv.h" #include "conio.h" +#include "console.h" #include "settings.h" #include "guiconsole.h" #include "guisettings.h" @@ -212,6 +213,13 @@ GuiConsoleHandleSysMenuCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) { LRESULT Ret = TRUE; + PCONSOLE Console = GuiData->Console; + + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + { + Ret = FALSE; + goto Quit; + } switch (wParam) { @@ -229,7 +237,6 @@ case ID_SYSTEM_EDIT_SELECTALL: { - PCONSOLE Console = GuiData->Console; COORD bottomRight = { 0, 0 }; bottomRight.X = Console->ConsoleSize.X - 1; @@ -255,15 +262,23 @@ break; default: - Ret = DefWindowProcW(GuiData->hWindow, WM_SYSCOMMAND, wParam, lParam); - break; - } + Ret = FALSE; + break; + } + + LeaveCriticalSection(&Console->Lock); + +Quit: + if (!Ret) + Ret = DefWindowProcW(GuiData->hWindow, WM_SYSCOMMAND, wParam, lParam); + return Ret; } static PGUI_CONSOLE_DATA GuiGetGuiData(HWND hWnd) { + /* This function ensures that the console pointer is not NULL */ PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)GetWindowLongPtrW(hWnd, GWLP_USERDATA); return ( ((GuiData == NULL) || (GuiData->hWindow == hWnd && GuiData->Console != NULL)) ? GuiData : NULL ); } @@ -341,6 +356,8 @@ HFONT OldFont; TEXTMETRICW Metrics; SIZE CharSize; + + DPRINT1("GuiConsoleHandleNcCreate\n"); if (NULL == GuiData) { @@ -424,12 +441,7 @@ SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); GuiConsoleCreateSysMenu(GuiData->hWindow); - /* Move and resize the window to the user's values */ - GuiConsoleMoveWindow(GuiData); - GuiData->WindowSizeLock = TRUE; - GuiConsoleResizeWindow(GuiData); - GuiData->WindowSizeLock = FALSE; - + DPRINT1("GuiConsoleHandleNcCreate - setting start event\n"); SetEvent(GuiData->hGuiInitEvent); return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create); @@ -525,8 +537,6 @@ HFONT OldFont; Buff = Console->ActiveBuffer; - - /// LOCK /// EnterCriticalSection(&Buff->Header.Console->Lock); TopLine = rc->top / GuiData->CharHeight + Buff->ShowY; BottomLine = (rc->bottom + (GuiData->CharHeight - 1)) / GuiData->CharHeight - 1 + Buff->ShowY; @@ -618,57 +628,71 @@ } } - /// LOCK /// LeaveCriticalSection(&Buff->Header.Console->Lock); - SelectObject(hDC, OldFont); } static VOID -GuiConsoleHandlePaint(PGUI_CONSOLE_DATA GuiData, HDC hDCPaint) -{ +GuiConsoleHandlePaint(PGUI_CONSOLE_DATA GuiData) +{ + BOOL Success = TRUE; PCONSOLE Console = GuiData->Console; HDC hDC; PAINTSTRUCT ps; - if (Console->ActiveBuffer == NULL) return; + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + { + Success = FALSE; + goto Quit; + } + + if (Console->ActiveBuffer == NULL || + Console->ActiveBuffer->Buffer == NULL) + { + goto Quit; + } hDC = BeginPaint(GuiData->hWindow, &ps); if (hDC != NULL && ps.rcPaint.left < ps.rcPaint.right && ps.rcPaint.top < ps.rcPaint.bottom) { - if (Console->ActiveBuffer->Buffer != NULL) - { - EnterCriticalSection(&GuiData->Lock); - - GuiConsolePaint(Console, - GuiData, - hDC, - &ps.rcPaint); - - if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) + EnterCriticalSection(&GuiData->Lock); + + GuiConsolePaint(Console, + GuiData, + hDC, + &ps.rcPaint); + + if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) + { + RECT rc; + SmallRectToRect(GuiData, &rc, &Console->Selection.srSelection); + + /* invert the selection */ + if (IntersectRect(&rc, + &ps.rcPaint, + &rc)) { - RECT rc; - SmallRectToRect(GuiData, &rc, &Console->Selection.srSelection); - - /* invert the selection */ - if (IntersectRect(&rc, - &ps.rcPaint, - &rc)) - { - PatBlt(hDC, - rc.left, - rc.top, - rc.right - rc.left, - rc.bottom - rc.top, - DSTINVERT); - } + PatBlt(hDC, + rc.left, + rc.top, + rc.right - rc.left, + rc.bottom - rc.top, + DSTINVERT); } - - LeaveCriticalSection(&GuiData->Lock); - } + } + + LeaveCriticalSection(&GuiData->Lock); } EndPaint(GuiData->hWindow, &ps); + +Quit: + if (Success) + LeaveCriticalSection(&Console->Lock); + else + DefWindowProcW(GuiData->hWindow, WM_PAINT, 0, 0); + + return; } static VOID @@ -676,6 +700,8 @@ { PCONSOLE Console = GuiData->Console; MSG Message; + + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; Message.hwnd = GuiData->hWindow; Message.message = msg; @@ -689,6 +715,8 @@ } ConioProcessKey(Console, &Message); + + LeaveCriticalSection(&Console->Lock); } static VOID @@ -705,6 +733,8 @@ PCONSOLE_SCREEN_BUFFER Buff; SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL); + + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; Buff = Console->ActiveBuffer; GuiInvalidateCell(Console, Buff->CursorPosition.X, Buff->CursorPosition.Y); @@ -782,14 +812,15 @@ GuiData->OldCursor.y = Buff->CursorPosition.Y; } } + + LeaveCriticalSection(&Console->Lock); } static VOID GuiConsoleHandleClose(PGUI_CONSOLE_DATA GuiData) { PCONSOLE Console = GuiData->Console; - - /// LOCK /// EnterCriticalSection(&Console->Lock); + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; /* * FIXME: Windows will wait up to 5 seconds for the thread to exit. @@ -798,17 +829,23 @@ */ ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_CLOSE_EVENT); - /// LOCK /// LeaveCriticalSection(&Console->Lock); -} - -static VOID -GuiConsoleHandleNcDestroy(PGUI_CONSOLE_DATA GuiData) -{ - KillTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER); - GetSystemMenu(GuiData->hWindow, TRUE); - - SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)NULL); - GuiData->hWindow = NULL; + LeaveCriticalSection(&Console->Lock); +} + +static LRESULT +GuiConsoleHandleNcDestroy(HWND hWnd) +{ + // PGUI_CONSOLE_DATA GuiData; + + KillTimer(hWnd, CONGUI_UPDATE_TIMER); + GetSystemMenu(hWnd, TRUE); + + /* Free the GuiData registration */ + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (DWORD_PTR)NULL); + // GuiData->hWindow = NULL; + + // return 0; + return DefWindowProcW(hWnd, WM_NCDESTROY, 0, 0); } static COORD @@ -835,43 +872,85 @@ return Coord; } -static VOID -GuiConsoleLeftMouseDown(PGUI_CONSOLE_DATA GuiData, LPARAM lParam) -{ +static LRESULT +GuiConsoleHandleMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) +{ + LRESULT Ret = TRUE; PCONSOLE Console = GuiData->Console; - Console->Selection.dwSelectionAnchor = PointToCoord(GuiData, lParam); - SetCapture(GuiData->hWindow); - Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS | CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; - GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); -} - -static VOID -GuiConsoleLeftMouseUp(PGUI_CONSOLE_DATA GuiData, LPARAM lParam) -{ - PCONSOLE Console = GuiData->Console; - COORD c; - - if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) return; - - c = PointToCoord(GuiData, lParam); - Console->Selection.dwFlags &= ~CONSOLE_MOUSE_DOWN; - GuiConsoleUpdateSelection(Console, &c); - ReleaseCapture(); -} - -static VOID -GuiConsoleMouseMove(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) -{ - PCONSOLE Console = GuiData->Console; - COORD c; - - if (!(wParam & MK_LBUTTON)) return; - - if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) return; - - c = PointToCoord(GuiData, lParam); /* TODO: Scroll buffer to bring c into view */ - GuiConsoleUpdateSelection(Console, &c); + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + { + Ret = FALSE; + goto Quit; + } + + switch (msg) + { + case WM_LBUTTONDOWN: + { + Console->Selection.dwSelectionAnchor = PointToCoord(GuiData, lParam); + SetCapture(GuiData->hWindow); + Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS | CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; + GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); + break; + } + + case WM_LBUTTONUP: + { + COORD c; + + if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) break; + + c = PointToCoord(GuiData, lParam); + Console->Selection.dwFlags &= ~CONSOLE_MOUSE_DOWN; + GuiConsoleUpdateSelection(Console, &c); + ReleaseCapture(); + + break; + } + + case WM_RBUTTONDOWN: + { + if (!(Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY)) + { + GuiConsolePaste(GuiData); + } + else + { + GuiConsoleCopy(GuiData); + + /* Clear the selection */ + GuiConsoleUpdateSelection(Console, NULL); + } + + break; + } + + case WM_MOUSEMOVE: + { + COORD c; + + if (!(wParam & MK_LBUTTON)) break; + if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) break; + + c = PointToCoord(GuiData, lParam); /* TODO: Scroll buffer to bring c into view */ + GuiConsoleUpdateSelection(Console, &c); + + break; + } + + default: + Ret = FALSE; + break; + } + + LeaveCriticalSection(&Console->Lock); + +Quit: + if (!Ret) + Ret = DefWindowProcW(GuiData->hWindow, msg, wParam, lParam); + + return Ret; } static VOID @@ -983,29 +1062,13 @@ } static VOID -GuiConsoleRightMouseDown(PGUI_CONSOLE_DATA GuiData) -{ - PCONSOLE Console = GuiData->Console; - - if (!(Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY)) - { - GuiConsolePaste(GuiData); - } - else - { - GuiConsoleCopy(GuiData); - - /* Clear the selection */ - GuiConsoleUpdateSelection(Console, NULL); - } -} - -static VOID GuiConsoleGetMinMaxInfo(PGUI_CONSOLE_DATA GuiData, PMINMAXINFO minMaxInfo) { PCONSOLE Console = GuiData->Console; DWORD windx, windy; + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); windy = CONGUI_MIN_HEIGHT * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); @@ -1020,12 +1083,16 @@ minMaxInfo->ptMaxTrackSize.x = windx; minMaxInfo->ptMaxTrackSize.y = windy; + + LeaveCriticalSection(&Console->Lock); } static VOID GuiConsoleResize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam) { PCONSOLE Console = GuiData->Console; + + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) @@ -1076,6 +1143,8 @@ GuiData->WindowSizeLock = FALSE; } + + LeaveCriticalSection(&Console->Lock); } /* @@ -1107,8 +1176,7 @@ } */ -static -LRESULT +static LRESULT GuiConsoleHandleScroll(PGUI_CONSOLE_DATA GuiData, UINT uMsg, WPARAM wParam) { PCONSOLE Console = GuiData->Console; @@ -1118,7 +1186,7 @@ int old_pos, Maximum; PUSHORT pShowXY; - if (GuiData == NULL) return FALSE; + if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return 0; Buff = Console->ActiveBuffer; @@ -1139,10 +1207,7 @@ sInfo.cbSize = sizeof(SCROLLINFO); sInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE | SIF_TRACKPOS; - if (!GetScrollInfo(GuiData->hWindow, fnBar, &sInfo)) - { - return FALSE; - } + if (!GetScrollInfo(GuiData->hWindow, fnBar, &sInfo)) goto Quit; old_pos = sInfo.nPos; @@ -1209,6 +1274,8 @@ UpdateWindow(GuiData->hWindow); } +Quit: + LeaveCriticalSection(&Console->Lock); return 0; } @@ -1217,14 +1284,21 @@ { LRESULT Result = 0; PGUI_CONSOLE_DATA GuiData = NULL; + PCONSOLE Console = NULL; /* - * If it's the first time we create a window - * for the terminal, just initialize it. + * - If it's the first time we create a window for the terminal, + * just initialize it and return. + * + * - If we are destroying the window, just do it and return. */ if (msg == WM_NCCREATE) { return (LRESULT)GuiConsoleHandleNcCreate(hWnd, (LPCREATESTRUCTW)lParam); + } + else if (msg == WM_NCDESTROY) + { + return GuiConsoleHandleNcDestroy(hWnd); } /* @@ -1235,24 +1309,20 @@ GuiData = GuiGetGuiData(hWnd); if (GuiData == NULL) return 0; - // TODO: If the console is about to be destroyed, leave the loop. - - /* Lock the console */ - EnterCriticalSection(&GuiData->Console->Lock); - - /* We have a console, start message dispatching. */ + /* + * Each helper function which needs the console + * has to validate and lock it. + */ + + /* We have a console, start message dispatching */ switch (msg) { case WM_CLOSE: GuiConsoleHandleClose(GuiData); break; - case WM_NCDESTROY: - GuiConsoleHandleNcDestroy(GuiData); - break; - case WM_PAINT: - GuiConsoleHandlePaint(GuiData, (HDC)wParam); + GuiConsoleHandlePaint(GuiData); break; case WM_KEYDOWN: @@ -1260,37 +1330,43 @@ case WM_SYSKEYDOWN: case WM_SYSKEYUP: case WM_CHAR: + { GuiConsoleHandleKey(GuiData, msg, wParam, lParam); break; + } case WM_TIMER: GuiConsoleHandleTimer(GuiData); break; + case WM_MOUSEMOVE: case WM_LBUTTONDOWN: - GuiConsoleLeftMouseDown(GuiData, lParam); - break; - case WM_LBUTTONUP: - GuiConsoleLeftMouseUp(GuiData, lParam); - break; - + case WM_LBUTTONDBLCLK: case WM_RBUTTONDOWN: - GuiConsoleRightMouseDown(GuiData); - break; - - case WM_MOUSEMOVE: - GuiConsoleMouseMove(GuiData, wParam, lParam); - break; + case WM_RBUTTONUP: + case WM_RBUTTONDBLCLK: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MBUTTONDBLCLK: + case WM_MOUSEWHEEL: + { + Result = GuiConsoleHandleMouse(GuiData, msg, wParam, lParam); + break; + } case WM_SYSCOMMAND: + { Result = GuiConsoleHandleSysMenuCommand(GuiData, wParam, lParam); break; + } case WM_HSCROLL: case WM_VSCROLL: + { Result = GuiConsoleHandleScroll(GuiData, msg, wParam); break; + } case WM_GETMINMAXINFO: GuiConsoleGetMinMaxInfo(GuiData, (PMINMAXINFO)lParam); @@ -1301,25 +1377,29 @@ break; case PM_APPLY_CONSOLE_INFO: - GuiApplyUserSettings(GuiData, (HANDLE)wParam, (BOOL)lParam); - break; + { + Console = GuiData->Console; // Not NULL because checked in GuiGetGuiData. + if (ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + { + GuiApplyUserSettings(GuiData, (HANDLE)wParam, (BOOL)lParam); + LeaveCriticalSection(&Console->Lock); + } + break; + } case PM_CONSOLE_BEEP: DPRINT1("Beep !!\n"); Beep(800, 200); break; - case PM_CONSOLE_SET_TITLE: - SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); - break; + // case PM_CONSOLE_SET_TITLE: + // SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); + // break; default: - Result = DefWindowProcW(GuiData->hWindow, msg, wParam, lParam); - break; - } - - /* Unlock the console */ - LeaveCriticalSection(&GuiData->Console->Lock); + Result = DefWindowProcW(hWnd, msg, wParam, lParam); + break; + } return Result; } @@ -1336,8 +1416,6 @@ HWND NewWindow; LONG WindowCount; MSG Msg; - PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)lParam; - PCONSOLE Console = GuiData->Console; switch (msg) { @@ -1349,6 +1427,9 @@ case PM_CREATE_CONSOLE: { + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)lParam; + PCONSOLE Console = GuiData->Console; + NewWindow = CreateWindowExW(WS_EX_CLIENTEDGE, GUI_CONSOLE_WINDOW_CLASS, Console->Title.Buffer, @@ -1381,7 +1462,16 @@ SendMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm); } - ShowWindow(NewWindow, (int)wParam); + /* Move and resize the window to the user's values */ + /* CAN WE DEADLOCK ?? */ + GuiConsoleMoveWindow(GuiData); + GuiData->WindowSizeLock = TRUE; + GuiConsoleResizeWindow(GuiData); + GuiData->WindowSizeLock = FALSE; + + // ShowWindow(NewWindow, (int)wParam); + ShowWindowAsync(NewWindow, (int)wParam); + DPRINT1("Window showed\n"); } return (LRESULT)NewWindow; @@ -1389,16 +1479,20 @@ case PM_DESTROY_CONSOLE: { + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)lParam; + /* * Window creation is done using a PostMessage(), so it's possible * that the window that we want to destroy doesn't exist yet. * So first empty the message queue. */ + /* while(PeekMessageW(&Msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&Msg); DispatchMessageW(&Msg); - } + }*/ + while (PeekMessageW(&Msg, NULL, 0, 0, PM_REMOVE)) ; if (GuiData->hWindow != NULL) /* && DestroyWindow(GuiData->hWindow) */ { @@ -1607,6 +1701,8 @@ Console->TermIFace.Data = NULL; DeleteCriticalSection(&GuiData->Lock); RtlFreeHeap(ConSrvHeap, 0, GuiData); + + DPRINT1("Quit GuiCleanupConsole\n"); } static VOID WINAPI @@ -1835,7 +1931,8 @@ GuiChangeTitle(PCONSOLE Console) { PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; - PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); + // PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); + SetWindowText(GuiData->hWindow, Console->Title.Buffer); } static BOOL WINAPI @@ -1916,6 +2013,7 @@ { PGUI_CONSOLE_DATA GuiData; GUI_CONSOLE_INFO TermInfo; + SIZE_T Length = 0; if (Console == NULL || ConsoleInfo == NULL) return STATUS_INVALID_PARAMETER; @@ -1984,7 +2082,9 @@ * Set up the GUI data */ + Length = min(wcslen(TermInfo.FaceName) + 1, LF_FACESIZE); // wcsnlen wcsncpy(GuiData->GuiInfo.FaceName, TermInfo.FaceName, LF_FACESIZE); + GuiData->GuiInfo.FaceName[Length] = L'\0'; GuiData->GuiInfo.FontFamily = TermInfo.FontFamily; GuiData->GuiInfo.FontSize = TermInfo.FontSize; GuiData->GuiInfo.FontWeight = TermInfo.FontWeight; @@ -2034,6 +2134,7 @@ /* Wait until initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); + DPRINT1("OK we created the console window\n"); CloseHandle(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL; Modified: branches/ros-csrss/win32ss/user/consrv/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guisettings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guisettings.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -86,7 +86,9 @@ if (!wcscmp(szValueName, L"FaceName")) { + SIZE_T Length = min(wcslen(szValue) + 1, LF_FACESIZE); // wcsnlen wcsncpy(TermInfo->FaceName, szValue, LF_FACESIZE); + TermInfo->FaceName[Length] = L'\0'; RetVal = TRUE; } else if (!wcscmp(szValueName, L"FontFamily")) @@ -150,7 +152,7 @@ return FALSE; } - SetConsoleSetting(L"FaceName", REG_SZ, (wcslen(TermInfo->FaceName) + 1) * sizeof(WCHAR), TermInfo->FaceName, L'\0'); + SetConsoleSetting(L"FaceName", REG_SZ, (wcslen(TermInfo->FaceName) + 1) * sizeof(WCHAR), TermInfo->FaceName, L'\0'); // wcsnlen SetConsoleSetting(L"FontFamily", REG_DWORD, sizeof(DWORD), &TermInfo->FontFamily, FF_DONTCARE); SetConsoleSetting(L"FontSize", REG_DWORD, sizeof(DWORD), &TermInfo->FontSize, 0); SetConsoleSetting(L"FontWeight", REG_DWORD, sizeof(DWORD), &TermInfo->FontWeight, FW_DONTCARE); @@ -269,43 +271,59 @@ pSharedInfo->hConsoleWindow = GuiData->hWindow; pSharedInfo->ShowDefaultParams = Defaults; - /* Console information */ - pSharedInfo->ci.HistoryBufferSize = Console->HistoryBufferSize; - pSharedInfo->ci.NumberOfHistoryBuffers = Console->NumberOfHistoryBuffers; - pSharedInfo->ci.HistoryNoDup = Console->HistoryNoDup; - pSharedInfo->ci.FullScreen = Console->FullScreen; - pSharedInfo->ci.QuickEdit = Console->QuickEdit; - pSharedInfo->ci.InsertMode = Console->InsertMode; - pSharedInfo->ci.InputBufferSize = 0; - pSharedInfo->ci.ScreenBufferSize = Console->ActiveBuffer->ScreenBufferSize; - pSharedInfo->ci.ConsoleSize = Console->ConsoleSize; - pSharedInfo->ci.CursorBlinkOn; - pSharedInfo->ci.ForceCursorOff; - pSharedInfo->ci.CursorSize = Console->ActiveBuffer->CursorInfo.dwSize; - pSharedInfo->ci.ScreenAttrib = Console->ActiveBuffer->ScreenDefaultAttrib; - pSharedInfo->ci.PopupAttrib = Console->ActiveBuffer->PopupDefaultAttrib; - pSharedInfo->ci.CodePage; - - /* GUI Information */ - pSharedInfo->TerminalInfo.Size = sizeof(GUI_CONSOLE_INFO); - GuiInfo = pSharedInfo->TerminalInfo.TermInfo = (PGUI_CONSOLE_INFO)(pSharedInfo + 1); - wcsncpy(GuiInfo->FaceName, GuiData->GuiInfo.FaceName, LF_FACESIZE); - GuiInfo->FontSize = (DWORD)GuiData->GuiInfo.FontSize; - GuiInfo->FontWeight = GuiData->GuiInfo.FontWeight; - GuiInfo->UseRasterFonts = GuiData->GuiInfo.UseRasterFonts; - /// GuiInfo->WindowPosition = GuiData->GuiInfo.WindowPosition; - GuiInfo->AutoPosition = GuiData->GuiInfo.AutoPosition; - GuiInfo->WindowOrigin = GuiData->GuiInfo.WindowOrigin; - /* Offsetize */ - pSharedInfo->TerminalInfo.TermInfo = (PVOID)((ULONG_PTR)GuiInfo - (ULONG_PTR)pSharedInfo); - - /* Palette */ - memcpy(pSharedInfo->ci.Colors, Console->Colors, sizeof(Console->Colors)); - - /* Title of the console, original one corresponding to the one set by the console leader */ - Length = min(sizeof(pSharedInfo->ci.ConsoleTitle) / sizeof(pSharedInfo->ci.ConsoleTitle[0]) - 1, - Console->OriginalTitle.Length / sizeof(WCHAR)); - wcsncpy(pSharedInfo->ci.ConsoleTitle, Console->OriginalTitle.Buffer, Length); + /* + * We fill-in the fields only if we display + * our properties, not the default ones. + */ + if (!Defaults) + { + /* Console information */ + pSharedInfo->ci.HistoryBufferSize = Console->HistoryBufferSize; + pSharedInfo->ci.NumberOfHistoryBuffers = Console->NumberOfHistoryBuffers; + pSharedInfo->ci.HistoryNoDup = Console->HistoryNoDup; + pSharedInfo->ci.FullScreen = Console->FullScreen; + pSharedInfo->ci.QuickEdit = Console->QuickEdit; + pSharedInfo->ci.InsertMode = Console->InsertMode; + pSharedInfo->ci.InputBufferSize = 0; + pSharedInfo->ci.ScreenBufferSize = Console->ActiveBuffer->ScreenBufferSize; + pSharedInfo->ci.ConsoleSize = Console->ConsoleSize; + pSharedInfo->ci.CursorBlinkOn; + pSharedInfo->ci.ForceCursorOff; + pSharedInfo->ci.CursorSize = Console->ActiveBuffer->CursorInfo.dwSize; + pSharedInfo->ci.ScreenAttrib = Console->ActiveBuffer->ScreenDefaultAttrib; + pSharedInfo->ci.PopupAttrib = Console->ActiveBuffer->PopupDefaultAttrib; + pSharedInfo->ci.CodePage; + + /* GUI Information */ + pSharedInfo->TerminalInfo.Size = sizeof(GUI_CONSOLE_INFO); + GuiInfo = pSharedInfo->TerminalInfo.TermInfo = (PGUI_CONSOLE_INFO)(pSharedInfo + 1); + Length = min(wcslen(GuiData->GuiInfo.FaceName) + 1, LF_FACESIZE); // wcsnlen + wcsncpy(GuiInfo->FaceName, GuiData->GuiInfo.FaceName, LF_FACESIZE); + GuiInfo->FaceName[Length] = L'\0'; + GuiInfo->FontFamily = GuiData->GuiInfo.FontFamily; + GuiInfo->FontSize = GuiData->GuiInfo.FontSize; + GuiInfo->FontWeight = GuiData->GuiInfo.FontWeight; + GuiInfo->UseRasterFonts = GuiData->GuiInfo.UseRasterFonts; + /// GuiInfo->WindowPosition = GuiData->GuiInfo.WindowPosition; + GuiInfo->AutoPosition = GuiData->GuiInfo.AutoPosition; + GuiInfo->WindowOrigin = GuiData->GuiInfo.WindowOrigin; + /* Offsetize */ + pSharedInfo->TerminalInfo.TermInfo = (PVOID)((ULONG_PTR)GuiInfo - (ULONG_PTR)pSharedInfo); + + /* Palette */ + memcpy(pSharedInfo->ci.Colors, Console->Colors, sizeof(Console->Colors)); + + /* Title of the console, original one corresponding to the one set by the console leader */ + Length = min(sizeof(pSharedInfo->ci.ConsoleTitle) / sizeof(pSharedInfo->ci.ConsoleTitle[0]) - 1, + Console->OriginalTitle.Length / sizeof(WCHAR)); + wcsncpy(pSharedInfo->ci.ConsoleTitle, Console->OriginalTitle.Buffer, Length); + } + else + { + Length = 0; + } + + /* Null-terminate the title */ pSharedInfo->ci.ConsoleTitle[Length] = L'\0'; @@ -326,29 +344,46 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error: Impossible to duplicate section handle for client ; Status = %lu\n", Status); - NtClose(hSection); - return; + goto Quit; } /* Start the properties dialog */ if (ProcessData->PropDispatcher) { - HANDLE Thread; - - Thread = CreateRemoteThread(ProcessData->Process->ProcessHandle, NULL, 0, - ProcessData->PropDispatcher, - (PVOID)hClientSection, 0, NULL); - if (NULL == Thread) - { - DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError()); - return; - } - - DPRINT1("We succeeded at creating ProcessData->PropDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); - /// WaitForSingleObject(Thread, INFINITE); - CloseHandle(Thread); - } - + _SEH2_TRY + { + HANDLE Thread = NULL; + + _SEH2_TRY + { + Thread = CreateRemoteThread(ProcessData->Process->ProcessHandle, NULL, 0, + ProcessData->PropDispatcher, + (PVOID)hClientSection, 0, NULL); + if (NULL == Thread) + { + DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError()); + } + else + { + DPRINT("ProcessData->PropDispatcher remote thread creation succeeded, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); + /// WaitForSingleObject(Thread, INFINITE); + } + } + _SEH2_FINALLY + { + CloseHandle(Thread); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("GuiConsoleShowConsoleProperties - Caught an exception, Status = %08X\n", Status); + } + _SEH2_END; + } + +Quit: /* We have finished, close the section handle */ NtClose(hSection); return; @@ -369,8 +404,6 @@ PTERMINAL_INFO TermInfo = NULL; PGUI_CONSOLE_INFO GuiInfo = NULL; - /// LOCK /// EnterCriticalSection(&Console->Lock); - /* Get the console leader process, our client */ ProcessData = CONTAINING_RECORD(Console->ProcessList.Blink, CONSOLE_PROCESS_DATA, @@ -406,51 +439,65 @@ return Status; } - /* Check that the section is well-sized */ - if ( (ViewSize < sizeof(CONSOLE_PROPS)) || - (pConInfo->TerminalInfo.Size != sizeof(GUI_CONSOLE_INFO)) || - (ViewSize < sizeof(CONSOLE_PROPS) + pConInfo->TerminalInfo.Size) ) - { - DPRINT1("Error: section bad-sized: sizeof(Section) < sizeof(CONSOLE_PROPS) + sizeof(Terminal_specific_info)\n"); - Status = STATUS_INVALID_VIEW_SIZE; - goto Quit; - } - - // TODO: Check that GuiData->hWindow == pConInfo->hConsoleWindow - - /* Set the console informations */ - ConInfo = &pConInfo->ci; - ConSrvApplyUserSettings(Console, ConInfo); - - /* Set the terminal informations - De-offsetization of the pointer */ - TermInfo = &pConInfo->TerminalInfo; - GuiInfo = TermInfo->TermInfo = (PVOID)((ULONG_PTR)pConInfo + (ULONG_PTR)TermInfo->TermInfo); - - // memcpy(&GuiData->GuiInfo, GuiInfo, sizeof(GUI_CONSOLE_INFO)); - - /* Move the window to the user's values */ - GuiData->GuiInfo.AutoPosition = GuiInfo->AutoPosition; - GuiData->GuiInfo.WindowOrigin = GuiInfo->WindowOrigin; - GuiConsoleMoveWindow(GuiData); - - InvalidateRect(GuiData->hWindow, NULL, TRUE); - - - /* - * Save settings if needed - */ - - // FIXME: Do it in the console properties applet ?? - if (SaveSettings) - { - DWORD ProcessId = HandleToUlong(ProcessData->Process->ClientId.UniqueProcess); - ConSrvWriteUserSettings(ConInfo, ProcessId); - GuiConsoleWriteUserSettings(GuiInfo, ConInfo->ConsoleTitle, ProcessId); - } - - Status = STATUS_SUCCESS; - - /// LOCK /// LeaveCriticalSection(&Console->Lock); + _SEH2_TRY + { + /* Check that the section is well-sized */ + if ( (ViewSize < sizeof(CONSOLE_PROPS)) || + (pConInfo->TerminalInfo.Size != sizeof(GUI_CONSOLE_INFO)) || + (ViewSize < sizeof(CONSOLE_PROPS) + pConInfo->TerminalInfo.Size) ) + { + DPRINT1("Error: section bad-sized: sizeof(Section) < sizeof(CONSOLE_PROPS) + sizeof(Terminal_specific_info)\n"); + Status = STATUS_INVALID_VIEW_SIZE; + _SEH2_YIELD(goto Quit); + } + + // TODO: Check that GuiData->hWindow == pConInfo->hConsoleWindow + + /* Retrieve terminal informations */ + ConInfo = &pConInfo->ci; + TermInfo = &pConInfo->TerminalInfo; + GuiInfo = TermInfo->TermInfo = (PVOID)((ULONG_PTR)pConInfo + (ULONG_PTR)TermInfo->TermInfo); + + /* + * If we don't set the default parameters, + * apply them, otherwise just save them. + */ + if (pConInfo->ShowDefaultParams == FALSE) + { + /* Set the console informations */ + ConSrvApplyUserSettings(Console, ConInfo); + + /* Set the terminal informations */ + + // memcpy(&GuiData->GuiInfo, GuiInfo, sizeof(GUI_CONSOLE_INFO)); + + /* Move the window to the user's values */ + GuiData->GuiInfo.AutoPosition = GuiInfo->AutoPosition; + GuiData->GuiInfo.WindowOrigin = GuiInfo->WindowOrigin; + GuiConsoleMoveWindow(GuiData); + + InvalidateRect(GuiData->hWindow, NULL, TRUE); + } + + /* + * Save settings if needed + */ + // FIXME: Do it in the console properties applet ?? + if (SaveSettings) + { + DWORD ProcessId = HandleToUlong(ProcessData->Process->ClientId.UniqueProcess); + ConSrvWriteUserSettings(ConInfo, ProcessId); + GuiConsoleWriteUserSettings(GuiInfo, ConInfo->ConsoleTitle, ProcessId); + } + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("GuiApplyUserSettings - Caught an exception, Status = %08X\n", Status); + } + _SEH2_END; Quit: /* Finally, close the section and return */ Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -10,8 +10,9 @@ #include "consrv.h" #include "conio.h" - -//#define NDEBUG +#include "console.h" + +#define NDEBUG #include <debug.h> @@ -22,7 +23,7 @@ { Object_t *Object = Entry->Object; - DPRINT1("AdjustHandleCounts(0x%p, %d), Object = 0x%p, Object->HandleCount = %d, Object->Type = %lu\n", Entry, Change, Object, Object->HandleCount, Object->Type); + DPRINT("AdjustHandleCounts(0x%p, %d), Object = 0x%p, Object->HandleCount = %d, Object->Type = %lu\n", Entry, Change, Object, Object->HandleCount, Object->Type); if (Entry->Access & GENERIC_READ) Object->AccessRead += Change; if (Entry->Access & GENERIC_WRITE) Object->AccessWrite += Change; @@ -236,8 +237,6 @@ static VOID ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData) { - DPRINT1("ConSrvFreeHandlesTable\n"); - RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (ProcessData->HandleTable != NULL) @@ -267,12 +266,13 @@ BOOL Inheritable, DWORD ShareMode) { -#define IO_HANDLES_INCREMENT 2*3 +#define IO_HANDLES_INCREMENT 2 * 3 ULONG i; PCONSOLE_IO_HANDLE Block; - RtlEnterCriticalSection(&ProcessData->HandleTableLock); + // NOTE: Commented out because calling code always lock HandleTableLock before. + // RtlEnterCriticalSection(&ProcessData->HandleTableLock); for (i = 0; i < ProcessData->HandleTableSize; i++) { @@ -289,7 +289,7 @@ IO_HANDLES_INCREMENT) * sizeof(CONSOLE_IO_HANDLE)); if (Block == NULL) { - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_UNSUCCESSFUL; } RtlCopyMemory(Block, @@ -307,7 +307,7 @@ ConSrvCreateHandleEntry(&ProcessData->HandleTable[i]); *Handle = ULongToHandle((i << 2) | 0x3); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_SUCCESS; } @@ -329,11 +329,9 @@ return STATUS_INVALID_HANDLE; } - DPRINT1("ConSrvRemoveObject - Process 0x%p, Release 0x%p\n", ProcessData->Process, &ProcessData->HandleTable[h]); ConSrvCloseHandleEntry(&ProcessData->HandleTable[h]); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_SUCCESS; } @@ -376,16 +374,24 @@ return STATUS_INVALID_HANDLE; } - _InterlockedIncrement(&ObjectEntry->Console->ReferenceCount); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - if (LockConsole) EnterCriticalSection(&ObjectEntry->Console->Lock); - - /* Return the objects to the caller */ - *Object = ObjectEntry; - if (Entry) *Entry = HandleEntry; - - return STATUS_SUCCESS; + if (ConSrvValidateConsole(ObjectEntry->Console, CONSOLE_RUNNING, LockConsole)) + { + _InterlockedIncrement(&ObjectEntry->Console->ReferenceCount); + + /* Return the objects to the caller */ + *Object = ObjectEntry; + if (Entry) *Entry = HandleEntry; + + // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return STATUS_SUCCESS; + } + else + { + // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return STATUS_INVALID_HANDLE; + } } VOID @@ -464,6 +470,13 @@ PHANDLE pErrorHandle) { NTSTATUS Status = STATUS_SUCCESS; + + /* Validate and lock the console */ + if (!ConSrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) + { + // FIXME: Find another status code + return STATUS_UNSUCCESSFUL; + } /* Inherit the console */ ProcessData->Console = Console; @@ -479,7 +492,7 @@ { DPRINT1("Failed to initialize the handles table\n"); ProcessData->Console = NULL; - return Status; + goto Quit; } } @@ -494,7 +507,7 @@ DPRINT1("NtDuplicateObject() failed: %lu\n", Status); ConSrvFreeHandlesTable(ProcessData); // NOTE: Always free the handles table. ProcessData->Console = NULL; - return Status; + goto Quit; } /* Insert the process into the processes list of the console */ @@ -506,29 +519,34 @@ /* Update the internal info of the terminal */ ConioRefreshInternalInfo(ProcessData->Console); - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + +Quit: + /* Unlock the console and return */ + LeaveCriticalSection(&Console->Lock); + return Status; } VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData) { - PCONSOLE Console; + PCONSOLE Console = ProcessData->Console; DPRINT1("ConSrvRemoveConsole\n"); - /* Close all console handles and free the handle table memory */ - ConSrvFreeHandlesTable(ProcessData); - - /* Detach process from console */ - Console = ProcessData->Console; - if (Console != NULL) - { - DPRINT1("ConSrvRemoveConsole - Console->ReferenceCount = %lu - We are going to decrement it !\n", Console->ReferenceCount); + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + /* Validate and lock the console */ + if (ConSrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) + { + DPRINT1("ConSrvRemoveConsole - Locking OK\n"); + + /* Close all console handles and free the handles table */ + ConSrvFreeHandlesTable(ProcessData); + + /* Detach the process from the console */ ProcessData->Console = NULL; - - EnterCriticalSection(&Console->Lock); - DPRINT1("ConSrvRemoveConsole - Locking OK\n"); /* Remove ourselves from the console's list of processes */ RemoveEntryList(&ProcessData->ConsoleLink); @@ -537,10 +555,105 @@ ConioRefreshInternalInfo(Console); /* Release the console */ + DPRINT1("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); ConSrvReleaseConsole(Console, TRUE); //CloseHandle(ProcessData->ConsoleEvent); //ProcessData->ConsoleEvent = NULL; } + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); +} + +BOOL +FASTCALL +ConSrvValidatePointer(PCONSOLE Console) +{ + PLIST_ENTRY ConsoleEntry; + PCONSOLE CurrentConsole = NULL; + + if (!Console) return FALSE; + + /* The console list must be locked */ + // ASSERT(Console_list_locked); + + ConsoleEntry = ConsoleList.Flink; + while (ConsoleEntry != &ConsoleList) + { + CurrentConsole = CONTAINING_RECORD(ConsoleEntry, CONSOLE, Entry); + ConsoleEntry = ConsoleEntry->Flink; + if (CurrentConsole == Console) return TRUE; + } + + return FALSE; +} + +BOOL +FASTCALL +ConSrvValidateConsoleState(PCONSOLE Console, + CONSOLE_STATE ExpectedState) +{ + // if (!Console) return FALSE; + + /* The console must be locked */ + // ASSERT(Console_locked); + + return (Console->State == ExpectedState); +} + +BOOL +FASTCALL +ConSrvValidateConsoleUnsafe(PCONSOLE Console, + CONSOLE_STATE ExpectedState, + BOOL LockConsole) +{ + if (!Console) return FALSE; + + /* + * Lock the console to forbid possible console's state changes + * (which must be done when the console is already locked). + * If we don't want to lock it, it's because the lock is already + * held. So there must be no problems. + */ + if (LockConsole) EnterCriticalSection(&Console->Lock); + + // ASSERT(Console_locked); + + /* Check whether the console's state is what we expect */ + if (!ConSrvValidateConsoleState(Console, ExpectedState)) + { + if (LockConsole) LeaveCriticalSection(&Console->Lock); + return FALSE; + } + + return TRUE; +} + +BOOL +FASTCALL +ConSrvValidateConsole(PCONSOLE Console, + CONSOLE_STATE ExpectedState, + BOOL LockConsole) +{ + BOOL RetVal = FALSE; + + if (!Console) return FALSE; + + /* + * Forbid creation or deletion of consoles when + * checking for the existence of a console. + */ + ConSrvLockConsoleListShared(); + + if (ConSrvValidatePointer(Console)) + { + RetVal = ConSrvValidateConsoleUnsafe(Console, + ExpectedState, + LockConsole); + } + + /* Unlock the console list and return */ + ConSrvUnlockConsoleList(); + return RetVal; } NTSTATUS @@ -549,37 +662,53 @@ PCONSOLE* Console, BOOL LockConsole) { + NTSTATUS Status = STATUS_SUCCESS; PCONSOLE ProcessConsole; RtlEnterCriticalSection(&ProcessData->HandleTableLock); ProcessConsole = ProcessData->Console; - if (!ProcessConsole) + if (ConSrvValidateConsole(ProcessConsole, CONSOLE_RUNNING, LockConsole)) + { + InterlockedIncrement(&ProcessConsole->ReferenceCount); + *Console = ProcessConsole; + } + else { *Console = NULL; - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_INVALID_HANDLE; - } - - InterlockedIncrement(&ProcessConsole->ReferenceCount); + Status = STATUS_INVALID_HANDLE; + } + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - - if (LockConsole) EnterCriticalSection(&ProcessConsole->Lock); - - *Console = ProcessConsole; - - return STATUS_SUCCESS; + return Status; } VOID FASTCALL ConSrvReleaseConsole(PCONSOLE Console, - BOOL IsConsoleLocked) -{ - if (IsConsoleLocked) LeaveCriticalSection(&Console->Lock); - - /* Decrement reference count */ - if (_InterlockedDecrement(&Console->ReferenceCount) == 0) - ConSrvDeleteConsole(Console); + BOOL WasConsoleLocked) +{ + LONG RefCount = 0; + + if (!Console) return; + // if (Console->ReferenceCount == 0) return; // This shouldn't happen + ASSERT(Console->ReferenceCount > 0); + + /* The console must be locked */ + // ASSERT(Console_locked); + + /* + * Decrement the reference count. Save the new value too, + * because Console->ReferenceCount might be modified after + * the console gets unlocked but before we check whether we + * can destroy it. + */ + RefCount = _InterlockedDecrement(&Console->ReferenceCount); + + /* Unlock the console if needed */ + if (WasConsoleLocked) LeaveCriticalSection(&Console->Lock); + + /* Delete the console if needed */ + if (RefCount <= 0) ConSrvDeleteConsole(Console); } NTSTATUS @@ -745,8 +874,6 @@ * This function is called whenever a new process (GUI or CUI) is destroyed. **************************************************************************/ - DPRINT1("ConSrvDisconnect\n"); - if ( ProcessData->Console != NULL || ProcessData->HandleTable != NULL ) { @@ -828,6 +955,7 @@ } } + /* Insert the new handle inside the process handles table */ ApiMessage->Status = ConSrvInsertObject(ProcessData, &DuplicateHandleRequest->ConsoleHandle, // Use the new handle value! Entry->Object, Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Sat Mar 30 18:44:56 2013 @@ -10,6 +10,7 @@ #include "consrv.h" #include "conio.h" +#include "console.h" #define NDEBUG #include <debug.h>

1 0

[tfaber] 58614: [USER32] - Apply Wine commit 84075591 (user32: Don't access past the file size when loading a cursor/icon) by Alexandre Julliard. - Add a few consts (also from Wine). CORE-7027 #com...
by tfaber＠svn.reactos.org 30 Mar '13

30 Mar '13

Author: tfaber Date: Sat Mar 30 11:17:54 2013 New Revision: 58614 URL: http://svn.reactos.org/svn/reactos?rev=58614&view=rev Log: [USER32] - Apply Wine commit 84075591 (user32: Don't access past the file size when loading a cursor/icon) by Alexandre Julliard. - Add a few consts (also from Wine). CORE-7027 #comment Ldr and Mm are doing everything right. UPX in fact broke the resource section, and LoadImage is just not handling that correctly. #resolve Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Sat Mar 30 11:17:54 2013 @@ -260,7 +260,7 @@ * The following macro functions account for the irregularities of * accessing cursor and icon resources in files and resource entries. */ -typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, +typedef BOOL (*fnGetCIEntry)( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ); /********************************************************************** @@ -268,7 +268,7 @@ * * Find the icon closest to the requested size and bit depth. */ -static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, +static int CURSORICON_FindBestIcon( LPCVOID dir, DWORD size, fnGetCIEntry get_entry, int width, int height, int depth ) { int i, cx, cy, bits, bestEntry = -1; @@ -278,7 +278,7 @@ /* Find Best Fit */ iTotalDiff = 0xFFFFFFFF; iColorDiff = 0xFFFFFFFF; - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { iTempXDiff = abs(width - cx); iTempYDiff = abs(height - cy); @@ -292,7 +292,7 @@ } /* Find Best Colors for Best Fit */ - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { @@ -308,13 +308,15 @@ return bestEntry; } -static BOOL CURSORICON_GetResIconEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ) { - CURSORICONDIR *resdir = dir; - ICONRESDIR *icon; + const CURSORICONDIR *resdir = dir; + const ICONRESDIR *icon; if ( resdir->idCount <= n ) + return FALSE; + if ((const char *)&resdir->idEntries[n + 1] - (const char *)dir > size) return FALSE; icon = &resdir->idEntries[n].ResInfo.icon; *width = icon->bWidth; @@ -330,7 +332,7 @@ * * FIXME: parameter 'color' ignored. */ -static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, +static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_entry, int width, int height, int depth ) { int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; @@ -342,7 +344,7 @@ /* First find the largest one smaller than or equal to the requested size*/ maxwidth = maxheight = 0; - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if ((cx <= width) && (cy <= height) && (cx > maxwidth) && (cy > maxheight)) @@ -357,7 +359,7 @@ /* Now find the smallest one larger than the requested size */ maxwidth = maxheight = 255; - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if (((cx < maxwidth) && (cy < maxheight)) || (bestEntry == -1)) { @@ -370,13 +372,15 @@ return bestEntry; } -static BOOL CURSORICON_GetResCursorEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetResCursorEntry( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ) { - CURSORICONDIR *resdir = dir; - CURSORDIR *cursor; + const CURSORICONDIR *resdir = dir; + const CURSORDIR *cursor; if ( resdir->idCount <= n ) + return FALSE; + if ((const char *)&resdir->idEntries[n + 1] - (const char *)dir > size) return FALSE; cursor = &resdir->idEntries[n].ResInfo.cursor; *width = cursor->wWidth; @@ -385,60 +389,62 @@ return TRUE; } -static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, - int width, int height, int depth ) +static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, DWORD size, + int width, int height, int depth ) { int n; - n = CURSORICON_FindBestIcon( dir, CURSORICON_GetResIconEntry, + n = CURSORICON_FindBestIcon( dir, size, CURSORICON_GetResIconEntry, width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } -static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, - int width, int height, int depth ) -{ - int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetResCursorEntry, +static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, DWORD size, + int width, int height, int depth ) +{ + int n = CURSORICON_FindBestCursor( dir, size, CURSORICON_GetResCursorEntry, width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } -static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ) { - CURSORICONFILEDIR *filedir = dir; - CURSORICONFILEDIRENTRY *entry; - BITMAPINFOHEADER *info; + const CURSORICONFILEDIR *filedir = dir; + const CURSORICONFILEDIRENTRY *entry; + const BITMAPINFOHEADER *info; if ( filedir->idCount <= n ) return FALSE; + if ((const char *)&filedir->idEntries[n + 1] - (const char *)dir > size) + return FALSE; entry = &filedir->idEntries[n]; - /* FIXME: check against file size */ - info = (BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset); + info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); + if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; *width = entry->bWidth; *height = entry->bHeight; *bits = info->biBitCount; return TRUE; } -static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, - int width, int height, int depth ) -{ - int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetFileEntry, +static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, DWORD size, + int width, int height, int depth ) +{ + int n = CURSORICON_FindBestCursor( dir, size, CURSORICON_GetFileEntry, width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } -static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *dir, - int width, int height, int depth ) -{ - int n = CURSORICON_FindBestIcon( dir, CURSORICON_GetFileEntry, +static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *dir, DWORD size, + int width, int height, int depth ) +{ + int n = CURSORICON_FindBestIcon( dir, size, CURSORICON_GetFileEntry, width, height, depth ); if ( n < 0 ) return NULL; @@ -747,7 +753,8 @@ icon_data = fram_chunk.data + (2 * sizeof(DWORD)); entry = CURSORICON_FindBestIconFile( (CURSORICONFILEDIR *) icon_data, - width, height, depth ); + bits + bits_size - icon_data, + width, height, depth ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize ); memcpy( frame_bits, icon_data + entry->dwDIBOffset, entry->dwDIBSize ); @@ -850,9 +857,9 @@ goto end; if ( fCursor ) - entry = CURSORICON_FindBestCursorFile( dir, width, height, depth ); + entry = CURSORICON_FindBestCursorFile( dir, filesize, width, height, depth ); else - entry = CURSORICON_FindBestIconFile( dir, width, height, depth ); + entry = CURSORICON_FindBestIconFile( dir, filesize, width, height, depth ); if ( !entry ) goto end; @@ -887,6 +894,7 @@ HICON hIcon = 0; HRSRC hRsrc; //HRSRC hGroupRsrc; + DWORD size; CURSORICONDIR *dir; CURSORICONDIRENTRY *dirEntry; LPBYTE bits; @@ -915,10 +923,11 @@ if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(dir = LockResource( handle ))) return 0; + size = SizeofResource( hInstance, hRsrc ); if (fCursor) - dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); + dirEntry = CURSORICON_FindBestCursorRes( dir, size, width, height, depth ); else - dirEntry = CURSORICON_FindBestIconRes( dir, width, height, depth ); + dirEntry = CURSORICON_FindBestIconRes( dir, size, width, height, depth ); if (!dirEntry) return 0; wResId = dirEntry->wResId; dwBytesInRes = dirEntry->dwBytesInRes; @@ -1285,9 +1294,9 @@ ReleaseDC(0, hdc); if( bIcon ) - entry = CURSORICON_FindBestIconRes( dir, width, height, depth ); + entry = CURSORICON_FindBestIconRes( dir, ~0u, width, height, depth ); else - entry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); + entry = CURSORICON_FindBestCursorRes( dir, ~0u, width, height, depth ); if( entry ) retVal = entry->wResId; }

1 0

[tkreuzer] 58613: [NTDLL_APITEST] Add more tests for NtAllocateVirtualMemory and NtMapViewOfSection
by tkreuzer＠svn.reactos.org 27 Mar '13

27 Mar '13

Author: tkreuzer Date: Wed Mar 27 19:10:51 2013 New Revision: 58613 URL: http://svn.reactos.org/svn/reactos?rev=58613&view=rev Log: [NTDLL_APITEST] Add more tests for NtAllocateVirtualMemory and NtMapViewOfSection Added: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c (with props) trunk/rostests/apitests/testdata/test.dll (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Wed Mar 27 19:10:51 2013 @@ -3,6 +3,7 @@ LdrEnumResources.c NtAllocateVirtualMemory.c NtFreeVirtualMemory.c + NtMapViewOfSection.c NtQuerySystemEnvironmentValue.c RtlBitmap.c RtlDetermineDosPathNameType.c Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Wed Mar 27 19:10:51 2013 @@ -9,6 +9,7 @@ #include <wine/test.h> #include <ndk/rtlfuncs.h> #include <ndk/mmfuncs.h> +#include <pseh/pseh2.h> static PVOID Allocations[4096] = { NULL }; static ULONG CurrentAllocation = 0; @@ -198,6 +199,275 @@ return TRUE; } +VOID +CheckSize(ULONG_PTR Base, SIZE_T InSize, SIZE_T ExpectedSize) +{ + NTSTATUS Status; + PVOID BaseAddress; + SIZE_T Size; + + /* Reserve memory */ + BaseAddress = UlongToPtr(Base); + Size = InSize; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok(BaseAddress == UlongToPtr(Base & ~0xFFFF), "Got back wrong base address: %p\n", BaseAddress); + ok(Size == ExpectedSize, "Alloc of 0x%Ix: got back wrong size: 0x%Ix, expected 0x%Ix\n", InSize, Size, ExpectedSize); + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); +} + +VOID +CheckAlignment() +{ + NTSTATUS Status; + PVOID BaseAddress; + SIZE_T Size; + + CheckSize(0x50000000, 0x0001, 0x1000); + CheckSize(0x50008000, 0x0001, 0x9000); + CheckSize(0x50000010, 0x1000, 0x2000); + CheckSize(0x50010000, 0x2000, 0x2000); + CheckSize(0x5000FFFF, 0x3000, 0x13000); + CheckSize(0x50001010, 0x7000, 0x9000); + CheckSize(0x50001010, 0xC000, 0xe000); + + /* Reserve memory not aligned to allocation granularity */ + BaseAddress = UlongToPtr(0x50001010); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok(BaseAddress == UlongToPtr(0x50000000), "Got back wrong base address: %p", BaseAddress); + ok(Size == 0x3000, "Got back wrong size: 0x%Ix", Size); + + /* Try to reserve again in the same 64k region */ + BaseAddress = UlongToPtr(0x50008000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_NOACCESS); + ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail!\n"); + + /* Commit memory */ + BaseAddress = UlongToPtr(0x50002000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok(BaseAddress == UlongToPtr(0x50002000), "Got back wrong base address: %p", BaseAddress); + ok(Size == 0x1000, "Got back wrong size: 0x%Ix", Size); + + /* Commit memory */ + BaseAddress = UlongToPtr(0x50003000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_NOACCESS); + ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail!\n"); + + /* Try to release memory in a different 64k region */ + BaseAddress = UlongToPtr(0x50010000); + Size = 0x1000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); + + /* Release the memory in the same 64k region at a different address */ + BaseAddress = UlongToPtr(0x50008000); + Size = 0x1000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + + /* Release the memory at the correct address but with wrong size */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x4000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); + + /* Release the memory */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x3000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + + /* Reserve and commit at once */ + BaseAddress = UlongToPtr(0x50004080); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok(BaseAddress == UlongToPtr(0x50000000), "Got back wrong base address: %p", BaseAddress); + ok(Size == 0x6000, "Got back wrong size: 0x%Ix", Size); + + _SEH2_TRY + { + *(int*)UlongToPtr(BaseAddress) = 1; + *(int*)UlongToPtr(0x50004080) = 1; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Got exception\n"); + } + _SEH2_END; + + /* Release the memory */ + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + +} + +static +VOID +CheckAdjacentVADs() +{ + NTSTATUS Status; + PVOID BaseAddress; + SIZE_T Size; + + /* Reserve a full 64k region */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x10000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + if (!NT_SUCCESS(Status)) + return; + + /* Reserve another 64k region, but with 64k between */ + BaseAddress = UlongToPtr(0x50020000); + Size = 0x10000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + if (!NT_SUCCESS(Status)) + return; + + /* Try to free the whole at once */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x30000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); + + /* Reserve the part in the middle */ + BaseAddress = UlongToPtr(0x50010000); + Size = 0x10000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + + /* Try to commit memory covering 2 allocations */ + BaseAddress = UlongToPtr(0x50004000); + Size = 0x10000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_NOACCESS); + ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail!\n"); + + /* Allocate a page */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + + /* Allocate another page */ + BaseAddress = UlongToPtr(0x50002000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + + _SEH2_TRY + { + *(int*)UlongToPtr(0x50000000) = 1; + //*(int*)UlongToPtr(0x50002000) = 1; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Got exception\n"); + } + _SEH2_END; + + /* Allocate 3 pages, on top of the previous 2 */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x3000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + + /* Try to free the whole region at once */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x30000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); + + BaseAddress = UlongToPtr(0x50000000); + Size = 0x10000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + + BaseAddress = UlongToPtr(0x50010000); + Size = 0x10000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + + BaseAddress = UlongToPtr(0x50020000); + Size = 0x10000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + +} + #define RUNS 32 START_TEST(NtAllocateVirtualMemory) @@ -205,6 +475,9 @@ PVOID Mem1, Mem2; SIZE_T Size1, Size2; ULONG i; + + CheckAlignment(); + CheckAdjacentVADs(); Size1 = 32; Mem1 = Allocate(Size1); Added: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c (added) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Wed Mar 27 19:10:51 2013 @@ -1,0 +1,390 @@ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <ndk/ntndk.h> +#include <pseh/pseh2.h> + +NTSYSAPI +NTSTATUS +NTAPI +NtMapViewOfSection( + HANDLE SectionHandle, + HANDLE ProcessHandle, + PVOID *BaseAddress, + ULONG_PTR ZeroBits, + SIZE_T CommitSize, + PLARGE_INTEGER SectionOffset, + PSIZE_T ViewSize, + SECTION_INHERIT InheritDisposition, + ULONG AllocationType, + ULONG Protect); + +void +Test_PageFileSection(void) +{ + NTSTATUS Status; + HANDLE SectionHandle; + LARGE_INTEGER MaximumSize, SectionOffset; + PVOID BaseAddress; + SIZE_T ViewSize; + + /* Create a page file backed section */ + MaximumSize.QuadPart = 0x20000; + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + NULL, + &MaximumSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + ok(NT_SUCCESS(Status), "NtCreateSection failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; + + /* Try to map a page at an address that is not 64k aligned */ + BaseAddress = (PVOID)0x30001000; + SectionOffset.QuadPart = 0; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok(Status == STATUS_MAPPED_ALIGNMENT, + "NtMapViewOfSection returned wrong Status %lx\n", Status); + + /* Try to map a page with execute rights */ + BaseAddress = (PVOID)0x30000000; + SectionOffset.QuadPart = 0; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_EXECUTE_READWRITE); + ok(Status == STATUS_SECTION_PROTECTION, + "NtMapViewOfSection returned wrong Status %lx\n", Status); + + /* Map 2 pages, not comitting them */ + BaseAddress = (PVOID)0x30000000; + SectionOffset.QuadPart = 0; + ViewSize = 0x2000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; + + /* Commit a page in the section */ + BaseAddress = (PVOID)0x30000000; + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + + /* Try to commit a range larger than the section */ + BaseAddress = (PVOID)0x30000000; + ViewSize = 0x3000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_READWRITE); + ok(Status == STATUS_CONFLICTING_ADDRESSES, + "NtAllocateVirtualMemory failed with wrong Status %lx\n", Status); + + /* Try to commit a page after the section */ + BaseAddress = (PVOID)0x30002000; + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_READWRITE); + ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory Should fail\n"); + + /* Try to allocate a page after the section */ + BaseAddress = (PVOID)0x30002000; + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail\n"); + + /* Need to go to next 64k boundary */ + BaseAddress = (PVOID)0x30010000; + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; + + /* Free the allocation */ + BaseAddress = (PVOID)0x30010000; + ViewSize = 0x1000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed with Status %lx\n", Status); + + /* Free the section mapping */ + BaseAddress = (PVOID)0x30000000; + ViewSize = 0x1000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_RELEASE); + ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, + "NtFreeVirtualMemory failed with wrong Status %lx\n", Status); + + /* Commit a page in the section */ + BaseAddress = (PVOID)0x30001000; + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + + /* Try to decommit the page */ + BaseAddress = (PVOID)0x30001000; + ViewSize = 0x1000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_DECOMMIT); + ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, + "NtFreeVirtualMemory failed with wrong Status %lx\n", Status); + + BaseAddress = (PVOID)0x40000000; + SectionOffset.QuadPart = 0; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; + + ok(BaseAddress == (PVOID)0x40000000, "Invalid BaseAddress: %p", BaseAddress); + + BaseAddress = (PVOID)0x40080000; + SectionOffset.QuadPart = 0x10000; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; + + ok(BaseAddress == (PVOID)0x40080000, "Invalid BaseAddress: %p", BaseAddress); + + /* Commit a page in the section */ + BaseAddress = (PVOID)0x40000000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_READWRITE); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; + +} + +void +Test_ImageSection(void) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + OBJECT_ATTRIBUTES FileObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle, DataSectionHandle, ImageSectionHandle; + PVOID DataBase, ImageBase; + SIZE_T ViewSize; + + if (!RtlDosPathNameToNtPathName_U(L"testdata\\test.dll", + &FileName, + NULL, + NULL)) + { + ok(0, "RtlDosPathNameToNtPathName_U failed\n"); + return; + } + + InitializeObjectAttributes(&FileObjectAttributes, + &FileName, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, + &FileObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + ok(Status == STATUS_SUCCESS, "NtOpenFile failed, Status 0x%lx\n", Status); + + /* Create a data section with write access */ + Status = NtCreateSection(&DataSectionHandle, + SECTION_ALL_ACCESS, // DesiredAccess + NULL, // ObjectAttributes + NULL, // MaximumSize + PAGE_READWRITE, // SectionPageProtection + SEC_COMMIT, // AllocationAttributes + FileHandle); + ok(Status == STATUS_SUCCESS, "NtCreateSection failed, Status 0x%lx\n", Status); + + /* Map the data section */ + DataBase = NULL; + ViewSize = 0; + Status = NtMapViewOfSection(DataSectionHandle, + NtCurrentProcess(), + &DataBase, + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); + + /* Check the original data */ + ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); + + /* Now modify the data in the data section */ + *(ULONG*)DataBase = 0xdeadbabe; + + /* Check the data */ + ok(*(ULONG*)DataBase == 0xdeadbabe, "Header not ok\n"); + + /* Now try to create an image section */ + Status = NtCreateSection(&ImageSectionHandle, + SECTION_ALL_ACCESS, // DesiredAccess + NULL, // ObjectAttributes + NULL, // MaximumSize + PAGE_READWRITE, // SectionPageProtection + SEC_IMAGE, // AllocationAttributes + FileHandle); + ok(Status == STATUS_INVALID_IMAGE_NOT_MZ, "NtCreateSection failed, Status 0x%lx\n", Status); + + /* Restore the original data */ + *(ULONG*)DataBase = 0x00905a4d; + + /* Try to create an image section again */ + Status = NtCreateSection(&ImageSectionHandle, + SECTION_ALL_ACCESS, // DesiredAccess + NULL, // ObjectAttributes + NULL, // MaximumSize + PAGE_READWRITE, // SectionPageProtection + SEC_IMAGE, // AllocationAttributes + FileHandle); + ok(Status == STATUS_SUCCESS, "NtCreateSection failed, Status 0x%lx\n", Status); + + /* Map the image section */ + ImageBase = NULL; + ViewSize = 0; + Status = NtMapViewOfSection(ImageSectionHandle, + NtCurrentProcess(), + &ImageBase, + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_READONLY); + ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); + + /* Check the data */ + ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); + ok(*(ULONG*)ImageBase == 0x00905a4d, "Header not ok\n"); + + /* Now modify the data again */ + *(ULONG*)DataBase = 0xdeadbabe; + + /* Check the data */ + ok(*(ULONG*)DataBase == 0xdeadbabe, "Header not ok\n"); + ok(*(ULONG*)ImageBase == 0x00905a4d, "Data should not be synced!\n"); + + /* Flush the view */ + ViewSize = 0x1000; + Status = NtFlushVirtualMemory(NtCurrentProcess(), + &DataBase, + &ViewSize, + &IoStatusBlock); + ok(Status == STATUS_SUCCESS, "NtFlushVirtualMemory failed, Status 0x%lx\n", Status); + + /* Check the data again */ + ok(*(ULONG*)ImageBase == 0x00905a4d, "Data should not be synced!\n"); + + /* Restore the original data */ + *(ULONG*)DataBase = 0x00905a4d; + ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); + + /* Cleanup */ + NtUnmapViewOfSection(NtCurrentProcess(), ImageBase); + NtUnmapViewOfSection(NtCurrentProcess(), DataBase); + NtClose(ImageSectionHandle); + NtClose(DataSectionHandle); + NtClose(FileHandle); +} + +START_TEST(NtMapViewOfSection) +{ + //Test_PageFileSection(); + Test_ImageSection(); +} Propchange: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Wed Mar 27 19:10:51 2013 @@ -6,6 +6,7 @@ extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); +extern void func_NtMapViewOfSection(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtSystemInformation(void); extern void func_RtlBitmap(void); @@ -26,6 +27,7 @@ { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, + { "NtMapViewOfSection", func_NtMapViewOfSection }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtSystemInformation", func_NtSystemInformation }, { "RtlBitmapApi", func_RtlBitmap }, Added: trunk/rostests/apitests/testdata/test.dll URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.dl… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/testdata/test.dll ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 58612: [USP10_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 26 Mar '13

26 Mar '13

Author: akhaldi Date: Tue Mar 26 19:16:39 2013 New Revision: 58612 URL: http://svn.reactos.org/svn/reactos?rev=58612&view=rev Log: [USP10_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/usp10/CMakeLists.txt trunk/rostests/winetests/usp10/testlist.c trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/CMakeList… ============================================================================== --- trunk/rostests/winetests/usp10/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/CMakeLists.txt [iso-8859-1] Tue Mar 26 19:16:39 2013 @@ -1,7 +1,7 @@ add_definitions( -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__WINESRC__) add_executable(usp10_winetest usp10.c testlist.c) target_link_libraries(usp10_winetest wine) Modified: trunk/rostests/winetests/usp10/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/testlist.… ============================================================================== --- trunk/rostests/winetests/usp10/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/testlist.c [iso-8859-1] Tue Mar 26 19:16:39 2013 @@ -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_usp10(void); Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Tue Mar 26 19:16:39 2013 @@ -28,7 +28,10 @@ #include <stdio.h> #include <wine/test.h> -#include <windows.h> +#include <winnls.h> +#include <wingdi.h> +#include <winuser.h> +//#include <windows.h> #include <usp10.h> typedef struct _itemTest { @@ -1791,9 +1794,9 @@ ok (hr == S_OK, "ScriptGetCMap should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok(pwOutGlyphs3[0] == pwOutGlyphs2[0], "glyph incorrectly altered\n"); - ok(pwOutGlyphs3[1] == pwOutGlyphs2[1], "glyph incorreclty altered\n"); - ok(pwOutGlyphs3[2] == pwOutGlyphs2[2], "glyph incorreclty altered\n"); - ok(pwOutGlyphs3[3] == pwOutGlyphs2[3], "glyph incorreclty altered\n"); + ok(pwOutGlyphs3[1] == pwOutGlyphs2[1], "glyph incorrectly altered\n"); + ok(pwOutGlyphs3[2] == pwOutGlyphs2[2], "glyph incorrectly altered\n"); + ok(pwOutGlyphs3[3] == pwOutGlyphs2[3], "glyph incorrectly altered\n"); ok(pwOutGlyphs3[4] == pwOutGlyphs2[4], "glyph not mirrored correctly\n"); ok(pwOutGlyphs3[5] == pwOutGlyphs2[5], "glyph not mirrored correctly\n"); ok(pwOutGlyphs3[6] == pwOutGlyphs2[6], "glyph not mirrored correctly\n"); @@ -1860,7 +1863,7 @@ static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unkown, found by black box testing */ + U+F71B: unknown, found by black box testing */ BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -2786,6 +2789,11 @@ { 0, 0, 1, 1, 2, 2, 1, 1, 0, 1 }, { 1, 0, 1, 2, 2, 1, 2, 1, 0, 1 }, + + { 1, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 4, 4, 4, 1, 1, 0, 0 }, + { 1, 2, 3, 0, 3, 2, 1, 0, 0, 0 } }; static const int expect_l2v[][10] = { @@ -2802,6 +2810,11 @@ { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, /**/ { 0, 1, 7, 5, 6, 4, 3 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 2, 3, 4, 5, 6, 7, 1, 0, 8, 9}, + { 2, 0, 1, 3, 5, 6, 4, 7, 8, 9} }; static const int expect_v2l[][10] = { @@ -2818,6 +2831,11 @@ { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, { 0, 1, 7, 6, 5, 3, 4 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 7, 6, 0, 1, 2, 3, 4, 5, 8, 9}, + { 1, 2, 0, 3, 6, 4, 5, 7, 8, 9} }; int i, j, vistolog[sizeof(levels[0])], logtovis[sizeof(levels[0])];

1 0

[akhaldi] 58611: [USP10] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 26 Mar '13

26 Mar '13

Author: akhaldi Date: Tue Mar 26 19:16:32 2013 New Revision: 58611 URL: http://svn.reactos.org/svn/reactos?rev=58611&view=rev Log: [USP10] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Tue Mar 26 19:16:32 2013 @@ -749,7 +749,8 @@ ) { WORD *chartype; - unsigned baselevel = 0,j; + unsigned baselevel = 0; + INT j; TRACE("%s, %d\n", debugstr_wn(lpString, uCount), uCount); chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)); Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Tue Mar 26 19:16:32 2013 @@ -931,7 +931,7 @@ context_type[i] = lex(pwcChars[i]); GetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0); - for (i = 1, g=1; i < cChars; i++, g++) + for (i = 1, g=1; i < cChars - 1; i++, g++) { if (context_type[i] != 0 && context_type[i+write_dir]==context_type[i]) { Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Tue Mar 26 19:16:32 2013 @@ -1017,13 +1017,14 @@ if (psc && *psc) { unsigned int i; + INT n; for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) { heap_free(((ScriptCache *)*psc)->widths[i]); } for (i = 0; i < 0x10; i++) { - int j; + unsigned int j; if (((ScriptCache *)*psc)->page[i]) for (j = 0; j < GLYPH_MAX / GLYPH_BLOCK_SIZE; j++) heap_free(((ScriptCache *)*psc)->page[i]->glyphs[j]); @@ -1033,20 +1034,20 @@ heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); heap_free(((ScriptCache *)*psc)->GPOS_Table); - for (i = 0; i < ((ScriptCache *)*psc)->script_count; i++) + for (n = 0; n < ((ScriptCache *)*psc)->script_count; n++) { int j; - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].language_count; j++) + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].language_count; j++) { int k; - for (k = 0; k < ((ScriptCache *)*psc)->scripts[i].languages[j].feature_count; k++) - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); + for (k = 0; k < ((ScriptCache *)*psc)->scripts[n].languages[j].feature_count; k++) + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features[k].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features); } - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].default_language.feature_count; j++) - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features[j].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features); - heap_free(((ScriptCache *)*psc)->scripts[i].languages); + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].default_language.feature_count; j++) + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features[j].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features); + heap_free(((ScriptCache *)*psc)->scripts[n].languages); } heap_free(((ScriptCache *)*psc)->scripts); heap_free(((ScriptCache *)*psc)->otm); @@ -2534,8 +2535,9 @@ if (check >= cChars && !iMaxPos) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, 1); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, 1); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2666,8 +2668,9 @@ if (check >= cChars && direction > 0) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, direction); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, direction); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2841,7 +2844,8 @@ SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs) { HRESULT hr; - unsigned int i,g; + int i; + unsigned int g; BOOL rtl; int cluster; 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] Tue Mar 26 19:16:32 2013 @@ -180,7 +180,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.5.4 reactos/dll/win32/url # Synced to Wine-1.5.19 reactos/dll/win32/urlmon # Synced to Wine-1.5.26 -reactos/dll/win32/usp10 # Synced to Wine-1.5.24 +reactos/dll/win32/usp10 # Synced to Wine-1.5.26 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync

1 0

[akhaldi] 58610: [XMLLITE_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 26 Mar '13

26 Mar '13

Author: akhaldi Date: Tue Mar 26 19:02:58 2013 New Revision: 58610 URL: http://svn.reactos.org/svn/reactos?rev=58610&view=rev Log: [XMLLITE_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/testlist.c trunk/rostests/winetests/xmllite/writer.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] Tue Mar 26 19:02:58 2013 @@ -1,7 +1,7 @@ /* - * XMLLite IXmlReader tests + * IXmlReader tests * - * Copyright 2010 (C) Nikolay Sivov + * Copyright 2010, 2012-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,18 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define CONST_VTABLE -#include <stdarg.h> +//#include <stdarg.h> #include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "initguid.h" -#include "ole2.h" -#include "xmllite.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <initguid.h> +#include <ole2.h> +#include <xmllite.h> +#include <wine/test.h> DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); @@ -50,6 +55,19 @@ riid->Data4[5], riid->Data4[6], riid->Data4[7]); return buf; +} + +static WCHAR *a2w(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static void free_str(WCHAR *str) +{ + HeapFree(GetProcessHeap(), 0, str); } static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; @@ -326,6 +344,60 @@ return S_OK; } +static HRESULT WINAPI teststream_QueryInterface(ISequentialStream *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI teststream_AddRef(ISequentialStream *iface) +{ + return 2; +} + +static ULONG WINAPI teststream_Release(ISequentialStream *iface) +{ + return 1; +} + +static int stream_readcall; + +static HRESULT WINAPI teststream_Read(ISequentialStream *iface, void *pv, ULONG cb, ULONG *pread) +{ + static const char xml[] = ""; + + if (stream_readcall++) + { + *pread = 0; + return E_PENDING; + } + + *pread = sizeof(xml) / 2; + memcpy(pv, xml, *pread); + return S_OK; +} + +static HRESULT WINAPI teststream_Write(ISequentialStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ISequentialStreamVtbl teststreamvtbl = +{ + teststream_QueryInterface, + teststream_AddRef, + teststream_Release, + teststream_Read, + teststream_Write +}; + static BOOL init_pointers(void) { /* don't free module here, it's to be unloaded on exit */ @@ -497,6 +569,7 @@ IStream_Release(stream); /* test input interface selection sequence */ + input = NULL; hr = testinput_createinstance((void**)&input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -634,10 +707,8 @@ test_read_state(reader, XmlReadState_Interactive, -1, 0); hr = IXmlReader_GetValue(reader, &val, NULL); -todo_wine - ok(hr == S_OK, "got %08x\n", hr); - if (hr == S_OK) - ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + ok(hr == S_OK, "got %08x\n", hr); + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); @@ -675,10 +746,9 @@ ok(count == 3, "Expected 3, got %d\n", count); hr = IXmlReader_GetDepth(reader, &count); -todo_wine { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); +todo_wine ok(count == 1, "Expected 1, got %d\n", count); -} hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); @@ -688,7 +758,646 @@ ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type); + type = XmlNodeType_XmlDeclaration; + hr = IXmlReader_Read(reader, &type); + /* newer versions return syntax error here cause document is incomplete, + it makes more sense than invalid char error */ +todo_wine { + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "got %d\n", type); +} IStream_Release(stream); + IXmlReader_Release(reader); +} + +struct test_entry { + const char *xml; + const char *name; + const char *value; + HRESULT hr; + HRESULT hr_broken; /* this is set to older version results */ +}; + +static struct test_entry comment_tests[] = { + { "", "", " comment ", S_OK }, + { "", "", " - comment", S_OK }, + { "", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, + { "", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, + { NULL } +}; + +static void test_read_comment(void) +{ + struct test_entry *test = comment_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + 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); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + +static struct test_entry pi_tests[] = { + { "<?pi?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, + { "<?pi pi data?>", "pi", "pi data", S_OK }, + { "<?pi pi data ?>", "pi", "pi data ", S_OK }, + { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER }, + { "<?:pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, + { "<?-pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, + { "<?xml-stylesheet ?>", "xml-stylesheet", "", S_OK }, + { NULL } +}; + +static void test_read_pi(void) +{ + struct test_entry *test = pi_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + 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); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_ProcessingInstruction, "got %d for %s\n", type, test->xml); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = !strlen(test->value); + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + +struct nodes_test { + const char *xml; + XmlNodeType types[20]; +}; + +static const char misc_test_xml[] = + "" + "" + "<?pi1 pi1body ?>" + "" + " \t \r \n" + "" + "<a>" + "<b/>" + "" + "<?pi pibody ?>" + "</a>" +; + +static struct nodes_test misc_test = { + misc_test_xml, + { + XmlNodeType_Comment, + XmlNodeType_Comment, + XmlNodeType_ProcessingInstruction, + XmlNodeType_Comment, + XmlNodeType_Whitespace, + XmlNodeType_Comment, + XmlNodeType_Element, + XmlNodeType_Element, + XmlNodeType_Comment, + XmlNodeType_ProcessingInstruction, + XmlNodeType_EndElement, + XmlNodeType_None + } +}; + +static void test_read_full(void) +{ + struct nodes_test *test = &misc_test; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + int i; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + i = 0; + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + while (hr == S_OK) + { + ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); + if (test->types[i] == XmlNodeType_None) break; + ok(type == test->types[i], "%d: got wrong type %d, expected %d\n", i, type, test->types[i]); + hr = IXmlReader_Read(reader, &type); + i++; + } + ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + +static const char test_dtd[] = + "<!DOCTYPE testdtd SYSTEM \"externalid uri\" >" + ""; + +static void test_read_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}; + static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; + IXmlReader *reader; + const WCHAR *str; + XmlNodeType type; + IStream *stream; + UINT len, count; + HRESULT hr; + + hr = pCreateXmlReader(&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_dtd, sizeof(test_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 == 1, "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); +todo_wine { + 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); +todo_wine { + 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); + 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)); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got 0x%8x\n", hr); + ok(type == XmlNodeType_Comment, "got type %d\n", type); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + +static struct test_entry element_tests[] = { + { "<a/>", "a", "", S_OK }, + { "<a />", "a", "", S_OK }, + { "<a:b/>", "a:b", "", NC_E_UNDECLAREDPREFIX }, + { "<:a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "< a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "<a>", "a", "", S_OK }, + { "<a >", "a", "", S_OK }, + { "<a \r \t\n>", "a", "", S_OK }, + { "</a>", NULL, NULL, NC_E_QNAMECHARACTER }, + { NULL } +}; + +static void test_read_element(void) +{ + struct test_entry *test = element_tests; + static const char stag[] = "<a><b></b></a>"; + static const char mismatch[] = "<a></b>"; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + UINT depth; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + 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); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); + + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + } + + IStream_Release(stream); + test++; + } + + /* test reader depth increment */ + stream = create_stream_on_data(stag, sizeof(stag)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + /* read end tag for inner element */ + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "got %d\n", type); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + ok(depth == 2, "got %d\n", depth); + + /* read end tag for container element */ + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "got %d\n", type); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + IStream_Release(stream); + + /* start/end tag mismatch */ + stream = create_stream_on_data(mismatch, sizeof(mismatch)); + 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 %08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); + + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr); +todo_wine + ok(type == XmlNodeType_None, "got %d\n", type); + + IStream_Release(stream); + + IXmlReader_Release(reader); +} + +static ISequentialStream teststream = { &teststreamvtbl }; + +static void test_read_pending(void) +{ + IXmlReader *reader; + const WCHAR *value; + XmlNodeType type; + HRESULT hr; + int c; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); + + hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* first read call returns incomplete node, second attempt fails with E_PENDING */ + stream_readcall = 0; + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); + /* newer versions are happy when it's enough data to detect node type, + older versions keep reading until it fails to read more */ + ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); + ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); + + /* newer versions' GetValue() makes an attempt to read more */ + c = stream_readcall; + value = (void*)0xdeadbeef; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); + ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); + + IXmlReader_Release(reader); +} + +static void test_readvaluechunk(void) +{ + static const char testA[] = ""; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + const WCHAR *value; + WCHAR b; + HRESULT hr; + UINT c; + + hr = pCreateXmlReader(&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); + + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); + ok(hr == S_OK, "got %08x\n", hr); + ok(c == 1, "got %u\n", c); + ok(b == ' ', "got %x\n", b); + + /* portion read as chunk is skipped from resulting node value */ + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + /* once value is returned/allocated it's not possible to read by chunk */ + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(c == 0, "got %u\n", c); + ok(b == 0, "got %x\n", b); + + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + IXmlReader_Release(reader); +} + +static struct test_entry cdata_tests[] = { + { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, + { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { NULL } +}; + +static void test_read_cdata(void) +{ + struct test_entry *test = cdata_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + + /* read one more to get to CDATA */ + if (type == XmlNodeType_Element) + { + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + } + + 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); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + IXmlReader_Release(reader); } @@ -708,6 +1417,14 @@ test_reader_create(); test_readerinput(); test_reader_state(); + test_read_cdata(); + test_read_comment(); + test_read_pi(); + test_read_dtd(); + test_read_element(); + test_read_full(); + test_read_pending(); + test_readvaluechunk(); test_read_xmldeclaration(); CoUninitialize(); Modified: trunk/rostests/winetests/xmllite/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/testlis… ============================================================================== --- trunk/rostests/winetests/xmllite/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/testlist.c [iso-8859-1] Tue Mar 26 19:02:58 2013 @@ -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_reader(void); extern void func_writer(void); Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Tue Mar 26 19:02:58 2013 @@ -17,16 +17,22 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include <stdarg.h> -#include <stdio.h> +//#include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "xmllite.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +//#include "ole2.h" +#include <xmllite.h> +#include <wine/test.h> static HRESULT (WINAPI *pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc);

1 0

[akhaldi] 58609: [XMLLITE] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 26 Mar '13

26 Mar '13

Author: akhaldi Date: Tue Mar 26 19:02:38 2013 New Revision: 58609 URL: http://svn.reactos.org/svn/reactos?rev=58609&view=rev Log: [XMLLITE] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/xmllite_main.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] Tue Mar 26 19:02:38 2013 @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012 Nikolay Sivov + * Copyright 2010, 2012-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -48,11 +48,56 @@ XmlEncoding_Unknown } xml_encoding; +typedef enum +{ + XmlReadInState_Initial, + XmlReadInState_XmlDecl, + XmlReadInState_Misc_DTD, + XmlReadInState_DTD, + XmlReadInState_DTD_Misc, + XmlReadInState_Element, + XmlReadInState_Content, + XmlReadInState_MiscEnd +} XmlReaderInternalState; + +/* This state denotes where parsing was interrupted by input problem. + Reader resumes parsing using this information. */ +typedef enum +{ + XmlReadResumeState_Initial, + XmlReadResumeState_PITarget, + XmlReadResumeState_PIBody, + XmlReadResumeState_CDATA, + XmlReadResumeState_Comment, + XmlReadResumeState_STag +} XmlReaderResumeState; + +/* saved pointer index to resume from particular input position */ +typedef enum +{ + XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ + XmlReadResume_Local, /* local for QName */ + XmlReadResume_Body, /* PI body, comment text, CDATA text */ + XmlReadResume_Last +} XmlReaderResume; + +typedef enum +{ + StringValue_LocalName, + StringValue_QualifiedName, + StringValue_Value, + StringValue_Last +} XmlReaderStringValue; + static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; static const WCHAR dblquoteW[] = {'\"',0}; static const WCHAR quoteW[] = {'\'',0}; +static const WCHAR ltW[] = {'<',0}; +static const WCHAR gtW[] = {'>',0}; +static const WCHAR commentW[] = {'<','!','-','-',0}; +static const WCHAR piW[] = {'<','?',0}; struct xml_encoding_data { @@ -76,7 +121,7 @@ typedef struct input_buffer input_buffer; -typedef struct _xmlreaderinput +typedef struct { IXmlReaderInput IXmlReaderInput_iface; LONG ref; @@ -91,13 +136,28 @@ optimizations possible with IStream aren't implemented */ ISequentialStream *stream; input_buffer *buffer; + unsigned int pending : 1; } xmlreaderinput; +static const struct IUnknownVtbl xmlreaderinputvtbl; + +/* Structure to hold parsed string of specific length. + + Reader stores node value as 'start' pointer, on request + a null-terminated version of it is allocated. + + To init a strval variable use reader_init_strval(), + to set strval as a reader value use reader_set_strval(). + */ typedef struct { - const WCHAR *str; - UINT len; + WCHAR *start; /* input position where value starts */ + UINT len; /* length in WCHARs, altered after ReadValueChunk */ + WCHAR *str; /* allocated null-terminated string */ } strval; + +static WCHAR emptyW[] = {0}; +static const strval strval_empty = {emptyW, 0, emptyW}; struct attribute { @@ -106,19 +166,31 @@ strval value; }; -typedef struct _xmlreader +struct element +{ + struct list entry; + strval qname; +}; + +typedef struct { IXmlReader IXmlReader_iface; LONG ref; xmlreaderinput *input; IMalloc *imalloc; XmlReadState state; + XmlReaderInternalState instate; + XmlReaderResumeState resumestate; XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list elements; + strval strvalues[StringValue_Last]; + UINT depth; + WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; struct input_buffer @@ -174,6 +246,21 @@ m_free(reader->imalloc, mem); } +static HRESULT reader_strvaldup(xmlreader *reader, const strval *src, strval *dest) +{ + *dest = *src; + + if (src->str != strval_empty.str) + { + dest->str = reader_alloc(reader, (dest->len+1)*sizeof(WCHAR)); + if (!dest->str) return E_OUTOFMEMORY; + memcpy(dest->str, src->str, dest->len*sizeof(WCHAR)); + dest->str[dest->len] = 0; + } + + return S_OK; +} + /* reader input memory allocation functions */ static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) { @@ -231,6 +318,134 @@ reader->attr_count++; return S_OK; +} + +/* This one frees stored string value if needed */ +static void reader_free_strvalued(xmlreader *reader, strval *v) +{ + if (v->str != strval_empty.str) + { + reader_free(reader, v->str); + *v = strval_empty; + } +} + +static inline void reader_init_strvalue(WCHAR *str, UINT len, strval *v) +{ + v->start = v->str = str; + v->len = len; +} + +static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) +{ + reader_free_strvalued(reader, &reader->strvalues[type]); +} + +static void reader_free_strvalues(xmlreader *reader) +{ + int type; + for (type = 0; type < StringValue_Last; type++) + reader_free_strvalue(reader, type); +} + +/* This helper should only be used to test if strings are the same, + it doesn't try to sort. */ +static inline int strval_eq(const strval *str1, const strval *str2) +{ + if (str1->len != str2->len) return 0; + return !memcmp(str1->str, str2->str, str1->len*sizeof(WCHAR)); +} + +static void reader_clear_elements(xmlreader *reader) +{ + struct element *elem, *elem2; + LIST_FOR_EACH_ENTRY_SAFE(elem, elem2, &reader->elements, struct element, entry) + { + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + } + list_init(&reader->elements); +} + +static HRESULT reader_inc_depth(xmlreader *reader) +{ + /* FIXME: handle XmlReaderProperty_MaxElementDepth property */ + reader->depth++; + return S_OK; +} + +static HRESULT reader_push_element(xmlreader *reader, strval *qname) +{ + struct element *elem; + HRESULT hr; + + elem = reader_alloc(reader, sizeof(*elem)); + if (!elem) return E_OUTOFMEMORY; + + hr = reader_strvaldup(reader, qname, &elem->qname); + if (FAILED(hr)) return hr; + + if (!list_empty(&reader->elements)) + { + hr = reader_inc_depth(reader); + if (FAILED(hr)) return hr; + } + + list_add_head(&reader->elements, &elem->entry); + 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(reader, elem); + } +} + +/* Always make a copy, cause strings are supposed to be null terminated. Null pointer for 'value' + means node value is to be determined. */ +static void reader_set_strvalue(xmlreader *reader, XmlReaderStringValue type, const strval *value) +{ + strval *v = &reader->strvalues[type]; + + reader_free_strvalue(reader, type); + if (!value) + { + v->str = NULL; + v->start = NULL; + v->len = 0; + return; + } + + if (value->str == strval_empty.str) + *v = *value; + else + { + if (type == StringValue_Value) + { + /* defer allocation for value string */ + v->str = NULL; + v->start = value->start; + v->len = value->len; + } + else + { + v->str = reader_alloc(reader, (value->len + 1)*sizeof(WCHAR)); + memcpy(v->str, value->start, value->len*sizeof(WCHAR)); + v->str[value->len] = 0; + v->len = value->len; + } + } +} + +static inline int is_reader_pending(xmlreader *reader) +{ + return reader->input->pending; } static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) @@ -356,10 +571,12 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) { encoded_buffer *buffer = &readerinput->buffer->encoded; - ULONG len = buffer->allocated - buffer->written, read; + /* to make sure aligned length won't exceed allocated length */ + ULONG len = buffer->allocated - buffer->written - 4; + ULONG read; HRESULT hr; - /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + /* always try to get aligned to 4 bytes, so the only case we can get partially read characters is variable width encodings like UTF-8 */ len = (len + 3) & ~3; /* try to use allocated space or grow */ @@ -370,9 +587,11 @@ len = buffer->allocated - buffer->written; } + read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); + TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; - TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); buffer->written += read; return hr; @@ -392,23 +611,48 @@ } } +static inline int readerinput_is_utf8(xmlreaderinput *readerinput) +{ + static char startA[] = {'<','?'}; + static char commentA[] = {'<','!'}; + encoded_buffer *buffer = &readerinput->buffer->encoded; + unsigned char *ptr = (unsigned char*)buffer->data; + + return !memcmp(buffer->data, startA, sizeof(startA)) || + !memcmp(buffer->data, commentA, sizeof(commentA)) || + /* test start byte */ + (ptr[0] == '<' && + ( + (ptr[1] && (ptr[1] <= 0x7f)) || + (buffer->data[1] >> 5) == 0x6 || /* 2 bytes */ + (buffer->data[1] >> 4) == 0xe || /* 3 bytes */ + (buffer->data[1] >> 3) == 0x1e) /* 4 bytes */ + ); +} + static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; - static char startA[] = {'<','?','x','m'}; static WCHAR startW[] = {'<','?'}; + static WCHAR commentW[] = {'<','!'}; static char utf8bom[] = {0xef,0xbb,0xbf}; static char utf16lebom[] = {0xff,0xfe}; *enc = XmlEncoding_Unknown; - if (buffer->written <= 3) return MX_E_INPUTEND; + if (buffer->written <= 3) + { + HRESULT hr = readerinput_growraw(readerinput); + if (FAILED(hr)) return hr; + if (buffer->written <= 3) return MX_E_INPUTEND; + } /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (!memcmp(buffer->data, startA, sizeof(startA))) + if (readerinput_is_utf8(readerinput)) *enc = XmlEncoding_UTF8; - else if (!memcmp(buffer->data, startW, sizeof(startW))) + else if (!memcmp(buffer->data, startW, sizeof(startW)) || + !memcmp(buffer->data, commentW, sizeof(commentW))) *enc = XmlEncoding_UTF16; /* try with BOM now */ else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) @@ -440,18 +684,39 @@ return len; } -/* returns byte length of complete char sequence for specified code page, */ -static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) +/* Returns byte length of complete char sequence for buffer code page, + it's relative to current buffer position which is currently used for BOM handling + only. */ +static int readerinput_get_convlen(xmlreaderinput *readerinput) { encoded_buffer *buffer = &readerinput->buffer->encoded; - int len = buffer->written; - - if (cp == CP_UTF8) + int len; + + if (readerinput->buffer->code_page == CP_UTF8) len = readerinput_get_utf8_convlen(readerinput); else len = buffer->written; + TRACE("%d\n", len - (int)(buffer->cur - buffer->data)); return len - (buffer->cur - buffer->data); +} + +/* It's possible that raw buffer has some leftovers from last conversion - some char + sequence that doesn't represent a full code point. Length argument should be calculated with + readerinput_get_convlen(), if it's -1 it will be calculated here. */ +static void readerinput_shrinkraw(xmlreaderinput *readerinput, int len) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + + if (len == -1) + len = readerinput_get_convlen(readerinput); + + memmove(buffer->data, buffer->cur + (buffer->written - len), len); + /* everything below cur is lost too */ + buffer->written -= len + (buffer->cur - buffer->data); + /* after this point we don't need cur pointer really, + it's used only to mark where actual data begins when first chunk is read */ + buffer->cur = buffer->data; } /* note that raw buffer content is kept */ @@ -461,12 +726,14 @@ encoded_buffer *dest = &readerinput->buffer->utf16; int len, dest_len; HRESULT hr; + WCHAR *ptr; UINT cp; hr = get_code_page(enc, &cp); if (FAILED(hr)) return; - len = readerinput_get_convlen(readerinput, cp); + readerinput->buffer->code_page = cp; + len = readerinput_get_convlen(readerinput); TRACE("switching to cp %d\n", cp); @@ -475,35 +742,81 @@ { readerinput_grow(readerinput, len); memcpy(dest->data, src->cur, len); - readerinput->buffer->code_page = cp; + dest->written += len*sizeof(WCHAR); return; } dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); readerinput_grow(readerinput, dest_len); - MultiByteToWideChar(cp, 0, src->cur, len, (WCHAR*)dest->data, dest_len); - dest->data[dest_len] = 0; - readerinput->buffer->code_page = cp; -} - -static inline const WCHAR *reader_get_cur(xmlreader *reader) -{ - return (WCHAR*)reader->input->buffer->utf16.cur; + ptr = (WCHAR*)dest->data; + MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); + ptr[dest_len] = 0; + dest->written += dest_len*sizeof(WCHAR); +} + +/* shrinks parsed data a buffer begins with */ +static void reader_shrink(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + /* avoid to move too often using threshold shrink length */ + if (buffer->cur - buffer->data > buffer->written / 2) + { + buffer->written -= buffer->cur - buffer->data; + memmove(buffer->data, buffer->cur, buffer->written); + buffer->cur = buffer->data; + *(WCHAR*)&buffer->cur[buffer->written] = 0; + } +} + +/* This is a normal way for reader to get new data converted from raw buffer to utf16 buffer. + It won't attempt to shrink but will grow destination buffer if needed */ +static HRESULT reader_more(xmlreader *reader) +{ + xmlreaderinput *readerinput = reader->input; + encoded_buffer *src = &readerinput->buffer->encoded; + encoded_buffer *dest = &readerinput->buffer->utf16; + UINT cp = readerinput->buffer->code_page; + int len, dest_len; + HRESULT hr; + WCHAR *ptr; + + /* get some raw data from stream first */ + hr = readerinput_growraw(readerinput); + len = readerinput_get_convlen(readerinput); + + /* just copy for UTF-16 case */ + if (cp == ~0) + { + readerinput_grow(readerinput, len); + memcpy(dest->data, src->cur, len); + dest->written += len*sizeof(WCHAR); + return hr; + } + + dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + ptr = (WCHAR*)dest->data; + MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); + ptr[dest_len] = 0; + dest->written += dest_len*sizeof(WCHAR); + /* get rid of processed data */ + readerinput_shrinkraw(readerinput, len); + + return hr; +} + +static inline WCHAR *reader_get_cur(xmlreader *reader) +{ + WCHAR *ptr = (WCHAR*)reader->input->buffer->utf16.cur; + if (!*ptr) reader_more(reader); + return ptr; } static int reader_cmp(xmlreader *reader, const WCHAR *str) { const WCHAR *ptr = reader_get_cur(reader); - int i = 0; - return strncmpW(str, ptr, strlenW(str)); - - while (str[i]) { - if (ptr[i] != str[i]) return 0; - i++; - } - - return 1; } /* moves cursor n WCHARs forward */ @@ -519,13 +832,18 @@ } } +static inline int is_wchar_space(WCHAR ch) +{ + return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; +} + /* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ static int reader_skipspaces(xmlreader *reader) { encoded_buffer *buffer = &reader->input->buffer->utf16; const WCHAR *ptr = reader_get_cur(reader), *start = ptr; - while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + while (is_wchar_space(*ptr)) { buffer->cur += sizeof(WCHAR); if (*ptr == '\r') @@ -546,7 +864,7 @@ /* [26] VersionNum ::= '1.' [0-9]+ */ static HRESULT reader_parse_versionnum(xmlreader *reader, strval *val) { - const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); + WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); static const WCHAR onedotW[] = {'1','.',0}; if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; @@ -559,8 +877,7 @@ if (ptr2 == ptr) return WC_E_DIGIT; TRACE("version=%s\n", debugstr_wn(start, ptr-start)); - val->str = start; - val->len = ptr-start; + reader_init_strvalue(start, ptr-start, val); reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -587,8 +904,7 @@ if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; - name.str = reader_get_cur(reader); - name.len = 7; + reader_init_strvalue(reader_get_cur(reader), 7, &name); /* skip 'version' */ reader_skipn(reader, 7); @@ -625,7 +941,7 @@ /* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ static HRESULT reader_parse_encname(xmlreader *reader, strval *val) { - const WCHAR *start = reader_get_cur(reader), *ptr; + WCHAR *start = reader_get_cur(reader), *ptr; xml_encoding enc; int len; @@ -691,15 +1007,14 @@ static const WCHAR standaloneW[] = {'s','t','a','n','d','a','l','o','n','e',0}; static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; - const WCHAR *start, *ptr; + WCHAR *start, *ptr; strval name, val; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, standaloneW)) return S_FALSE; - name.str = reader_get_cur(reader); - name.len = 10; + reader_init_strvalue(reader_get_cur(reader), 10, &name); /* skip 'standalone' */ reader_skipn(reader, 10); @@ -733,11 +1048,11 @@ /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ static HRESULT reader_parse_xmldecl(xmlreader *reader) { - static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + static const WCHAR xmldeclW[] = {'<','?','x','m','l',' ',0}; static const WCHAR declcloseW[] = {'?','>',0}; HRESULT hr; - /* check if we have "<?xml" */ + /* check if we have "<?xml " */ if (reader_cmp(reader, xmldeclW)) return S_FALSE; reader_skipn(reader, 5); @@ -757,14 +1072,926 @@ if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; reader_skipn(reader, 2); - return S_OK; + reader->nodetype = XmlNodeType_XmlDeclaration; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + + return S_OK; +} + +/* [15] Comment ::= '' */ +static HRESULT reader_parse_comment(xmlreader *reader) +{ + WCHAR *start, *ptr; + + if (reader->resume[XmlReadResume_Body]) + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + else + { + /* skip '' */ + reader_skipn(reader, 3); + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; + return S_OK; + } + else + return WC_E_COMMENT; + } + else + ptr++; + } + else + { + reader_skipn(reader, 1); + ptr++; + } + } + + return S_OK; +} + +/* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ +static inline int is_char(WCHAR ch) +{ + return (ch == '\t') || (ch == '\r') || (ch == '\n') || + (ch >= 0x20 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xe000 && ch <= 0xfffd); +} + +/* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ +static inline int is_pubchar(WCHAR ch) +{ + return (ch == ' ') || + (ch >= 'a' && ch <= 'z') || + (ch >= 'A' && ch <= 'Z') || + (ch >= '0' && ch <= '9') || + (ch >= '-' && ch <= ';') || /* '()*+,-./:; */ + (ch == '=') || (ch == '?') || + (ch == '@') || (ch == '!') || + (ch >= '#' && ch <= '%') || /* #$% */ + (ch == '_') || (ch == '\r') || (ch == '\n'); +} + +static inline int is_namestartchar(WCHAR ch) +{ + return (ch == ':') || (ch >= 'A' && ch <= 'Z') || + (ch == '_') || (ch >= 'a' && ch <= 'z') || + (ch >= 0xc0 && ch <= 0xd6) || + (ch >= 0xd8 && ch <= 0xf6) || + (ch >= 0xf8 && ch <= 0x2ff) || + (ch >= 0x370 && ch <= 0x37d) || + (ch >= 0x37f && ch <= 0x1fff) || + (ch >= 0x200c && ch <= 0x200d) || + (ch >= 0x2070 && ch <= 0x218f) || + (ch >= 0x2c00 && ch <= 0x2fef) || + (ch >= 0x3001 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xf900 && ch <= 0xfdcf) || + (ch >= 0xfdf0 && ch <= 0xfffd); +} + +/* [4 NS] NCName ::= Name - (Char* ':' Char*) */ +static inline int is_ncnamechar(WCHAR ch) +{ + return (ch >= 'A' && ch <= 'Z') || + (ch == '_') || (ch >= 'a' && ch <= 'z') || + (ch == '-') || (ch == '.') || + (ch >= '0' && ch <= '9') || + (ch == 0xb7) || + (ch >= 0xc0 && ch <= 0xd6) || + (ch >= 0xd8 && ch <= 0xf6) || + (ch >= 0xf8 && ch <= 0x2ff) || + (ch >= 0x300 && ch <= 0x36f) || + (ch >= 0x370 && ch <= 0x37d) || + (ch >= 0x37f && ch <= 0x1fff) || + (ch >= 0x200c && ch <= 0x200d) || + (ch >= 0x203f && ch <= 0x2040) || + (ch >= 0x2070 && ch <= 0x218f) || + (ch >= 0x2c00 && ch <= 0x2fef) || + (ch >= 0x3001 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xf900 && ch <= 0xfdcf) || + (ch >= 0xfdf0 && ch <= 0xfffd); +} + +static inline int is_namechar(WCHAR ch) +{ + return (ch == ':') || is_ncnamechar(ch); +} + +/* [4] NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | + [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | + [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] + [4a] NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] + [5] Name ::= NameStartChar (NameChar)* */ +static HRESULT reader_parse_name(xmlreader *reader, strval *name) +{ + WCHAR *ptr, *start; + + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + } + + while (is_namechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + if (is_reader_pending(reader)) + { + reader->resume[XmlReadResume_Name] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Name] = NULL; + + TRACE("name %s:%d\n", debugstr_wn(start, ptr-start), (int)(ptr-start)); + reader_init_strvalue(start, ptr-start, name); + + return S_OK; +} + +/* [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l')) */ +static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) +{ + static const WCHAR xmlW[] = {'x','m','l'}; + strval name; + HRESULT hr; + UINT i; + + hr = reader_parse_name(reader, &name); + if (FAILED(hr)) return is_reader_pending(reader) ? E_PENDING : WC_E_PI; + + /* now that we got name check for illegal content */ + if (name.len == 3 && !strncmpiW(name.str, xmlW, 3)) + return WC_E_LEADINGXML; + + /* PITarget can't be a qualified name */ + for (i = 0; i < name.len; i++) + if (name.str[i] == ':') + return i ? NC_E_NAMECOLON : WC_E_PI; + + TRACE("pitarget %s:%d\n", debugstr_wn(name.str, name.len), name.len); + *target = name; + return S_OK; +} + +/* [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' */ +static HRESULT reader_parse_pi(xmlreader *reader) +{ + WCHAR *ptr, *start; + strval target; + HRESULT hr; + + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* skip '<?' */ + reader_skipn(reader, 2); + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_PITarget; + case XmlReadResumeState_PITarget: + hr = reader_parse_pitarget(reader, &target); + if (FAILED(hr)) return hr; + reader->resumestate = XmlReadResumeState_PIBody; + default: + ; + } + + ptr = reader_get_cur(reader); + /* exit earlier if there's no content */ + if (ptr[0] == '?' && ptr[1] == '>') + { + /* skip '?>' */ + reader_skipn(reader, 2); + reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; + reader_set_strvalue(reader, StringValue_LocalName, &target); + reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + return S_OK; + } + + if (!reader->resume[XmlReadResume_Body]) + { + /* now at least a single space char should be there */ + if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; + reader_skipspaces(reader); + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Body] = start; + } + else + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + + while (*ptr) + { + if (ptr[0] == '?') + { + if (ptr[1] == '>') + { + strval value; + + TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* skip '?>' */ + reader_skipn(reader, 2); + reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; + reader->resume[XmlReadResume_Body] = NULL; + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_LocalName, &target); + reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &value); + return S_OK; + } + else + { + ptr++; + reader_more(reader); + } + } + else + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + + return S_OK; +} + +/* This one is used to parse significant whitespace nodes, like in Misc production */ +static HRESULT reader_parse_whitespace(xmlreader *reader) +{ + WCHAR *start, *ptr; + + reader_shrink(reader); + start = reader_get_cur(reader); + + reader_skipspaces(reader); + ptr = reader_get_cur(reader); + TRACE("%s\n", debugstr_wn(start, ptr-start)); + + reader->nodetype = XmlNodeType_Whitespace; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + return S_OK; +} + +/* [27] Misc ::= Comment | PI | S */ +static HRESULT reader_parse_misc(xmlreader *reader) +{ + HRESULT hr = S_FALSE; + + if (reader->resumestate != XmlReadResumeState_Initial) + { + hr = reader_more(reader); + if (FAILED(hr)) return hr; + + /* finish current node */ + switch (reader->resumestate) + { + case XmlReadResumeState_PITarget: + case XmlReadResumeState_PIBody: + return reader_parse_pi(reader); + case XmlReadResumeState_Comment: + return reader_parse_comment(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } + } + + while (1) + { + const WCHAR *cur = reader_get_cur(reader); + + if (is_wchar_space(*cur)) + hr = reader_parse_whitespace(reader); + else if (!reader_cmp(reader, commentW)) + hr = reader_parse_comment(reader); + else if (!reader_cmp(reader, piW)) + hr = reader_parse_pi(reader); + else + break; + + if (hr != S_FALSE) return hr; + } + + return hr; +} + +/* [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'") */ +static HRESULT reader_parse_sys_literal(xmlreader *reader, strval *literal) +{ + WCHAR *start = reader_get_cur(reader), *cur, quote; + + if (*start != '"' && *start != '\'') return WC_E_QUOTE; + + quote = *start; + reader_skipn(reader, 1); + + cur = start = reader_get_cur(reader); + while (is_char(*cur) && *cur != quote) + { + reader_skipn(reader, 1); + cur = reader_get_cur(reader); + } + if (*cur == quote) reader_skipn(reader, 1); + + literal->str = start; + literal->len = cur-start; + TRACE("%s\n", debugstr_wn(start, cur-start)); + return S_OK; +} + +/* [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'" + [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ +static HRESULT reader_parse_pub_literal(xmlreader *reader, strval *literal) +{ + WCHAR *start = reader_get_cur(reader), *cur, quote; + + if (*start != '"' && *start != '\'') return WC_E_QUOTE; + + quote = *start; + reader_skipn(reader, 1); + + cur = start; + while (is_pubchar(*cur) && *cur != quote) + { + reader_skipn(reader, 1); + cur = reader_get_cur(reader); + } + + reader_init_strvalue(start, cur-start, literal); + TRACE("%s\n", debugstr_wn(start, cur-start)); + return S_OK; +} + +/* [75] ExternalID ::= 'SYSTEM' S SystemLiteral | 'PUBLIC' S PubidLiteral S SystemLiteral */ +static HRESULT reader_parse_externalid(xmlreader *reader) +{ + static WCHAR systemW[] = {'S','Y','S','T','E','M',0}; + static WCHAR publicW[] = {'P','U','B','L','I','C',0}; + strval name; + 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_strvalue(publicW, strlenW(publicW), &name); + return reader_add_attr(reader, &name, &pub); + } + } + else + { + strval sys; + + /* system id */ + reader_skipn(reader, 6); + cnt = reader_skipspaces(reader); + if (!cnt) return WC_E_WHITESPACE; + + hr = reader_parse_sys_literal(reader, &sys); + if (FAILED(hr)) return hr; + + reader_init_strvalue(systemW, strlenW(systemW), &name); + return reader_add_attr(reader, &name, &sys); + } + + return hr; +} + +/* [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' intSubset ']' S?)? '>' */ +static HRESULT reader_parse_dtd(xmlreader *reader) +{ + static const WCHAR doctypeW[] = {'<','!','D','O','C','T','Y','P','E',0}; + strval name; + WCHAR *cur; + HRESULT hr; + + /* check if we have "<!DOCTYPE" */ + if (reader_cmp(reader, doctypeW)) return S_FALSE; + reader_shrink(reader); + + /* DTD processing is not allowed by default */ + if (reader->dtdmode == DtdProcessing_Prohibit) return WC_E_DTDPROHIBITED; + + reader_skipn(reader, 9); + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + /* name */ + hr = reader_parse_name(reader, &name); + if (FAILED(hr)) return WC_E_DECLDOCTYPE; + + reader_skipspaces(reader); + + hr = reader_parse_externalid(reader); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + cur = reader_get_cur(reader); + if (*cur != '>') + { + FIXME("internal subset parsing not implemented\n"); + return E_NOTIMPL; + } + + /* skip '>' */ + reader_skipn(reader, 1); + + reader->nodetype = XmlNodeType_DocumentType; + reader_set_strvalue(reader, StringValue_LocalName, &name); + reader_set_strvalue(reader, StringValue_QualifiedName, &name); + + return S_OK; +} + +/* [11 NS] LocalPart ::= NCName */ +static HRESULT reader_parse_local(xmlreader *reader, strval *local) +{ + WCHAR *ptr, *start; + + if (reader->resume[XmlReadResume_Local]) + { + start = reader->resume[XmlReadResume_Local]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + } + + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + if (is_reader_pending(reader)) + { + reader->resume[XmlReadResume_Local] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Local] = NULL; + + reader_init_strvalue(start, ptr-start, local); + + return S_OK; +} + +/* [7 NS] QName ::= PrefixedName | UnprefixedName + [8 NS] PrefixedName ::= Prefix ':' LocalPart + [9 NS] UnprefixedName ::= LocalPart + [10 NS] Prefix ::= NCName */ +static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + WCHAR *ptr, *start; + HRESULT hr; + + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Name] = start; + if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + } + + if (reader->resume[XmlReadResume_Local]) + { + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + + reader_init_strvalue(reader->resume[XmlReadResume_Name], + local->start - reader->resume[XmlReadResume_Name] - 1, + prefix); + } + else + { + /* skip prefix part */ + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + if (is_reader_pending(reader)) return E_PENDING; + + /* got a qualified name */ + if (*ptr == ':') + { + reader_init_strvalue(start, ptr-start, prefix); + + /* skip ':' */ + reader_skipn(reader, 1); + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + } + else + { + reader_init_strvalue(reader->resume[XmlReadResume_Name], ptr-reader->resume[XmlReadResume_Name], local); + reader_init_strvalue(NULL, 0, prefix); + } + } + + reader_init_strvalue(start, ptr-start, local); + + if (prefix->len) + TRACE("qname %s:%s\n", debugstr_wn(prefix->start, prefix->len), debugstr_wn(local->start, local->len)); + else + TRACE("ncname %s\n", debugstr_wn(local->start, local->len)); + + reader_init_strvalue(prefix->start ? prefix->start : local->start, + /* count ':' too */ + (prefix->len ? prefix->len + 1 : 0) + local->len, + qname); + + reader->resume[XmlReadResume_Name] = NULL; + reader->resume[XmlReadResume_Local] = NULL; + + return S_OK; +} + +/* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' + [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) +{ + static const WCHAR endW[] = {'/','>',0}; + HRESULT hr; + + hr = reader_parse_qname(reader, prefix, local, qname); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + /* empty element */ + if ((*empty = !reader_cmp(reader, endW))) + { + /* skip '/>' */ + reader_skipn(reader, 2); + return S_OK; + } + + /* got a start tag */ + if (!reader_cmp(reader, gtW)) + { + /* skip '>' */ + reader_skipn(reader, 1); + return reader_push_element(reader, qname); + } + + FIXME("only empty elements/start tags without attribute list supported\n"); + return E_NOTIMPL; +} + +/* [39] element ::= EmptyElemTag | STag content ETag */ +static HRESULT reader_parse_element(xmlreader *reader) +{ + HRESULT hr; + + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* check if we are really on element */ + if (reader_cmp(reader, ltW)) return S_FALSE; + + /* skip '<' */ + reader_skipn(reader, 1); + + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_STag; + case XmlReadResumeState_STag: + { + strval qname, prefix, local; + int empty = 0; + + /* this handles empty elements too */ + 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; + + /* if we got empty element and stack is empty go straight to Misc */ + if (empty && list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + else + reader->instate = XmlReadInState_Content; + + reader->nodetype = XmlNodeType_Element; + reader->resumestate = XmlReadResumeState_Initial; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + break; + } + default: + hr = E_FAIL; + } + + return hr; +} + +/* [13 NS] ETag ::= '</' QName S? '>' */ +static HRESULT reader_parse_endtag(xmlreader *reader) +{ + strval prefix, local, qname; + struct element *elem; + HRESULT hr; + + /* skip '</' */ + reader_skipn(reader, 2); + + hr = reader_parse_qname(reader, &prefix, &local, &qname); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + if (reader_cmp(reader, gtW)) return WC_E_GREATERTHAN; + + /* skip '>' */ + reader_skipn(reader, 1); + + /* Element stack should never be empty at this point, cause we shouldn't get to + content parsing if it's empty. */ + elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + if (!strval_eq(&elem->qname, &qname)) return WC_E_ELEMENTMATCH; + + reader_pop_element(reader); + + reader->nodetype = XmlNodeType_EndElement; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + + return S_OK; +} + +/* [18] CDSect ::= CDStart CData CDEnd + [19] CDStart ::= '<![CDATA[' + [20] CData ::= (Char* - (Char* ']]>' Char*)) + [21] CDEnd ::= ']]>' */ +static HRESULT reader_parse_cdata(xmlreader *reader) +{ + WCHAR *start, *ptr; + + if (reader->resume[XmlReadResume_Body]) + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + else + { + /* skip markup '<![CDATA[' */ + reader_skipn(reader, 9); + reader_shrink(reader); + ptr = start = reader_get_cur(reader); + reader->nodetype = XmlNodeType_CDATA; + reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_CDATA; + reader_set_strvalue(reader, StringValue_LocalName, NULL); + reader_set_strvalue(reader, StringValue_QualifiedName, NULL); + reader_set_strvalue(reader, StringValue_Value, NULL); + } + + while (*ptr) + { + if (*ptr == ']' && *(ptr+1) == ']' && *(ptr+2) == '>') + { + strval value; + + TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* skip ']]>' */ + reader_skipn(reader, 3); + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; + return S_OK; + } + else + { + reader_skipn(reader, 1); + ptr++; + } + } + + return S_OK; +} + +/* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' + [67] Reference ::= EntityRef | CharRef + [68] EntityRef ::= '&' Name ';' */ +static HRESULT reader_parse_reference(xmlreader *reader) +{ + FIXME("References not supported\n"); + return E_NOTIMPL; +} + +/* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ +static HRESULT reader_parse_chardata(xmlreader *reader) +{ + FIXME("CharData not supported\n"); + return E_NOTIMPL; +} + +/* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ +static HRESULT reader_parse_content(xmlreader *reader) +{ + 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) + { + switch (reader->resumestate) + { + case XmlReadResumeState_CDATA: + return reader_parse_cdata(reader); + case XmlReadResumeState_Comment: + return reader_parse_comment(reader); + case XmlReadResumeState_PIBody: + case XmlReadResumeState_PITarget: + return reader_parse_pi(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } + } + + reader_shrink(reader); + + /* handle end tag here, it indicates end of content as well */ + if (!reader_cmp(reader, etagW)) + return reader_parse_endtag(reader); + + if (!reader_cmp(reader, commentW)) + return reader_parse_comment(reader); + + if (!reader_cmp(reader, piW)) + return reader_parse_pi(reader); + + 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); + + /* what's left must be CharData */ + return reader_parse_chardata(reader); +} + +static HRESULT reader_parse_nextnode(xmlreader *reader) +{ + HRESULT hr; + + while (1) + { + switch (reader->instate) + { + /* if it's a first call for a new input we need to detect stream encoding */ + case XmlReadInState_Initial: + { + xml_encoding enc; + + hr = readerinput_growraw(reader->input); + if (FAILED(hr)) return hr; + + /* try to detect encoding by BOM or data and set input code page */ + hr = readerinput_detectencoding(reader->input, &enc); + TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); + if (FAILED(hr)) return hr; + + /* always switch first time cause we have to put something in */ + readerinput_switchencoding(reader->input, enc); + + /* parse xml declaration */ + hr = reader_parse_xmldecl(reader); + if (FAILED(hr)) return hr; + + readerinput_shrinkraw(reader->input, -1); + reader->instate = XmlReadInState_Misc_DTD; + if (hr == S_OK) return hr; + } + break; + case XmlReadInState_Misc_DTD: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + + if (hr == S_FALSE) + reader->instate = XmlReadInState_DTD; + else + return hr; + break; + case XmlReadInState_DTD: + hr = reader_parse_dtd(reader); + if (FAILED(hr)) return hr; + + if (hr == S_OK) + { + reader->instate = XmlReadInState_DTD_Misc; + return hr; + } + else + reader->instate = XmlReadInState_Element; + break; + case XmlReadInState_DTD_Misc: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + + if (hr == S_FALSE) + reader->instate = XmlReadInState_Element; + else + return hr; + break; + case XmlReadInState_Element: + return reader_parse_element(reader); + case XmlReadInState_Content: + return reader_parse_content(reader); + default: + FIXME("internal state %d not handled\n", reader->instate); + return E_NOTIMPL; + } + } + + return E_NOTIMPL; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(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_IXmlReader)) @@ -774,6 +2001,7 @@ else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -802,6 +2030,8 @@ IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); reader_clear_attrs(This); + reader_clear_elements(This); + reader_free_strvalues(This); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -812,9 +2042,10 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { xmlreader *This = impl_from_IXmlReader(iface); + IXmlReaderInput *readerinput; HRESULT hr; - TRACE("(%p %p)\n", This, input); + TRACE("(%p)->(%p)\n", This, input); if (This->input) { @@ -824,6 +2055,10 @@ } This->line = This->pos = 0; + reader_clear_elements(This); + This->depth = 0; + This->resumestate = XmlReadResumeState_Initial; + memset(This->resume, 0, sizeof(This->resume)); /* just reset current input */ if (!input) @@ -833,11 +2068,23 @@ } /* now try IXmlReaderInput, ISequentialStream, IStream */ - hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); - if (hr != S_OK) - { - IXmlReaderInput *readerinput; - + hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&readerinput); + if (hr == S_OK) + { + if (readerinput->lpVtbl == &xmlreaderinputvtbl) + This->input = impl_from_IXmlReaderInput(readerinput); + else + { + ERR("got external IXmlReaderInput implementation: %p, vtbl=%p\n", + readerinput, readerinput->lpVtbl); + IUnknown_Release(readerinput); + return E_FAIL; + + } + } + + if (hr != S_OK || !readerinput) + { /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &readerinput); @@ -848,7 +2095,10 @@ /* set stream for supplied IXmlReaderInput */ hr = readerinput_query_for_stream(This->input); if (hr == S_OK) + { This->state = XmlReadState_Initial; + This->instate = XmlReadInState_Initial; + } return hr; } @@ -897,44 +2147,22 @@ return S_OK; } -static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) +static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) { xmlreader *This = impl_from_IXmlReader(iface); - - FIXME("(%p)->(%p): stub\n", This, node_type); + XmlNodeType oldtype = This->nodetype; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, nodetype); if (This->state == XmlReadState_Closed) return S_FALSE; - /* if it's a first call for a new input we need to detect stream encoding */ - if (This->state == XmlReadState_Initial) - { - xml_encoding enc; - HRESULT hr; - - hr = readerinput_growraw(This->input); - if (FAILED(hr)) return hr; - - /* try to detect encoding by BOM or data and set input code page */ - hr = readerinput_detectencoding(This->input, &enc); - TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); - if (FAILED(hr)) return hr; - - /* always switch first time cause we have to put something in */ - readerinput_switchencoding(This->input, enc); - - /* parse xml declaration */ - hr = reader_parse_xmldecl(This); - if (FAILED(hr)) return hr; - - if (hr == S_OK) - { - This->state = XmlReadState_Interactive; - This->nodetype = *node_type = XmlNodeType_XmlDeclaration; - return S_OK; - } - } - - return E_NOTIMPL; + hr = reader_parse_nextnode(This); + if (oldtype == XmlNodeType_None && This->nodetype != oldtype) + This->state = XmlReadState_Interactive; + if (hr == S_OK) *nodetype = This->nodetype; + + return hr; } static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) @@ -998,11 +2226,14 @@ return S_OK; } -static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *qualifiedName, - UINT *qualifiedName_length) -{ - FIXME("(%p %p %p): stub\n", iface, qualifiedName, qualifiedName_length); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, name, len); + *name = This->strvalues[StringValue_QualifiedName].str; + *len = This->strvalues[StringValue_QualifiedName].len; + return S_OK; } static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, @@ -1013,12 +2244,14 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, - LPCWSTR *local_name, - UINT *local_name_length) -{ - FIXME("(%p %p %p): stub\n", iface, local_name, local_name_length); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, name, len); + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + return S_OK; } static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, @@ -1029,21 +2262,61 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, - LPCWSTR *value, - UINT *value_length) -{ - FIXME("(%p %p %p): stub\n", iface, value, value_length); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, - WCHAR *buffer, - UINT chunk_size, - UINT *read) -{ - FIXME("(%p %p %u %p): stub\n", iface, buffer, chunk_size, read); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) +{ + xmlreader *reader = impl_from_IXmlReader(iface); + strval *val = &reader->strvalues[StringValue_Value]; + + TRACE("(%p)->(%p %p)\n", reader, value, len); + + *value = NULL; + + if ((reader->nodetype == XmlNodeType_Comment && !val->str) || is_reader_pending(reader)) + { + XmlNodeType type; + HRESULT hr; + + hr = IXmlReader_Read(iface, &type); + if (FAILED(hr)) return hr; + + /* return if still pending, partially read values are not reported */ + if (is_reader_pending(reader)) return E_PENDING; + } + + if (!val->str) + { + val->str = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); + if (!val->str) return E_OUTOFMEMORY; + memcpy(val->str, val->start, val->len*sizeof(WCHAR)); + val->str[val->len] = 0; + } + + *value = val->str; + if (len) *len = val->len; + return S_OK; +} + +static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, WCHAR *buffer, UINT chunk_size, UINT *read) +{ + xmlreader *reader = impl_from_IXmlReader(iface); + strval *val = &reader->strvalues[StringValue_Value]; + UINT len; + + TRACE("(%p)->(%p %u %p)\n", reader, buffer, chunk_size, read); + + /* Value is already allocated, chunked reads are not possible. */ + if (val->str) return S_FALSE; + + if (val->len) + { + len = min(chunk_size, val->len); + memcpy(buffer, val->start, len); + val->start += len; + val->len -= len; + if (read) *read = len; + } + + return S_OK; } static HRESULT WINAPI xmlreader_GetBaseUri(IXmlReader* iface, @@ -1106,8 +2379,10 @@ static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) { - FIXME("(%p %p): stub\n", iface, depth); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, depth); + *depth = This->depth; + return S_OK; } static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) @@ -1151,7 +2426,7 @@ { xmlreaderinput *This = impl_from_IXmlReaderInput(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_IXmlReaderInput) || IsEqualGUID(riid, &IID_IUnknown)) @@ -1161,6 +2436,7 @@ else { WARN("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -1198,7 +2474,7 @@ return ref; } -static const struct IUnknownVtbl xmlreaderinput_vtbl = +static const struct IUnknownVtbl xmlreaderinputvtbl = { xmlreaderinput_QueryInterface, xmlreaderinput_AddRef, @@ -1208,6 +2484,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; + int i; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); @@ -1227,6 +2504,8 @@ reader->ref = 1; reader->input = NULL; reader->state = XmlReadState_Closed; + reader->instate = XmlReadInState_Initial; + reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; reader->imalloc = imalloc; @@ -1235,6 +2514,12 @@ list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->elements); + reader->depth = 0; + memset(reader->resume, 0, sizeof(reader->resume)); + + for (i = 0; i < StringValue_Last; i++) + reader->strvalues[i] = strval_empty; *obj = &reader->IXmlReader_iface; @@ -1264,7 +2549,7 @@ readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; - readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; + readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; readerinput->stream = NULL; @@ -1272,11 +2557,14 @@ readerinput->encoding = parse_encoding_name(encoding, -1); readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); + readerinput->pending = 0; hr = alloc_input_buffer(readerinput); if (hr != S_OK) { + readerinput_free(readerinput, readerinput->baseuri); readerinput_free(readerinput, readerinput); + if (imalloc) IMalloc_Release(imalloc); return hr; } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); Modified: trunk/reactos/dll/win32/xmllite/xmllite_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite_main.c [iso-8859-1] Tue Mar 26 19:02:38 2013 @@ -30,7 +30,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %u, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { 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] Tue Mar 26 19:02:38 2013 @@ -201,7 +201,7 @@ reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19 reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.19 -reactos/dll/win32/xmllite # Synced to Wine-1.5.19 +reactos/dll/win32/xmllite # Synced to Wine-1.5.26 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

1 0

[akhaldi] 58608: [UNIATA] * Sync to 0.44d. [ATACTL] * Sync to 0.44d.
by akhaldi＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: akhaldi Date: Sun Mar 24 19:41:59 2013 New Revision: 58608 URL: http://svn.reactos.org/svn/reactos?rev=58608&view=rev Log: [UNIATA] * Sync to 0.44d. [ATACTL] * Sync to 0.44d. Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… ============================================================================== --- trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -337,7 +337,7 @@ { ULONG status; PSCSI_PASS_THROUGH_WITH_BUFFERS sptwb; - ULONG data_len = BufferLength; + //ULONG data_len = BufferLength; ULONG len; len = BufferLength + offsetof(SCSI_PASS_THROUGH_WITH_BUFFERS, ucDataBuf); @@ -1065,7 +1065,7 @@ { char dev_name[64]; HANDLE h; - BOOLEAN uniata_driven; + //BOOLEAN uniata_driven; if(bus_id == -1) { for(bus_id=0; TRUE; bus_id++) { @@ -1074,7 +1074,7 @@ } return TRUE; } - uniata_driven = ata_adapter_info(bus_id, g_adapter_info); + /*uniata_driven =*/ ata_adapter_info(bus_id, g_adapter_info); sprintf(dev_name, "\\\\.\\Scsi%d:", bus_id); h = ata_open_dev(dev_name); if(!h) @@ -1230,8 +1230,13 @@ &to, sizeof(to), NULL, 0, &returned); + if(!status) { + printf("Delete failed\n"); + } else { + printf("Device is detached\n"); + } ata_close_dev(h); - return TRUE; + return status ? TRUE : FALSE; } // end ata_hide() BOOLEAN @@ -1289,7 +1294,7 @@ FALSE); } ata_close_dev(h); - return TRUE; + return status ? TRUE : FALSE; } // end ata_scan() CHAR* @@ -1656,7 +1661,7 @@ NULL, 0, FALSE, &senseData, &returned); ata_close_dev(h); - return TRUE; + return status ? TRUE : FALSE; } // end ata_power_mode() int Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -333,6 +333,8 @@ #define ATA_SA150 0x47 /*0x80*/ #define ATA_SA300 0x48 /*0x81*/ #define ATA_SA600 0x49 /*0x82*/ + +#define ATA_MODE_NOT_SPEC ((ULONG)(-1)) /*0x82*/ // // IDE command definitions Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -66,7 +66,7 @@ ULONG nDeviceId; ULONG nRevId; ULONG MaxTransferMode; - PCHAR FullDevName; + PVEN_STR FullDevName; ULONG RaidFlags; CHAR VendorIdStr[4]; CHAR DeviceIdStr[4]; @@ -665,7 +665,7 @@ #ifdef USER_MODE #define PCI_DEV_HW_SPEC_BM(idhi, idlo, rev, mode, name, flags) \ - { (PVEN_STR) #idlo, 4, 0x##idlo, (PVEN_STR) #idhi, 4, 0x##idhi, rev, mode, name, flags} + { (PVEN_STR) #idlo, 4, 0x##idlo, (PVEN_STR) #idhi, 4, 0x##idhi, rev, mode, (PVEN_STR)name, flags} #else #define PCI_DEV_HW_SPEC_BM(idhi, idlo, rev, mode, name, flags) \ { (PVEN_STR) #idlo, 4, 0x##idlo, (PVEN_STR) #idhi, 4, 0x##idhi, rev, mode, NULL, flags} Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -1354,7 +1354,7 @@ ULONG waitCount = 50000; ULONG j; UCHAR statusByte; - UCHAR statusByte2; + //UCHAR statusByte2; UCHAR signatureLow, signatureHigh; BOOLEAN atapiDev = FALSE; @@ -1393,7 +1393,7 @@ AtapiStallExecution(10); statusByte = WaitOnBusyLong(chan); // Check that the status register makes sense. - GetBaseStatus(chan, statusByte2); + GetBaseStatus(chan, statusByte); } if (Command == IDE_COMMAND_IDENTIFY) { @@ -1435,11 +1435,11 @@ } } while ((statusByte & IDE_STATUS_BUSY) && waitCount--); - GetBaseStatus(chan, statusByte2); + GetBaseStatus(chan, statusByte); SelectDrive(chan, DeviceNumber); } else { - GetBaseStatus(chan, statusByte2); + GetBaseStatus(chan, statusByte); } // Another check for signature, to deal with one model Atapi that doesn't assert signature after // a soft reset. @@ -3121,7 +3121,7 @@ } else if (!(LunExt->DeviceFlags & DFLAGS_CHANGER_INITED)){ ULONG j; - BOOLEAN isSanyo = FALSE; + //BOOLEAN isSanyo = FALSE; CCHAR vendorId[26]; KdPrint2((PRINT_PREFIX "AtapiHwInitialize: ATAPI/Changer branch\n")); @@ -3142,7 +3142,7 @@ // acting like 1) a multi-lun device and 2) building the 'special' TUR's. LunExt->DeviceFlags |= (DFLAGS_CHANGER_INITED | DFLAGS_SANYO_ATAPI_CHANGER); LunExt->DiscsPresent = 3; - isSanyo = TRUE; + //isSanyo = TRUE; } } } @@ -4533,7 +4533,9 @@ BOOLEAN atapiDev = FALSE; +#ifdef DBG UCHAR Channel; +#endif //DBG UCHAR lChannel; UCHAR DeviceNumber; BOOLEAN DmaTransfer = FALSE; @@ -4564,9 +4566,12 @@ PHW_LU_EXTENSION LunExt; lChannel = c; + +#ifdef DBG Channel = (UCHAR)(deviceExtension->Channel + lChannel); KdPrint2((PRINT_PREFIX " cntrlr %#x:%d, irql %#x, c %d\n", deviceExtension->DevIndex, Channel, KeGetCurrentIrql(), c)); +#endif //DBG if((chan->ChannelCtrlFlags & CTRFLAGS_DMA_ACTIVE) || (AtaReq && (AtaReq->Flags & REQ_FLAG_DMA_OPERATION)) || @@ -5525,11 +5530,20 @@ } else if (interruptReason == (ATAPI_IR_IO_toHost | ATAPI_IR_COD_Cmd) && !(statusByte & IDE_STATUS_DRQ)) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: interruptReason = CompleteRequest\n")); - // Command complete. + // Command complete. We exactly know this because os IReason. + if(DmaTransfer) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, was DmaTransfer\n")); - AtaReq->WordsTransfered = AtaReq->WordsLeft; + AtaReq->WordsTransfered += AtaReq->WordsLeft; AtaReq->WordsLeft = 0; + } else { + KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, was PIO\n")); + + wordCount = AtaReq->WordsLeft; + // Advance data buffer pointer and bytes left. + AtaReq->DataBuffer += wordCount; + AtaReq->WordsLeft -= wordCount; + AtaReq->WordsTransfered += wordCount; } //if (AtaReq->WordsLeft) { // status = SRB_STATUS_DATA_OVERRUN; @@ -9905,7 +9919,7 @@ ULONG statusToReturn, newStatus; PUNICODE_STRING RegistryPath = (PUNICODE_STRING)Argument2; BOOLEAN ReEnter = FALSE; - WCHAR a; +// WCHAR a; #ifndef USE_REACTOS_DDK NTSTATUS status; #endif @@ -9918,7 +9932,7 @@ Connect_DbgPrint(); KdPrint2((PRINT_PREFIX "%s", (PCCHAR)ver_string)); - a = (WCHAR)strlen(ver_string); + //a = (WCHAR)strlen(ver_string); g_opt_Verbose = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PrintLogo", 0); if(g_opt_Verbose) { @@ -10752,7 +10766,7 @@ } if(deviceExtension->AdapterInterfaceType == PCIBus) { // we must never get here for non-PCI - status = UniataDisconnectIntr2(HwDeviceExtension); + /*status =*/ UniataDisconnectIntr2(HwDeviceExtension); BMList[deviceExtension->DevIndex].Isr2Enable = FALSE; } break; @@ -10765,15 +10779,17 @@ AtapiChipInit(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, CHAN_NOT_SPECIFIED); status = UniataConnectIntr2(HwDeviceExtension); - for (c = 0; c < numberChannels; c++) { - AtapiChipInit(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, c); - FindDevices(HwDeviceExtension, 0, c); - AtapiEnableInterrupts(deviceExtension, c); - AtapiHwInitialize__(deviceExtension, c); - } - if(deviceExtension->Isr2DevObj) { - // we must never get here for non-PCI - BMList[deviceExtension->DevIndex].Isr2Enable = TRUE; + if(NT_SUCCESS(status)) { + for (c = 0; c < numberChannels; c++) { + AtapiChipInit(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, c); + FindDevices(HwDeviceExtension, 0, c); + AtapiEnableInterrupts(deviceExtension, c); + AtapiHwInitialize__(deviceExtension, c); + } + if(deviceExtension->Isr2DevObj) { + // we must never get here for non-PCI + BMList[deviceExtension->DevIndex].Isr2Enable = TRUE; + } } break; @@ -10808,13 +10824,13 @@ ... ) { - int len; + //int len; UCHAR dbg_print_tmp_buff[DEBUG_MSG_BUFFER_SIZE]; // UNICODE_STRING msgBuff; va_list ap; va_start(ap, DebugMessage); - len = _vsnprintf((PCHAR)&dbg_print_tmp_buff[0], DEBUG_MSG_BUFFER_SIZE-1, DebugMessage, ap); + /*len =*/ _vsnprintf((PCHAR)&dbg_print_tmp_buff[0], DEBUG_MSG_BUFFER_SIZE-1, DebugMessage, ap); dbg_print_tmp_buff[DEBUG_MSG_BUFFER_SIZE-1] = 0; Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -359,10 +359,10 @@ }; static BUSMASTER_CONTROLLER_INFORMATION const ViaSouthAdapters[] = { - PCI_DEV_HW_SPEC_BM( 3112, 1106, 0x00, -1, "VIA 8361", VIASOUTH ), - PCI_DEV_HW_SPEC_BM( 0305, 1106, 0x00, -1, "VIA 8363", VIASOUTH ), - PCI_DEV_HW_SPEC_BM( 0391, 1106, 0x00, -1, "VIA 8371", VIASOUTH ), - PCI_DEV_HW_SPEC_BM( 3102, 1106, 0x00, -1, "VIA 8662", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 3112, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8361", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 0305, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8363", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 0391, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8371", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 3102, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8662", VIASOUTH ), PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, BMLIST_TERMINATOR, NULL , BMLIST_TERMINATOR ) }; @@ -785,9 +785,9 @@ ChangePciConfig1(0x57, (a | 0x80)); } else { static BUSMASTER_CONTROLLER_INFORMATION const SiSSouthAdapters[] = { - PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x10, -1, "SiS 961", 0 ), -// PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x00, -1, "SiS 961", 0 ), - PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, -1, NULL , -1 ) + PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x10, ATA_MODE_NOT_SPEC, "SiS 961", 0 ), +// PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x00, ATA_MODE_NOT_SPEC, "SiS 961", 0 ), + PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, ATA_MODE_NOT_SPEC, NULL , -1 ) }; // Save settings GetPciConfig1(0x4a, tmp8); @@ -798,8 +798,8 @@ -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, NULL); if(i != BMLIST_TERMINATOR) { deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD; - //deviceExtension->MaxTransferMode = ATA_UDMA6; - deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; + deviceExtension->MaxTransferMode = ATA_UDMA6; + //deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; if(SiSSouthAdapters[i].RaidFlags & UNIATA_SATA) { deviceExtension->HwFlags |= UNIATA_SATA; if(SiSSouthAdapters[i].nDeviceId == 0x1182) { @@ -1651,7 +1651,7 @@ PHW_CHANNEL chan; UCHAR tmp8; USHORT tmp16; - ULONG tmp32; + //ULONG tmp32; ULONG c; // logical channel (for Compatible Mode controllers) BOOLEAN CheckCable = FALSE; BOOLEAN GlobalInit = FALSE; @@ -2142,15 +2142,15 @@ chan = &deviceExtension->chan[c]; /* dont block interrupts */ //ChangePciConfig4(0x48, (a & ~0x03c00000)); - tmp32 = AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); + /*tmp32 =*/ AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48, (1 << 22) << c); // flush - tmp32 = AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); + /*tmp32 =*/ AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); /* Initialize FIFO PCI bus arbitration */ GetPciConfig1(offsetof(PCI_COMMON_CONFIG, CacheLineSize), tmp8); if(tmp8) { - KdPrint2((PRINT_PREFIX "SII: CacheLine=%d\n", tmp32)); + KdPrint2((PRINT_PREFIX "SII: CacheLine=%d\n", tmp8)); tmp8 = (tmp8/8)+1; AtapiWritePort2(chan, IDX_BM_DeviceSpecific1, ((USHORT)tmp8) << 8 | tmp8); } else { Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -127,6 +127,10 @@ // reread config space busDataRead = HalGetBusData(PCIConfiguration, busNumber, slotNumber, pciData, PCI_COMMON_HDR_LENGTH); + if(busDataRead < PCI_COMMON_HDR_LENGTH) { + KdPrint2((PRINT_PREFIX "HalGetBusData() failed %#x\n", busDataRead)); + break; + } KdPrint2((PRINT_PREFIX "New pciData.Command = %#x\n", pciData->Command)); } KdPrint2((PRINT_PREFIX "InterruptLine = %#x\n", pciData->u.type0.InterruptLine)); @@ -287,7 +291,7 @@ ) { // PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - PVOID HwDeviceExtension; +// PVOID HwDeviceExtension; PHW_DEVICE_EXTENSION deviceExtension = NULL; PCI_SLOT_NUMBER slotData; PCI_COMMON_CONFIG pciData; @@ -328,7 +332,7 @@ deviceStrPtr = deviceString; slotData.u.AsULONG = 0; - HwDeviceExtension = + /*HwDeviceExtension =*/ deviceExtension = (PHW_DEVICE_EXTENSION)ExAllocatePool(NonPagedPool, sizeof(HW_DEVICE_EXTENSION)); if(!deviceExtension) { return(SP_RETURN_NOT_FOUND); @@ -920,12 +924,13 @@ ULONG slotNumber; ULONG busDataRead; ULONG SystemIoBusNumber; - +/* UCHAR vendorString[5]; UCHAR deviceString[5]; + PUCHAR vendorStrPtr; PUCHAR deviceStrPtr; - +*/ UCHAR BaseClass; UCHAR SubClass; ULONG VendorID; @@ -1025,10 +1030,10 @@ return SP_RETURN_ERROR; } RtlZeroMemory(deviceExtension, sizeof(HW_DEVICE_EXTENSION)); - +/* vendorStrPtr = vendorString; deviceStrPtr = deviceString; - +*/ slotNumber = BMList[i].slotNumber; SystemIoBusNumber = BMList[i].busNumber; @@ -2108,7 +2113,7 @@ ULONG irq=0; ULONG portBase; ULONG retryCount; - BOOLEAN atapiOnly; +// BOOLEAN atapiOnly; UCHAR statusByte; BOOLEAN preConfig = FALSE; // @@ -2457,12 +2462,12 @@ if (AtapiParseArgumentString(ArgumentString, "dump") == 1) { KdPrint2((PRINT_PREFIX "AtapiFindController: Crash dump\n")); - atapiOnly = FALSE; + //atapiOnly = FALSE; deviceExtension->DriverMustPoll = TRUE; } else { KdPrint2((PRINT_PREFIX "AtapiFindController: Atapi Only\n")); - atapiOnly = TRUE; + //atapiOnly = TRUE; deviceExtension->DriverMustPoll = FALSE; } #endif //UNIATA_CORE @@ -2470,17 +2475,17 @@ KdPrint2((PRINT_PREFIX "AtapiFindController: Atapi Only (2)\n")); - atapiOnly = TRUE; + //atapiOnly = TRUE; deviceExtension->DriverMustPoll = FALSE; } } else { - atapiOnly = FALSE; + //atapiOnly = FALSE; } } else { - atapiOnly = FALSE; + //atapiOnly = FALSE; deviceExtension->DriverMustPoll = FALSE; }// preConfig check Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -645,7 +645,9 @@ PHW_CHANNEL chan; ULONG offs; ULONG BaseMemAddress; +#ifdef DBG ULONG PI; +#endif //DBG ULONG CAP; ULONG GHC; BOOLEAN MemIo = FALSE; @@ -722,9 +724,11 @@ if(CAP & AHCI_CAP_SAM) { KdPrint2((PRINT_PREFIX " AHCI legasy SATA\n")); } +#ifdef DBG /* get the number of HW channels */ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); KdPrint2((PRINT_PREFIX " AHCI PI %#x\n", PI)); +#endif //DBG /* clear interrupts */ UniataAhciWriteHostPort4(deviceExtension, IDX_AHCI_IS, @@ -837,9 +841,11 @@ ULONG CAP; ULONG CAP2; ULONG GHC, GHC0; +#ifdef DBG ULONG BOHC; + ULONG v_Mn, v_Mj; +#endif //DBG ULONG NumberChannels; - ULONG v_Mn, v_Mj; ULONG BaseMemAddress; BOOLEAN MemIo = FALSE; BOOLEAN found = FALSE; @@ -905,10 +911,12 @@ KdPrint2((PRINT_PREFIX " 64bit")); //deviceExtension->Host64 = TRUE; // this is just DETECT, do not update anything } +#ifdef DBG if(CAP2 & AHCI_CAP2_BOH) { BOHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_BOHC); KdPrint2((PRINT_PREFIX " BOHC %#x", BOHC)); } +#endif //DBG if(CAP & AHCI_CAP_NCQ) { KdPrint2((PRINT_PREFIX " NCQ")); } @@ -950,6 +958,7 @@ goto exit_detect; } +#ifdef DBG v_Mj = ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f); v_Mn = ((version >> 4) & 0xf0) + (version & 0x0f); @@ -957,6 +966,7 @@ v_Mj, v_Mn, NumberChannels, PI)); KdPrint((" AHCI SATA Gen %d\n", (((CAP & AHCI_CAP_ISS_MASK) >> 20)) )); +#endif //DBG if(CAP & AHCI_CAP_SPM) { KdPrint2((PRINT_PREFIX " PM supported\n")); @@ -2166,11 +2176,11 @@ ULONG tag=0; //ULONG i; PIDE_AHCI_CMD_LIST AHCI_CL = &(chan->AhciCtlBlock->cmd_list[tag]); - PHW_LU_EXTENSION LunExt; + //PHW_LU_EXTENSION LunExt; KdPrint2(("UniataAhciEndTransaction: lChan %d\n", chan->lChannel)); - LunExt = chan->lun[DeviceNumber]; + //LunExt = chan->lun[DeviceNumber]; TFD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_TFD); KdPrint2((" TFD %#x\n", TFD)); @@ -2474,7 +2484,9 @@ PUCHAR prd_base0; ULONGLONG prd_base64_0; }; +#ifdef DBG ULONG d; +#endif // DBG prd_base64_0 = prd_base64 = 0; prd_base = (PUCHAR)(&AtaReq->ahci_cmd0); @@ -2482,8 +2494,10 @@ prd_base64 = (prd_base64 + max(FIELD_OFFSET(ATA_REQ, ahci_cmd0), AHCI_CMD_ALIGNEMENT_MASK+1)) & ~AHCI_CMD_ALIGNEMENT_MASK; +#ifdef DBG d = (ULONG)(prd_base64 - prd_base64_0); KdPrint2((PRINT_PREFIX " AtaReq %#x: cmd aligned %I64x, d=%x\n", AtaReq, prd_base64, d)); +#endif // DBG AtaReq->ahci.ahci_cmd_ptr = (PIDE_AHCI_CMD)prd_base64; KdPrint2((PRINT_PREFIX " ahci_cmd_ptr %#x\n", AtaReq->ahci.ahci_cmd_ptr)); Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -6,5 +6,5 @@ #define UNIATA_VER_SUB_MN 1 #define UNIATA_VER_DOT_COMMA 0,44,2,1 #define UNIATA_VER_DOT_STR "0.44.2.1" -#define UNIATA_VER_YEAR 2012 -#define UNIATA_VER_YEAR_STR "2012" +#define UNIATA_VER_YEAR 2013 +#define UNIATA_VER_YEAR_STR "2013"

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