Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 57241: [NTOSKRNL] - Remove an unused variable. [CHARMAP][CSRSRV][MOUNTMGR] - Declare variables extern.
by dgorbachev＠svn.reactos.org 05 Sep '12

05 Sep '12

Author: dgorbachev Date: Wed Sep 5 21:38:02 2012 New Revision: 57241 URL: http://svn.reactos.org/svn/reactos?rev=57241&view=rev Log: [NTOSKRNL] - Remove an unused variable. [CHARMAP][CSRSRV][MOUNTMGR] - Declare variables extern. Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/precomp.h trunk/reactos/drivers/filters/mountmgr/mntmgr.h trunk/reactos/drivers/filters/mountmgr/mountmgr.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Wed Sep 5 21:38:02 2012 @@ -13,9 +13,11 @@ HINSTANCE hInstance; HWND hAdvancedDlg; +HWND hCharmapDlg; HWND hStatusWnd; HICON hSmIcon; HICON hBgIcon; +SETTINGS Settings; /* Font-enumeration callback */ static Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Wed Sep 5 21:38:02 2012 @@ -57,8 +57,8 @@ BOOL IsAdvancedView; } SETTINGS; -SETTINGS Settings; -HWND hCharmapDlg; +extern SETTINGS Settings; +extern HWND hCharmapDlg; LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Wed Sep 5 21:38:02 2012 @@ -152,8 +152,6 @@ ULONG StackSize; // 0x2C } UNIQUE_ID_WORK_ITEM, *PUNIQUE_ID_WORK_ITEM; // 0x30 -PDEVICE_OBJECT gdeviceObject; - /* Memory allocation helpers */ #define AllocatePool(Size) ExAllocatePoolWithTag(PagedPool, Size, 'AtnM') #define FreePool(P) ExFreePoolWithTag(P, 'AtnM') @@ -168,6 +166,7 @@ /* mountmgr.c */ extern UNICODE_STRING DosDevicesMount; +extern PDEVICE_OBJECT gdeviceObject; extern UNICODE_STRING ReparseIndex; extern UNICODE_STRING DeviceFloppy; extern UNICODE_STRING DeviceMount; Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Wed Sep 5 21:38:02 2012 @@ -34,6 +34,7 @@ /* FIXME */ GUID MountedDevicesGuid = {0x53F5630D, 0xB6BF, 0x11D0, {0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B}}; +PDEVICE_OBJECT gdeviceObject; KEVENT UnloadEvent; LONG Unloading; Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Wed Sep 5 21:38:02 2012 @@ -91,8 +91,6 @@ /* GLOBALS *******************************************************************/ -ULONG_PTR MmSubsectionBase; - static const INFORMATION_CLASS_INFO ExSectionInfoClass[] = { ICI_SQ_SAME( sizeof(SECTION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionBasicInformation */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Sep 5 21:38:02 2012 @@ -22,7 +22,7 @@ UNICODE_STRING CsrApiPortName; volatile LONG CsrpStaticThreadCount; volatile LONG CsrpDynamicThreadTotal; -ULONG CsrMaxApiRequestThreads; +extern ULONG CsrMaxApiRequestThreads; /* FUNCTIONS *****************************************************************/

1 0

[dgorbachev] 57240: [PSDK] Mark Disconnect() method of INetConnectionConnectUi as pure in netcon.h
by dgorbachev＠svn.reactos.org 05 Sep '12

05 Sep '12

Author: dgorbachev Date: Wed Sep 5 21:36:16 2012 New Revision: 57240 URL: http://svn.reactos.org/svn/reactos?rev=57240&view=rev Log: [PSDK] Mark Disconnect() method of INetConnectionConnectUi as pure in netcon.h Modified: trunk/reactos/include/psdk/netcon.h Modified: trunk/reactos/include/psdk/netcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/netcon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Wed Sep 5 21:36:16 2012 @@ -188,7 +188,7 @@ STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(HRESULT,SetConnection)(THIS_ INetConnection* pCon) PURE; STDMETHOD_(HRESULT,Connect) (THIS_ HWND hwndParent, DWORD dwFlags) PURE; - STDMETHOD_(HRESULT,Disconnect) (THIS_ HWND hwndParent, DWORD dwFlags); + STDMETHOD_(HRESULT,Disconnect) (THIS_ HWND hwndParent, DWORD dwFlags) PURE; }; #if !defined(__cplusplus) || defined(CINTERFACE)

1 0

[akhaldi] 57239: [SMSS] * Rename the folder back to smss now. See issue #7278 for more details.
by akhaldi＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: akhaldi Date: Tue Sep 4 21:05:16 2012 New Revision: 57239 URL: http://svn.reactos.org/svn/reactos?rev=57239&view=rev Log: [SMSS] * Rename the folder back to smss now. See issue #7278 for more details. Added: trunk/reactos/base/system/smss/ - copied from r57195, trunk/reactos/base/system/smss2/ Removed: trunk/reactos/base/system/smss2/ Modified: trunk/reactos/base/system/CMakeLists.txt Modified: trunk/reactos/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/CMakeLists.txt… ============================================================================== --- trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] Tue Sep 4 21:05:16 2012 @@ -10,7 +10,7 @@ add_subdirectory(rundll32) add_subdirectory(runonce) add_subdirectory(services) -add_subdirectory(smss2) +add_subdirectory(smss) add_subdirectory(subst) add_subdirectory(userinit) add_subdirectory(winlogon)

1 0

[akhaldi] 57238: [CMAKE] * Remove the importlibs folder. It's not needed anymore. While we're here, it's worth noting that the use of link_directories is not recommended, you should use target_link...
by akhaldi＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: akhaldi Date: Tue Sep 4 20:56:22 2012 New Revision: 57238 URL: http://svn.reactos.org/svn/reactos?rev=57238&view=rev Log: [CMAKE] * Remove the importlibs folder. It's not needed anymore. While we're here, it's worth noting that the use of link_directories is not recommended, you should use target_link_libraries with absolute paths for example. Removed: trunk/reactos/importlibs/ Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57238&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Sep 4 20:56:22 2012 @@ -85,9 +85,6 @@ #useful stuff! include(CMakeParseArguments) - - # this is needed as well - link_directories(${REACTOS_SOURCE_DIR}/importlibs) if(ENABLE_CCACHE) set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)

1 0

[cgutman] 57237: [AFD] - Try to fix MSVC build
by cgutman＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: cgutman Date: Tue Sep 4 07:42:21 2012 New Revision: 57237 URL: http://svn.reactos.org/svn/reactos?rev=57237&view=rev Log: [AFD] - Try to fix MSVC build Modified: trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/include/reactos/drivers/afd/shared.h Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Tue Sep 4 07:42:21 2012 @@ -123,7 +123,6 @@ } /* We need to create the info struct that AFD expects for all send/recv requests */ - C_ASSERT(sizeof(AFD_RECV_INFO) == sizeof(AFD_SEND_INFO)); AfdInfo = ExAllocatePool(NonPagedPool, sizeof(AFD_RECV_INFO) + sizeof(AFD_WSABUF)); if (!AfdInfo) { Modified: trunk/reactos/include/reactos/drivers/afd/shared.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/af… ============================================================================== --- trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] Tue Sep 4 07:42:21 2012 @@ -111,6 +111,8 @@ TDI_REQUEST_SEND_DATAGRAM TdiRequest; TDI_CONNECTION_INFORMATION TdiConnection; } AFD_SEND_INFO_UDP, *PAFD_SEND_INFO_UDP; + +C_ASSERT(sizeof(AFD_RECV_INFO) == sizeof(AFD_SEND_INFO)); typedef struct _AFD_CONNECT_INFO { BOOLEAN UseSAN;

1 0

[jimtabor] 57236: [Win32k] - Move more support for Desktop Proc into Win32k. Increase Desktop drawing by about 10%. Rearanged code and plugged in the server side callout.
by jimtabor＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: jimtabor Date: Tue Sep 4 05:37:13 2012 New Revision: 57236 URL: http://svn.reactos.org/svn/reactos?rev=57236&view=rev Log: [Win32k] - Move more support for Desktop Proc into Win32k. Increase Desktop drawing by about 10%. Rearanged code and plugged in the server side callout. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/user32/misc/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue Sep 4 05:37:13 2012 @@ -547,11 +547,15 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -LRESULT FASTCALL -DesktopWindowProc(PWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) -{ +BOOL FASTCALL +DesktopWindowProc(PWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult) +{ + PAINTSTRUCT Ps; ULONG Value; //ERR("DesktopWindowProc\n"); + + *lResult = 0; + switch (Msg) { case WM_NCCREATE: @@ -559,7 +563,8 @@ { Wnd->fnid = FNID_DESKTOP; } - return (LRESULT)TRUE; + *lResult = (LRESULT)TRUE; + return TRUE; case WM_CREATE: Value = HandleToULong(PsGetCurrentProcessId()); @@ -568,14 +573,31 @@ Value = HandleToULong(PsGetCurrentThreadId()); // Save Thread ID co_UserSetWindowLong(UserHMGetHandle(Wnd), DT_GWL_THREADID, Value, FALSE); - case WM_CLOSE: - return 0; + case WM_CLOSE: + return TRUE; case WM_DISPLAYCHANGE: co_WinPosSetWindowPos(Wnd, 0, 0, 0, LOWORD(lParam), HIWORD(lParam), SWP_NOZORDER | SWP_NOACTIVATE); - break; - } - return 0; + return TRUE; + + case WM_ERASEBKGND: + IntPaintDesktop((HDC)wParam); + *lResult = 1; + return TRUE; + + case WM_PAINT: + { + if (IntBeginPaint(Wnd, &Ps)) + { + IntEndPaint(Wnd, &Ps); + } + return TRUE; + } + case WM_SYSCOLORCHANGE: + co_UserRedrawWindow(Wnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN); + return TRUE; + } + return FALSE; // Not processed so go with callback. } HDC FASTCALL @@ -934,7 +956,6 @@ /* Black desktop background in Safe Mode */ DesktopBrush = StockObjects[BLACK_BRUSH]; } - /* Back ground is set to none, clear the screen */ if (doPatBlt) { @@ -993,16 +1014,13 @@ GreExtTextOutW(hDC, rect.left, rect.top, 0, NULL, s_wszSafeMode, len, NULL, 0); IntGdiSetTextAlign(hDC, TA_LEFT|TA_BASELINE); GreExtTextOutW(hDC, rect.left, rect.bottom, 0, NULL, s_wszSafeMode, len, NULL, 0); - } - IntGdiSetBkMode(hDC, mode_old); IntGdiSetTextAlign(hDC, align_old); IntGdiSetTextColor(hDC, color_old); } } - return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Tue Sep 4 05:37:13 2012 @@ -282,5 +282,5 @@ PWND FASTCALL IntGetThreadDesktopWindow(PTHREADINFO); PWND FASTCALL co_GetDesktopWindow(PWND); BOOL FASTCALL IntPaintDesktop(HDC); -LRESULT FASTCALL DesktopWindowProc(PWND, UINT, WPARAM, LPARAM); +BOOL FASTCALL DesktopWindowProc(PWND, UINT, WPARAM, LPARAM, LRESULT *); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Sep 4 05:37:13 2012 @@ -649,6 +649,7 @@ PTHREADINFO pti; PWND Window = NULL; HRGN hrgn; + BOOL DoCallBack = TRUE; if (pMsg->hwnd) { @@ -704,12 +705,23 @@ if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) { TRACE("Dispatch: Server Side Window Procedure\n"); + switch(Window->fnid) + { + case FNID_DESKTOP: + DoCallBack = !DesktopWindowProc( Window, + pMsg->message, + pMsg->wParam, + pMsg->lParam, + &retval); + break; + } } /* Since we are doing a callback on the same thread right away, there is no need to copy the lparam to kernel mode and then back to usermode. We just pretend it isn't a pointer */ + if (DoCallBack) retval = co_IntCallWindowProc( Window->lpfnWndProc, !Window->Unicode, pMsg->hwnd, @@ -1247,6 +1259,7 @@ ULONG_PTR Hi, Lo, Result = 0; DECLARE_RETURN(LRESULT); USER_REFERENCE_ENTRY Ref; + BOOL DoCallBack = TRUE; if (!(Window = UserGetWindowObject(hWnd))) { @@ -1289,6 +1302,17 @@ RETURN( FALSE); } /* Return after server side call, IntCallWndProcRet will not be called. */ + switch(Window->fnid) + { + case FNID_DESKTOP: + DoCallBack = !DesktopWindowProc(Window, Msg, wParam, lParam,(LRESULT*)&Result); + break; + } + if (!DoCallBack) + { + if (uResult) *uResult = Result; + RETURN( TRUE); + } } /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Msg); @@ -1493,6 +1517,7 @@ DECLARE_RETURN(LRESULT); USER_REFERENCE_ENTRY Ref; PUSER_SENT_MESSAGE Message; + BOOL DoCallBack = TRUE; if (!(Window = UserGetWindowObject(hWnd))) { @@ -1560,8 +1585,15 @@ if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) { TRACE("SMWCB: Server Side Window Procedure\n"); - } - + switch(Window->fnid) + { + case FNID_DESKTOP: + DoCallBack = !DesktopWindowProc(Window, Msg, wParam, lParamPacked, (LRESULT*)&Result); + break; + } + } + + if (DoCallBack) Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, !Window->Unicode, hWnd, @@ -2193,7 +2225,12 @@ case FNID_DESKTOP: { Window = UserGetWindowObject(hWnd); - if (Window) lResult = DesktopWindowProc(Window, Msg, wParam, lParam); + if (Window) + { + ERR("FNID_DESKTOP IN\n"); + Ret = DesktopWindowProc(Window, Msg, wParam, lParam, &lResult); + ERR("FNID_DESKTOP OUT\n"); + } break; } case FNID_DEFWINDOWPROC: Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Tue Sep 4 05:37:13 2012 @@ -916,6 +916,105 @@ return Ret; } +HDC FASTCALL +IntBeginPaint(PWND Window, PPAINTSTRUCT Ps) +{ + co_UserHideCaret(Window); + + Window->state2 |= WNDS2_STARTPAINT; + Window->state &= ~WNDS_PAINTNOTPROCESSED; + + if (Window->state & WNDS_SENDNCPAINT) + { + HRGN hRgn; + + Window->state &= ~WNDS_UPDATEDIRTY; + hRgn = IntGetNCUpdateRgn(Window, FALSE); + Window->state &= ~WNDS_SENDNCPAINT; + co_IntSendMessage(UserHMGetHandle(Window), WM_NCPAINT, (WPARAM)hRgn, 0); + if (hRgn != HRGN_WINDOW && hRgn != NULL && GreIsHandleValid(hRgn)) + { + /* NOTE: The region can already be deleted! */ + GreDeleteObject(hRgn); + } + } + else + { + Window->state &= ~WNDS_UPDATEDIRTY; + } + + RtlZeroMemory(Ps, sizeof(PAINTSTRUCT)); + + Ps->hdc = UserGetDCEx( Window, + Window->hrgnUpdate, + DCX_INTERSECTRGN | DCX_USESTYLE); + if (!Ps->hdc) + { + return NULL; + } + + if (Window->hrgnUpdate != NULL) + { + MsqDecPaintCountQueue(Window->head.pti->MessageQueue); + GdiGetClipBox(Ps->hdc, &Ps->rcPaint); + IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); + /* The region is part of the dc now and belongs to the process! */ + Window->hrgnUpdate = NULL; + } + else + { + if (Window->state & WNDS_INTERNALPAINT) + MsqDecPaintCountQueue(Window->head.pti->MessageQueue); + + IntGetClientRect(Window, &Ps->rcPaint); + } + + Window->state &= ~WNDS_INTERNALPAINT; + + if (Window->state & WNDS_SENDERASEBACKGROUND) + { + Window->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + Ps->fErase = !co_IntSendMessage(UserHMGetHandle(Window), WM_ERASEBKGND, (WPARAM)Ps->hdc, 0); + if ( Ps->fErase ) + { + Window->state |= (WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + } + } + else + { + Ps->fErase = FALSE; + } + if (Window->hrgnUpdate) + { + if (!(Window->style & WS_CLIPCHILDREN)) + { + PWND Child; + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) + { + if (Child->hrgnUpdate == NULL && Child->state & WNDS_SENDNCPAINT) // Helped fixing test_redrawnow. + IntInvalidateWindows(Child, Window->hrgnUpdate, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); + } + } + } + return Ps->hdc; +} + +BOOL FASTCALL +IntEndPaint(PWND Wnd, PPAINTSTRUCT Ps) +{ + HDC hdc = NULL; + + hdc = Ps->hdc; + + UserReleaseDC(Wnd, hdc, TRUE); + + Wnd->state2 &= ~(WNDS2_WMPAINTSENT|WNDS2_STARTPAINT); + + co_UserShowCaret(Wnd); + + return TRUE; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -931,8 +1030,9 @@ PWND Window = NULL; PAINTSTRUCT Ps; NTSTATUS Status; + HDC hDC; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(HDC); - USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserBeginPaint\n"); UserEnterExclusive(); @@ -944,83 +1044,7 @@ UserRefObjectCo(Window, &Ref); - co_UserHideCaret(Window); - - Window->state2 |= WNDS2_STARTPAINT; - Window->state &= ~WNDS_PAINTNOTPROCESSED; - - if (Window->state & WNDS_SENDNCPAINT) - { - HRGN hRgn; - - Window->state &= ~WNDS_UPDATEDIRTY; - hRgn = IntGetNCUpdateRgn(Window, FALSE); - Window->state &= ~WNDS_SENDNCPAINT; - co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)hRgn, 0); - if (hRgn != HRGN_WINDOW && hRgn != NULL && GreIsHandleValid(hRgn)) - { - /* NOTE: The region can already be deleted! */ - GreDeleteObject(hRgn); - } - } - else - { - Window->state &= ~WNDS_UPDATEDIRTY; - } - - RtlZeroMemory(&Ps, sizeof(PAINTSTRUCT)); - - Ps.hdc = UserGetDCEx( Window, - Window->hrgnUpdate, - DCX_INTERSECTRGN | DCX_USESTYLE); - if (!Ps.hdc) - { - RETURN(NULL); - } - - if (Window->hrgnUpdate != NULL) - { - MsqDecPaintCountQueue(Window->head.pti->MessageQueue); - GdiGetClipBox(Ps.hdc, &Ps.rcPaint); - IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); - /* The region is part of the dc now and belongs to the process! */ - Window->hrgnUpdate = NULL; - } - else - { - if (Window->state & WNDS_INTERNALPAINT) - MsqDecPaintCountQueue(Window->head.pti->MessageQueue); - - IntGetClientRect(Window, &Ps.rcPaint); - } - - Window->state &= ~WNDS_INTERNALPAINT; - - if (Window->state & WNDS_SENDERASEBACKGROUND) - { - Window->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); - Ps.fErase = !co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)Ps.hdc, 0); - if ( Ps.fErase ) - { - Window->state |= (WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); - } - } - else - { - Ps.fErase = FALSE; - } - if (Window->hrgnUpdate) - { - if (!(Window->style & WS_CLIPCHILDREN)) - { - PWND Child; - for (Child = Window->spwndChild; Child; Child = Child->spwndNext) - { - if (Child->hrgnUpdate == NULL && Child->state & WNDS_SENDNCPAINT) // Helped fixing test_redrawnow. - IntInvalidateWindows(Child, Window->hrgnUpdate, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); - } - } - } + hDC = IntBeginPaint(Window, &Ps); Status = MmCopyToCaller(UnsafePs, &Ps, sizeof(PAINTSTRUCT)); if (! NT_SUCCESS(Status)) @@ -1029,7 +1053,7 @@ RETURN(NULL); } - RETURN(Ps.hdc); + RETURN(hDC); CLEANUP: if (Window) UserDerefObjectCo(Window); @@ -1051,10 +1075,10 @@ NtUserEndPaint(HWND hWnd, CONST PAINTSTRUCT* pUnsafePs) { NTSTATUS Status = STATUS_SUCCESS; - PWND Window; + PWND Window = NULL; + PAINTSTRUCT Ps; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(BOOL); - USER_REFERENCE_ENTRY Ref; - HDC hdc = NULL; TRACE("Enter NtUserEndPaint\n"); UserEnterExclusive(); @@ -1067,7 +1091,7 @@ _SEH2_TRY { ProbeForRead(pUnsafePs, sizeof(*pUnsafePs), 1); - hdc = pUnsafePs->hdc; + RtlCopyMemory(&Ps, pUnsafePs, sizeof(PAINTSTRUCT)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1079,17 +1103,13 @@ RETURN(FALSE); } - UserReleaseDC(Window, hdc, TRUE); - - Window->state2 &= ~(WNDS2_WMPAINTSENT|WNDS2_STARTPAINT); - UserRefObjectCo(Window, &Ref); - co_UserShowCaret(Window); - UserDerefObjectCo(Window); - - RETURN(TRUE); + + RETURN(IntEndPaint(Window, &Ps)); CLEANUP: + if (Window) UserDerefObjectCo(Window); + TRACE("Leave NtUserEndPaint, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Tue Sep 4 05:37:13 2012 @@ -8,3 +8,5 @@ VOID FASTCALL co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); BOOL FASTCALL IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse); BOOL FASTCALL IntIsWindowDirty(PWND); +BOOL FASTCALL IntEndPaint(PWND,PPAINTSTRUCT); +HDC FASTCALL IntBeginPaint(PWND,PPAINTSTRUCT); Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Tue Sep 4 05:37:13 2012 @@ -1493,7 +1493,7 @@ INT cx, INT cy, UINT flags -) + ) { WINDOWPOS WinPos; RECTL NewWindowRect; Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] Tue Sep 4 05:37:13 2012 @@ -37,35 +37,23 @@ WPARAM wParam, LPARAM lParam) { - PAINTSTRUCT PS; TRACE("Desktop W Class Atom! hWnd 0x%x, Msg %d\n", Wnd, Msg); switch(Msg) { + case WM_ERASEBKGND: case WM_NCCREATE: case WM_CREATE: case WM_CLOSE: case WM_DISPLAYCHANGE: + case WM_PAINT: + case WM_SYSCOLORCHANGE: { LRESULT lResult; NtUserMessageCall( Wnd, Msg, wParam, lParam, (ULONG_PTR)&lResult, FNID_DESKTOP, FALSE); + TRACE("Desktop lResult %d\n", lResult); return lResult; } - - case WM_ERASEBKGND: - PaintDesktop((HDC)wParam); - return 1; - - case WM_PAINT: - if (BeginPaint(Wnd, &PS)) - { - EndPaint(Wnd, &PS); - } - return 0; - - case WM_SYSCOLORCHANGE: - RedrawWindow(Wnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN); - break; case WM_PALETTECHANGED: if (Wnd == (HWND)wParam) break;

1 0

[cgutman] 57235: [WININET] - Merge fix for buffer overrun causing rapps to crash - http://www.winehq.org/pipermail/wine-patches/2012-July/115909.html
by cgutman＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: cgutman Date: Tue Sep 4 05:05:57 2012 New Revision: 57235 URL: http://svn.reactos.org/svn/reactos?rev=57235&view=rev Log: [WININET] - Merge fix for buffer overrun causing rapps to crash - http://www.winehq.org/pipermail/wine-patches/2012-July/115909.html Modified: trunk/reactos/dll/win32/wininet/http.c Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Tue Sep 4 05:05:57 2012 @@ -2317,7 +2317,7 @@ /* fetch some more data into the read buffer (the read section must be held) */ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWORD *read_bytes) { - DWORD res, read=0; + DWORD res, read=0, want; if(req->read_size == sizeof(req->read_buf)) return ERROR_SUCCESS; @@ -2328,8 +2328,10 @@ req->read_pos = 0; } + want = sizeof(req->read_buf) - req->read_size; res = req->data_stream->vtbl->read(req->data_stream, req, req->read_buf+req->read_size, - sizeof(req->read_buf)-req->read_size, &read, read_mode); + want, &read, read_mode); + assert(read <= want); req->read_size += read; TRACE("read %u bytes, read_size %u\n", read, req->read_size); @@ -2370,8 +2372,11 @@ size = min(size, netconn_stream->content_length-netconn_stream->content_read); - if(read_mode == READMODE_NOBLOCK) - size = min(size, netconn_get_avail_data(stream, req)); + if(read_mode == READMODE_NOBLOCK) { + DWORD avail = netconn_get_avail_data(stream, req); + if (size > avail) + size = avail; + } if(size && req->netconn) { if(NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len) != ERROR_SUCCESS)

1 0

[cgutman] 57234: [WS2_32_APITEST] - Add a test for NtReadFile on a socket
by cgutman＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: cgutman Date: Tue Sep 4 03:02:40 2012 New Revision: 57234 URL: http://svn.reactos.org/svn/reactos?rev=57234&view=rev Log: [WS2_32_APITEST] - Add a test for NtReadFile on a socket Modified: trunk/rostests/apitests/ws2_32/recv.c Modified: trunk/rostests/apitests/ws2_32/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/recv.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] Tue Sep 4 03:02:40 2012 @@ -7,6 +7,7 @@ #include <stdio.h> #include <wine/test.h> +#include <winternl.h> #include <windows.h> #include "ws2_32.h" @@ -25,6 +26,10 @@ int iResult; SOCKET sck; WSADATA wdata; + NTSTATUS status; + IO_STATUS_BLOCK readIosb; + HANDLE readEvent; + LARGE_INTEGER readOffset; /* Start up Winsock */ iResult = WSAStartup(MAKEWORD(2, 2), &wdata); @@ -73,6 +78,41 @@ SCKTEST(recv(sck, szBuf1, RECV_BUF, 0)); ok(memcmp(szBuf1, szBuf2, RECV_BUF), "equal\n"); + /* Create an event for NtReadFile */ + readOffset.QuadPart = 0LL; + memcpy(szBuf1, szBuf2, RECV_BUF); + status = NtCreateEvent(&readEvent, + EVENT_ALL_ACCESS, + NULL, + NotificationEvent, + FALSE); + if (status != 0) + { + ok(0, "Failed to create event\n"); + return 0; + } + + /* Try reading the socket using the NT file API */ + status = NtReadFile((HANDLE)sck, + readEvent, + NULL, + NULL, + &readIosb, + szBuf1, + RECV_BUF, + &readOffset, + NULL); + if (status == STATUS_PENDING) + { + WaitForSingleObject(readEvent, INFINITE); + status = readIosb.Status; + } + + ok(status == 0, "Read failed with status 0x%x\n", (unsigned int)status); + ok(memcmp(szBuf2, szBuf1, RECV_BUF), "equal\n"); + ok(readIosb.Information == RECV_BUF, "Short read\n"); + + NtClose(readEvent); closesocket(sck); WSACleanup(); return 1;

1 0

[cgutman] 57233: [AFD] - Fix handling of IRP_MJ_READ and IRP_MJ_WRITE to allow passing sockets as parameters to NtReadFile and NtWriteFile
by cgutman＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: cgutman Date: Tue Sep 4 03:01:15 2012 New Revision: 57233 URL: http://svn.reactos.org/svn/reactos?rev=57233&view=rev Log: [AFD] - Fix handling of IRP_MJ_READ and IRP_MJ_WRITE to allow passing sockets as parameters to NtReadFile and NtWriteFile Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -81,7 +81,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(BindReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(BindReq = LockRequest( Irp, IrpSp, FALSE, NULL )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -44,7 +44,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID ConnectOptions = LockRequest(Irp, IrpSp, FALSE); + PVOID ConnectOptions = LockRequest(Irp, IrpSp, FALSE, NULL); UINT ConnectOptionsSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -80,7 +80,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT ConnectOptionsSize = LockRequest(Irp, IrpSp, FALSE); + PUINT ConnectOptionsSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -144,7 +144,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID ConnectData = LockRequest(Irp, IrpSp, FALSE); + PVOID ConnectData = LockRequest(Irp, IrpSp, FALSE, NULL); UINT ConnectDataSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -179,7 +179,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT ConnectDataSize = LockRequest(Irp, IrpSp, FALSE); + PUINT ConnectDataSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -406,7 +406,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(ConnectReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(ConnectReq = LockRequest( Irp, IrpSp, FALSE, NULL )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -60,7 +60,7 @@ PIO_STACK_LOCATION IrpSp ) { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID Context = LockRequest(Irp, IrpSp, FALSE); + PVOID Context = LockRequest(Irp, IrpSp, FALSE, NULL); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -13,7 +13,7 @@ AfdGetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; - PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, TRUE); + PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, TRUE, NULL); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PLIST_ENTRY CurrentEntry; @@ -99,7 +99,7 @@ AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; - PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, FALSE); + PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, FALSE, NULL); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PCHAR NewBuffer; Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -217,7 +217,7 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(ListenReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(ListenReq = LockRequest( Irp, IrpSp, FALSE, NULL )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -18,7 +18,10 @@ } /* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */ -PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output ) { +PVOID LockRequest( PIRP Irp, + PIO_STACK_LOCATION IrpSp, + BOOLEAN Output, + KPROCESSOR_MODE *LockMode) { BOOLEAN LockFailed = FALSE; ASSERT(!Irp->MdlAddress); @@ -50,7 +53,46 @@ Irp->MdlAddress = NULL; return NULL; } - } else return NULL; + + /* The mapped address goes in index 1 */ + Irp->Tail.Overlay.DriverContext[1] = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + if (!Irp->Tail.Overlay.DriverContext[1]) + { + AFD_DbgPrint(MIN_TRACE,("Failed to get mapped address\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + /* The allocated address goes in index 0 */ + Irp->Tail.Overlay.DriverContext[0] = ExAllocatePool(NonPagedPool, MmGetMdlByteCount(Irp->MdlAddress)); + if (!Irp->Tail.Overlay.DriverContext[0]) + { + AFD_DbgPrint(MIN_TRACE,("Failed to allocate memory\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + RtlCopyMemory(Irp->Tail.Overlay.DriverContext[0], + Irp->Tail.Overlay.DriverContext[1], + MmGetMdlByteCount(Irp->MdlAddress)); + + /* If we don't want a copy back, we zero the mapped address pointer */ + if (!Output) + { + Irp->Tail.Overlay.DriverContext[1] = NULL; + } + + /* We're using a user-mode buffer directly */ + if (LockMode != NULL) + { + *LockMode = UserMode; + } + } + else return NULL; break; case IRP_MJ_READ: @@ -65,6 +107,8 @@ FALSE, NULL ); if( Irp->MdlAddress ) { + PAFD_RECV_INFO AfdInfo; + _SEH2_TRY { MmProbeAndLockPages( Irp->MdlAddress, Irp->RequestorMode, IoModifyAccess ); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -77,44 +121,49 @@ Irp->MdlAddress = NULL; return NULL; } - } else return NULL; + + /* We need to create the info struct that AFD expects for all send/recv requests */ + C_ASSERT(sizeof(AFD_RECV_INFO) == sizeof(AFD_SEND_INFO)); + AfdInfo = ExAllocatePool(NonPagedPool, sizeof(AFD_RECV_INFO) + sizeof(AFD_WSABUF)); + if (!AfdInfo) + { + AFD_DbgPrint(MIN_TRACE,("Failed to allocate memory\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + /* We'll append the buffer array to this struct */ + AfdInfo->BufferArray = (PAFD_WSABUF)(AfdInfo + 1); + AfdInfo->BufferCount = 1; + + /* Setup the default flags values */ + AfdInfo->AfdFlags = 0; + AfdInfo->TdiFlags = 0; + + /* Now build the buffer array */ + AfdInfo->BufferArray[0].buf = MmGetSystemAddressForMdl(Irp->MdlAddress); + AfdInfo->BufferArray[0].len = MmGetMdlByteCount(Irp->MdlAddress); + + /* Store the struct where AFD expects */ + Irp->Tail.Overlay.DriverContext[0] = AfdInfo; + + /* Don't copy anything out */ + Irp->Tail.Overlay.DriverContext[1] = NULL; + + /* We're using a placeholder buffer that we allocated */ + if (LockMode != NULL) + { + *LockMode = KernelMode; + } + } + else return NULL; break; default: ASSERT(FALSE); return NULL; - } - - /* The mapped address goes in index 1 */ - Irp->Tail.Overlay.DriverContext[1] = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); - if (!Irp->Tail.Overlay.DriverContext[1]) - { - AFD_DbgPrint(MIN_TRACE,("Failed to get mapped address\n")); - MmUnlockPages(Irp->MdlAddress); - IoFreeMdl( Irp->MdlAddress ); - Irp->MdlAddress = NULL; - return NULL; - } - - /* The allocated address goes in index 0 */ - Irp->Tail.Overlay.DriverContext[0] = ExAllocatePool(NonPagedPool, MmGetMdlByteCount(Irp->MdlAddress)); - if (!Irp->Tail.Overlay.DriverContext[0]) - { - AFD_DbgPrint(MIN_TRACE,("Failed to allocate memory\n")); - MmUnlockPages(Irp->MdlAddress); - IoFreeMdl( Irp->MdlAddress ); - Irp->MdlAddress = NULL; - return NULL; - } - - RtlCopyMemory(Irp->Tail.Overlay.DriverContext[0], - Irp->Tail.Overlay.DriverContext[1], - MmGetMdlByteCount(Irp->MdlAddress)); - - /* If we don't want a copy back, we zero the mapped address pointer */ - if (!Output) - { - Irp->Tail.Overlay.DriverContext[1] = NULL; } return GetLockedData(Irp, IrpSp); @@ -145,7 +194,8 @@ PAFD_WSABUF LockBuffers( PAFD_WSABUF Buf, UINT Count, PVOID AddressBuf, PINT AddressLen, - BOOLEAN Write, BOOLEAN LockAddress ) { + BOOLEAN Write, BOOLEAN LockAddress, + KPROCESSOR_MODE LockMode) { UINT i; /* Copy the buffer array so we don't lose it */ UINT Lock = LockAddress ? 2 : 0; @@ -200,7 +250,7 @@ if( MapBuf[i].Mdl ) { AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); _SEH2_TRY { - MmProbeAndLockPages( MapBuf[i].Mdl, UserMode, + MmProbeAndLockPages( MapBuf[i].Mdl, LockMode, Write ? IoModifyAccess : IoReadAccess ); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { LockFailed = TRUE; Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -72,7 +72,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID DisconnectOptions = LockRequest(Irp, IrpSp, FALSE); + PVOID DisconnectOptions = LockRequest(Irp, IrpSp, FALSE, NULL); UINT DisconnectOptionsSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -108,7 +108,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT DisconnectOptionsSize = LockRequest(Irp, IrpSp, FALSE); + PUINT DisconnectOptionsSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -172,7 +172,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID DisconnectData = LockRequest(Irp, IrpSp, FALSE); + PVOID DisconnectData = LockRequest(Irp, IrpSp, FALSE, NULL); UINT DisconnectDataSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -208,7 +208,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT DisconnectDataSize = LockRequest(Irp, IrpSp, FALSE); + PUINT DisconnectDataSize = LockRequest(Irp, IrpSp, FALSE, NULL); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -244,7 +244,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PULONG HandleFlags = LockRequest(Irp, IrpSp, TRUE); + PULONG HandleFlags = LockRequest(Irp, IrpSp, TRUE, NULL); PAFD_TDI_HANDLE_DATA HandleData = Irp->UserBuffer; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -680,7 +680,7 @@ if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); - if (!(DisReq = LockRequest(Irp, IrpSp, FALSE))) + if (!(DisReq = LockRequest(Irp, IrpSp, FALSE, NULL))) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -431,6 +431,7 @@ UINT TotalBytesCopied = 0; PAFD_STORED_DATAGRAM DatagramRecv; PLIST_ENTRY ListEntry; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -447,7 +448,7 @@ Irp, 0 ); } - if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); @@ -456,7 +457,7 @@ RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, NULL, NULL, - TRUE, FALSE ); + TRUE, FALSE, LockMode ); if( !RecvReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -699,6 +700,7 @@ PAFD_RECV_INFO_UDP RecvReq; PLIST_ENTRY ListEntry; PAFD_STORED_DATAGRAM DatagramRecv; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -719,7 +721,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); @@ -728,7 +730,7 @@ RecvReq->BufferCount, RecvReq->Address, RecvReq->AddressLength, - TRUE, TRUE ); + TRUE, TRUE, LockMode ); if( !RecvReq->BufferArray ) { /* access violation in userspace */ return UnlockAndMaybeComplete(FCB, STATUS_ACCESS_VIOLATION, Irp, 0); Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -259,7 +259,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; NTSTATUS Status = STATUS_NO_MEMORY; PAFD_EVENT_SELECT_INFO EventSelectInfo = - (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp, FALSE ); + (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp, FALSE, NULL ); PAFD_FCB FCB = FileObject->FsContext; if( !SocketAcquireStateLock( FCB ) ) { @@ -319,7 +319,7 @@ PIO_STACK_LOCATION IrpSp ) { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_ENUM_NETWORK_EVENTS_INFO EnumReq = - (PAFD_ENUM_NETWORK_EVENTS_INFO)LockRequest( Irp, IrpSp, TRUE ); + (PAFD_ENUM_NETWORK_EVENTS_INFO)LockRequest( Irp, IrpSp, TRUE, NULL ); PAFD_FCB FCB = FileObject->FsContext; PKEVENT UserEvent; NTSTATUS Status; Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -327,6 +327,7 @@ PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; UINT TotalBytesCopied = 0, i, SpaceAvail = 0, BytesCopied, SendLength; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -347,14 +348,14 @@ 0 ); } - if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); /* Must lock buffers before handing off user data */ SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, NULL, NULL, - FALSE, FALSE ); + FALSE, FALSE, LockMode ); if( !SendReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -416,14 +417,14 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0 ); SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, NULL, NULL, - FALSE, FALSE ); + FALSE, FALSE, LockMode ); if( !SendReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -556,6 +557,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO_UDP SendReq; + KPROCESSOR_MODE LockMode; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -577,7 +579,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE, &LockMode )) ) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); if (FCB->State == SOCKET_STATE_CREATED) @@ -602,7 +604,7 @@ SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, NULL, NULL, - FALSE, FALSE ); + FALSE, FALSE, LockMode ); if( !SendReq->BufferArray ) return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Tue Sep 4 03:01:15 2012 @@ -298,7 +298,8 @@ PAFD_WSABUF LockBuffers( PAFD_WSABUF Buf, UINT Count, PVOID AddressBuf, PINT AddressLen, - BOOLEAN Write, BOOLEAN LockAddress ); + BOOLEAN Write, BOOLEAN LockAddress, + KPROCESSOR_MODE LockMode ); VOID UnlockBuffers( PAFD_WSABUF Buf, UINT Count, BOOL Address ); BOOLEAN SocketAcquireStateLock( PAFD_FCB FCB ); NTSTATUS NTAPI UnlockAndMaybeComplete @@ -308,7 +309,7 @@ NTSTATUS LostSocket( PIRP Irp ); PAFD_HANDLE LockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); VOID UnlockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); -PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output ); +PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output, KPROCESSOR_MODE *LockMode ); VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); PVOID GetLockedData( PIRP Irp, PIO_STACK_LOCATION IrpSp ); NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function );

1 0

[jimtabor] 57232: [WineTests] - Sync to 1.5.12.
by jimtabor＠svn.reactos.org 04 Sep '12

04 Sep '12

Author: jimtabor Date: Tue Sep 4 02:13:48 2012 New Revision: 57232 URL: http://svn.reactos.org/svn/reactos?rev=57232&view=rev Log: [WineTests] - Sync to 1.5.12. Modified: trunk/rostests/winetests/user32/clipboard.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/listbox.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/scroll.c trunk/rostests/winetests/user32/win.c trunk/rostests/winetests/user32/winstation.c Modified: trunk/rostests/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/clipboar… ============================================================================== --- trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -66,6 +66,7 @@ ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); + todo_wine ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dce.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dce.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -406,6 +406,56 @@ "clip box should have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); } +/* test ScrollWindow with window DCs */ +static void test_scroll_window(void) +{ + PAINTSTRUCT ps; + HDC hdc; + RECT clip, rect; + + /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ + + UpdateWindow( hwnd_owndc ); + SetRect( &clip, 25, 25, 50, 50 ); + ScrollWindow( hwnd_owndc, -5, -10, NULL, &clip ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + SetViewportExtEx( hdc, 2, 3, NULL ); + SetViewportOrgEx( hdc, 30, 20, NULL ); + + ScrollWindow( hwnd_owndc, -5, -10, NULL, &clip ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + ScrollWindowEx( hwnd_owndc, -5, -10, NULL, &clip, 0, NULL, SW_INVALIDATE | SW_ERASE ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= -5 && rect.top >= 5 && rect.right <= 20 && rect.bottom <= 30, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + SetViewportExtEx( hdc, 1, 1, NULL ); + SetViewportOrgEx( hdc, 0, 0, NULL ); + + ScrollWindowEx( hwnd_owndc, -5, -10, NULL, &clip, 0, NULL, SW_INVALIDATE | SW_ERASE ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); +} + static void test_invisible_create(void) { HWND hwnd_owndc = CreateWindowA("owndc_class", NULL, WS_OVERLAPPED, @@ -559,6 +609,7 @@ test_parameters(); test_dc_visrgn(); test_begin_paint(); + test_scroll_window(); test_invisible_create(); test_dc_layout(); Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dde.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -1924,7 +1924,7 @@ ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); ret = DdeUninitialize(dde_inst2); - ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); /* NULL pSrc */ @@ -2037,7 +2037,7 @@ ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ret = DdeUninitialize(dde_inst); - ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); } static void test_DdeCreateStringHandle(void) @@ -2459,7 +2459,6 @@ size = DdeQueryStringA(server_pid, hsz1, str, MAX_PATH, CP_WINANSI); ok(!lstrcmpA(str, test_topic), "Expected %s, got %s, msg_index=%d\n", test_topic, str, msg_index); - ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -39,12 +39,14 @@ static struct edit_notify notifications; static BOOL (WINAPI *pEndMenu) (void); +static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static void init_function_pointers(void) { HMODULE hdll = GetModuleHandleA("user32"); pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); + pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); } static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) @@ -2134,6 +2136,7 @@ static int got_en_setfocus = 0; static int got_wm_capturechanged = 0; +static LRESULT (CALLBACK *p_edit_proc)(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -2156,7 +2159,50 @@ return DefWindowProcA(hWnd, msg, wParam, lParam); } -static void test_contextmenu_focus(void) +static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_ENTERIDLE: { + MENUBARINFO mbi; + BOOL ret; + HWND ctx_menu = (HWND)lParam; + + memset(&mbi, 0, sizeof(mbi)); + mbi.cbSize = sizeof(mbi); + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); + ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, + "GetMenuBarInfo failed\n"); + if (ret) + { + ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); + ok(!mbi.hwndMenu, "mbi.hwndMenu != NULL\n"); + ok(mbi.fBarFocused, "mbi.fBarFocused = FALSE\n"); + ok(mbi.fFocused, "mbi.fFocused = FALSE\n"); + } + + memset(&mbi, 0, sizeof(mbi)); + mbi.cbSize = sizeof(mbi); + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); + ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, + "GetMenuBarInfo failed\n"); + if (ret) + { + ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); + ok(!mbi.hwndMenu, "mbi.hwndMenu != NULL\n"); + ok(mbi.fBarFocused, "mbi.fBarFocused = FALSE\n"); + ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); + } + + pEndMenu(); + break; + } + } + return p_edit_proc(hWnd, msg, wParam, lParam); +} + +static void test_contextmenu(void) { HWND hwndMain, hwndEdit; @@ -2171,14 +2217,16 @@ assert(hwndEdit); SetFocus(NULL); - SetCapture(hwndMain); - SendMessage(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); - ok(got_en_setfocus, "edit box didn't get focused\n"); - ok(got_wm_capturechanged, "main window capture did not change\n"); + + if (pGetMenuBarInfo) + { + p_edit_proc = (void*)SetWindowLongPtr(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); + SendMessage(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); + } DestroyWindow (hwndEdit); DestroyWindow (hwndMain); @@ -2516,7 +2564,7 @@ test_fontsize(); test_dialogmode(); if (pEndMenu) - test_contextmenu_focus(); + test_contextmenu(); else win_skip("EndMenu is not available\n"); Modified: trunk/rostests/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.… ============================================================================== --- trunk/rostests/winetests/user32/listbox.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/listbox.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -1335,7 +1335,6 @@ ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); - /* Now test DlgDirSelectEx() in normal operation */ /* Fill with everything - drives, directory and all plain files. */ strcpy(pathBuffer, "*"); @@ -1412,6 +1411,8 @@ } } + DeleteFileA( "wtest1.tmp.c" ); + /* Now test DlgDirSelectEx() in abnormal operation */ /* Fill list with bogus entries, that look somewhat valid */ SendMessage(g_listBox, LB_RESETCONTENT, 0, 0); @@ -1472,9 +1473,29 @@ ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); } } + + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + DestroyWindow(hWnd); - - DeleteFileA( "wtest1.tmp.c" ); } START_TEST(listbox) Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -38,6 +38,7 @@ static ATOM atomMenuCheckClass; static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); +static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pEndMenu) (void); @@ -52,6 +53,7 @@ trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetMenuInfo) + GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) GET_PROC(EndMenu) @@ -116,6 +118,7 @@ /* globals to communicate between test and wndproc */ static BOOL bMenuVisible; +static INT popmenu; static BOOL got_input; static HMENU hMenus[4]; @@ -267,6 +270,134 @@ atomMenuCheckClass = RegisterClass(&wc); } +static void test_getmenubarinfo(void) +{ + BOOL ret; + HMENU hmenu; + MENUBARINFO mbi; + RECT rcw, rci; + HWND hwnd; + INT err; + + if (!pGetMenuBarInfo) { + win_skip("GetMenuBarInfo is not available\n"); + return; + } + + mbi.cbSize = sizeof(MENUBARINFO); + + hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_SYSMENU | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + + /* no menu: getmenubarinfo should fail */ + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should not have been successful\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* create menubar, no items yet */ + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(NULL, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err==ERROR_INVALID_MENU_HANDLE || broken(err==0xdeadbeef) /* NT, W2K, XP */, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, -1, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + mbi.cbSize = 1000; + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + mbi.cbSize = sizeof(MENUBARINFO); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, 123, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + ok(mbi.rcBar.left == 0 && mbi.rcBar.top == 0 && + mbi.rcBar.bottom == 0 && mbi.rcBar.right == 0, + "rcBar: Expected 0,0-0,0, got: %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", + mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: Got %d instead of 0.\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: Got %d instead of 0.\n", mbi.fFocused); + + /* add some items */ + ret = AppendMenu(hmenu, MF_STRING , 100, "item 1"); + ok(ret, "AppendMenu failed.\n"); + ret = AppendMenu(hmenu, MF_STRING , 101, "item 2"); + ok(ret, "AppendMenu failed.\n"); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 200, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* get info for the whole menu */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + /* calculate menu rectangle, from window rectangle and the position of the first item */ + ret = GetWindowRect(hwnd, &rcw); + ok(ret, "GetWindowRect failed.\n"); + ret = GetMenuItemRect(hwnd, hmenu, 0, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + todo_wine ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rcw.right - rci.left + rcw.left, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rcw.right - rci.left + rcw.left, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + /* get info for item nr.2 */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 2, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + ret = GetMenuItemRect(hwnd, hmenu, 1, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rci.right, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rci.right, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + DestroyWindow(hwnd); +} + /* demonstrates that windows locks the menu object so that it is still valid * even after a client calls DestroyMenu on it */ static void test_menu_locked_by_window(void) @@ -2030,9 +2161,12 @@ case WM_ENTERMENULOOP: bMenuVisible = TRUE; break; + case WM_INITMENUPOPUP: + case WM_UNINITMENUPOPUP: case WM_EXITMENULOOP: - bMenuVisible = FALSE; + case WM_MENUSELECT: break; + case WM_KEYDOWN: case WM_SYSKEYDOWN: case WM_MOUSEMOVE: @@ -2046,6 +2180,59 @@ default: return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); } + + if(pGetMenuBarInfo) + { + MENUBARINFO mbi; + HMENU hmenu; + UINT state; + BOOL br; + + mbi.cbSize = sizeof(MENUBARINFO); + + /* get info for the menu */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 0, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + hmenu = GetMenu(hWnd); + ok(!mbi.hwndMenu, "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected NULL\n", + msg, mbi.hwndMenu); + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "msg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!bMenuVisible == !mbi.fFocused, "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", + msg, mbi.fFocused != 0); + + /* get info for the menu's first item */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 1, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + state = GetMenuState(hmenu, 0, MF_BYPOSITION); + if (pGetMenuInfo) /* Skip on NT */ + { + /* Native returns handle to destroyed window */ + if (msg==WM_UNINITMENUPOPUP && popmenu==1) + todo_wine ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + else + ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + } + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "nsg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!(bMenuVisible && (state & MF_HILITE)) == !mbi.fFocused, + "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", msg, mbi.fFocused != 0); + } + + if (msg == WM_EXITMENULOOP) + bMenuVisible = FALSE; + else if (msg == WM_INITMENUPOPUP) + popmenu++; + else if (msg == WM_UNINITMENUPOPUP) + popmenu--; return 0; } @@ -3317,6 +3504,7 @@ test_menu_locked_by_window(); test_subpopup_locked_by_menu(); test_menu_ownerdraw(); + test_getmenubarinfo(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo(); Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.… ============================================================================== --- trunk/rostests/winetests/user32/monitor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/monitor.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -177,7 +177,7 @@ dm.dmDriverExtra = 1; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); memset(&dmW, 0, sizeof(dmW)); @@ -201,7 +201,7 @@ if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't reset dmDriverExtra to 0\n"); } Modified: trunk/rostests/winetests/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/scroll.c… ============================================================================== --- trunk/rostests/winetests/user32/scroll.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/scroll.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -375,7 +375,7 @@ ret = EnableScrollBar( hwnd, SB_HORZ, ESB_ENABLE_BOTH); ok( !ret, "Horizontal window scroll bar was not enabled\n"); DestroyWindow( hwnd); - /* finally, check if adding a WS_[HV]SColl style of a window makes the scroll info + /* finally, check if adding a WS_[HV]SCROLL style of a window makes the scroll info * available */ if( style & (WS_HSCROLL | WS_VSCROLL)) return;/* only test if not yet set */ /* Start with a clean window */ Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -1172,7 +1172,7 @@ ok(!ret, "third call to SetShellWindow(hwnd1)\n"); */ SetWindowLong(hwnd1, GWL_EXSTYLE, GetWindowLong(hwnd1,GWL_EXSTYLE)|WS_EX_TOPMOST); - ret = GetWindowLong(hwnd1,GWL_EXSTYLE)&WS_EX_TOPMOST? TRUE: FALSE; + ret = (GetWindowLong(hwnd1,GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; ok(!ret, "SetWindowExStyle(hwnd1, WS_EX_TOPMOST)\n"); ret = DestroyWindow(hwnd1); @@ -2157,6 +2157,14 @@ DestroyWindow(hwnd_grandchild); DestroyWindow(hwnd_child); DestroyWindow(hwnd_child2); + + hwnd_child = create_tool_window(WS_CHILD|WS_POPUP|WS_SYSMENU, hwnd2); + ok(!!hwnd_child, "Failed to create child window (%d)\n", GetLastError()); + ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); + ok(ret, "Got %d\n", ret); + flush_events( TRUE ); + todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + DestroyWindow(hwnd_child); } static void test_SetMenu(HWND parent) @@ -6680,7 +6688,7 @@ { HWND hwnd; FLASHWINFO finfo; - BOOL ret; + BOOL prev, ret; if (!pFlashWindowEx) { @@ -6749,8 +6757,7 @@ "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pFlashWindowEx(&finfo); - ok(ret, "previous window state should be active\n"); + prev = pFlashWindowEx(&finfo); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); ok(finfo.hwnd == hwnd, "FlashWindowEx modified hwnd to %p\n", finfo.hwnd); @@ -6762,7 +6769,7 @@ SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); todo_wine - ok(!ret, "previous window state should not be active\n"); + ok(prev != ret, "previous window state should be different\n"); DestroyWindow( hwnd ); } Modified: trunk/rostests/winetests/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/winstati… ============================================================================== --- trunk/rostests/winetests/user32/winstation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/winstation.c [iso-8859-1] Tue Sep 4 02:13:48 2012 @@ -371,6 +371,110 @@ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); } +/* Miscellaneous tests */ + +static void test_getuserobjectinformation(void) +{ + HDESK desk; + WCHAR bufferW[20]; + char buffer[20]; + WCHAR foobarTestW[] = {'f','o','o','b','a','r','T','e','s','t',0}; + WCHAR DesktopW[] = {'D','e','s','k','t','o','p',0}; + DWORD size; + BOOL ret; + + desk = CreateDesktop("foobarTest", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(desk != 0, "open foobarTest desktop failed\n"); + + strcpy(buffer, "blahblah"); + + /** Tests for UOI_NAME **/ + + /* Get size, test size and return value/error code */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_NAME, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 22, "size is set to %d\n", size); /* Windows returns Unicode length (11*2) */ + + /* Get string */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_NAME, buffer, sizeof(buffer), &size); + + ok(ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(strcmp(buffer, "foobarTest") == 0, "Buffer is set to '%s'\n", buffer); + ok(size == 11, "size is set to %d\n", size); /* 11 bytes in 'foobarTest\0' */ + + /* Get size, test size and return value/error code (Unicode) */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationW(desk, UOI_NAME, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + + /* Get string (Unicode) */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationW(desk, UOI_NAME, bufferW, sizeof(bufferW), &size); + + ok(ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(lstrcmpW(bufferW, foobarTestW) == 0, "Buffer is not set to 'foobarTest'\n"); + ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + + /** Tests for UOI_TYPE **/ + + /* Get size, test size and return value/error code */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_TYPE, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 16, "size is set to %d\n", size); /* Windows returns Unicode length (8*2) */ + + /* Get string */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationA(desk, UOI_TYPE, buffer, sizeof(buffer), &size); + + ok(ret, "GetUserObjectInformationA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(strcmp(buffer, "Desktop") == 0, "Buffer is set to '%s'\n", buffer); + ok(size == 8, "size is set to %d\n", size); /* 8 bytes in 'Desktop\0' */ + + /* Get size, test size and return value/error code (Unicode) */ + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetUserObjectInformationW(desk, UOI_TYPE, NULL, 0, &size); + + ok(!ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); + ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ + + /* Get string (Unicode) */ + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetUserObjectInformationW(desk, UOI_TYPE, bufferW, sizeof(bufferW), &size); + + ok(ret, "GetUserObjectInformationW returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + ok(lstrcmpW(bufferW, DesktopW) == 0, "Buffer is not set to 'Desktop'\n"); + ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ + + ok(CloseDesktop(desk), "CloseDesktop failed\n"); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -386,4 +490,5 @@ test_enumstations(); test_enumdesktops(); test_handles(); -} + test_getuserobjectinformation(); +}

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