Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[gadamopoulos] 66457: [USER32] - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) [NTUSER] - Implement NtUserAlterWindowStyle. Fix...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 25 20:02:10 2015 New Revision: 66457 URL: http://svn.reactos.org/svn/reactos?rev=66457&view=rev Log: [USER32] - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) [NTUSER] - Implement NtUserAlterWindowStyle. Fixes remaining failures in user32:msg_controls test. Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Feb 25 20:02:10 2015 @@ -1157,19 +1157,6 @@ return 0; } -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserAlterWindowStyle(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return(0); -} - BOOL APIENTRY NtUserAddClipboardFormatListener( HWND hwnd ) Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Feb 25 20:02:10 2015 @@ -3537,8 +3537,8 @@ return FALSE; } -LONG FASTCALL -co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) +static LONG +co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlter) { PWND Window, Parent; PWINSTATION_OBJECT WindowStation; @@ -3597,6 +3597,7 @@ Style.styleNew &= ~WS_EX_WINDOWEDGE; Window->ExStyle = (DWORD)Style.styleNew; + co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_EXSTYLE, (LPARAM) &Style); break; @@ -3604,7 +3605,9 @@ OldValue = (LONG) Window->style; Style.styleOld = OldValue; Style.styleNew = NewValue; - co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); + + if (!bAlter) + co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); /* WS_CLIPSIBLINGS can't be reset on top-level windows */ if (Window->spwndParent == UserGetDesktopWindow()) Style.styleNew |= WS_CLIPSIBLINGS; @@ -3621,7 +3624,9 @@ DceResetActiveDCEs( Window ); } Window->style = (DWORD)Style.styleNew; - co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); + + if (!bAlter) + co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); break; case GWL_WNDPROC: @@ -3672,6 +3677,13 @@ return( OldValue); } + +LONG FASTCALL +co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) +{ + return co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); +} + /* * NtUserSetWindowLong * @@ -3686,24 +3698,45 @@ LONG APIENTRY NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) { - DECLARE_RETURN(LONG); - - TRACE("Enter NtUserSetWindowLong\n"); + LONG ret; + UserEnterExclusive(); if (hWnd == IntGetDesktopWindow()) { EngSetLastError(STATUS_ACCESS_DENIED); - RETURN( 0); - } - - RETURN( co_UserSetWindowLong(hWnd, Index, NewValue, Ansi)); - -CLEANUP: - TRACE("Leave NtUserSetWindowLong, ret=%i\n",_ret_); + UserLeave(); + return 0; + } + + ret = co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); + UserLeave(); - END_CLEANUP; -} + + return ret; +} + +DWORD APIENTRY +NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) +{ + LONG ret; + + UserEnterExclusive(); + + if (hWnd == IntGetDesktopWindow()) + { + EngSetLastError(STATUS_ACCESS_DENIED); + UserLeave(); + return 0; + } + + ret = co_IntSetWindowLong(hWnd, Index, NewValue, FALSE, TRUE); + + UserLeave(); + + return ret; +} + /* * NtUserSetWindowWord Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Wed Feb 25 20:02:10 2015 @@ -298,11 +298,10 @@ /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ if (btn_type == BS_USERBUTTON ) { + style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; #ifdef __REACTOS__ - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); #else - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); #endif } @@ -508,8 +507,11 @@ if ((wParam & BS_TYPEMASK) >= MAX_BTN_TYPE) break; btn_type = wParam & BS_TYPEMASK; style = (style & ~BS_TYPEMASK) | btn_type; - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); - //WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); +#ifdef __REACTOS__ + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); +#else + WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); +#endif /* Only redraw if lParam flag is set.*/ if (lParam) @@ -565,7 +567,7 @@ #ifdef __REACTOS__ if (wParam) style |= WS_TABSTOP; else style &= ~WS_TABSTOP; - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); #else if (wParam) WIN_SetStyle( hWnd, WS_TABSTOP, 0 ); else WIN_SetStyle( hWnd, 0, WS_TABSTOP );

9 years, 6 months

[tfaber] 66456: [USER32_WINETEST] - Apply hacks to make the tests succeed on Windows

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 25 17:31:53 2015 New Revision: 66456 URL: http://svn.reactos.org/svn/reactos?rev=66456&view=rev Log: [USER32_WINETEST] - Apply hacks to make the tests succeed on Windows Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Wed Feb 25 17:31:53 2015 @@ -14717,9 +14717,12 @@ START_TEST(msg_focus) { init_tests(); + test_SetActiveWindow(); test_SetFocus(); - test_SetActiveWindow(); - + + /* HACK: For some reason test_SetForegroundWindow fails on Windows unless + * we do this */ + keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

9 years, 6 months

[tfaber] 66455: [COM_APITEST] - Add some more interfaces

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 25 16:22:26 2015 New Revision: 66455 URL: http://svn.reactos.org/svn/reactos?rev=66455&view=rev Log: [COM_APITEST] - Add some more interfaces Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Wed Feb 25 16:22:26 2015 @@ -186,14 +186,18 @@ { ID_NAME(IID_IQueryAssociations), TRUE }, { ID_NAME(IID_IQueryInfo), TRUE }, { ID_NAME(IID_IRegTreeOptions), TRUE }, + { ID_NAME(IID_IRemoteComputer) }, + { ID_NAME(IID_IResolveShellLink) }, { ID_NAME(IID_IRunnableObject) }, { ID_NAME(IID_IServerSecurity), TRUE }, { ID_NAME(IID_IServiceProvider) }, { ID_NAME(IID_ISFHelper), TRUE }, + { ID_NAME(IID_IShellApp), TRUE }, { ID_NAME(IID_IShellBrowser) }, { ID_NAME(IID_IShellBrowserService), TRUE }, { ID_NAME(IID_IShellChangeNotify), TRUE }, { ID_NAME(IID_IShellDesktopTray), TRUE }, + { ID_NAME(IID_IShellDetails), TRUE }, { ID_NAME(IID_IShellDispatch) }, { ID_NAME(IID_IShellDispatch2) }, { ID_NAME(IID_IShellDispatch3) }, @@ -205,16 +209,25 @@ { ID_NAME(IID_IShellFolder) }, { ID_NAME(IID_IShellFolder2) }, { ID_NAME(IID_IShellFolderBand), TRUE }, + { ID_NAME(IID_IShellFolderSearchable), TRUE }, + { ID_NAME(IID_IShellFolderSearchableCallback), TRUE }, { ID_NAME(IID_IShellFolderView), TRUE }, { ID_NAME(IID_IShellFolderViewCB), TRUE }, { ID_NAME(IID_IShellFolderViewDual) }, { ID_NAME(IID_IShellFolderViewDual2) }, + { ID_NAME(IID_IShellFolderViewType), TRUE }, { ID_NAME(IID_IShellIcon) }, + { ID_NAME(IID_IShellIconOverlay), TRUE }, + { ID_NAME(IID_IShellIconOverlayIdentifier), TRUE }, + { ID_NAME(IID_IShellImageData), TRUE }, + { ID_NAME(IID_IShellImageDataAbort), TRUE }, + { ID_NAME(IID_IShellImageDataFactory), TRUE }, { ID_NAME(IID_IShellItem) }, { ID_NAME(IID_IShellItem2) }, { ID_NAME(IID_IShellItemArray) }, { ID_NAME(IID_IShellItemFilter) }, { ID_NAME(IID_IShellLinkA) }, + { ID_NAME(IID_IShellLinkDataList), TRUE }, { ID_NAME(IID_IShellLinkDual) }, { ID_NAME(IID_IShellLinkDual2) }, { ID_NAME(IID_IShellLinkW) }, @@ -223,6 +236,7 @@ { ID_NAME(IID_IShellMenuAcc), TRUE }, { ID_NAME(IID_IShellMenuCallback), TRUE }, { ID_NAME(IID_IShellNameSpace) }, + { ID_NAME(IID_IShellPropSheetExt), TRUE }, { ID_NAME(IID_IShellService), TRUE }, { ID_NAME(IID_IShellTaskScheduler), TRUE }, { ID_NAME(IID_IShellView) }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Wed Feb 25 16:22:26 2015 @@ -84,6 +84,7 @@ DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); +DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb, 0xf385, 0x4dd0, 0x8d, 0x74, 0xa2, 0xef, 0xd1, 0xbc, 0x61, 0x78); DEFINE_GUID(CLSID_ShellLinkObject, 0x11219420, 0x1768, 0x11d1, 0x95, 0xbe, 0x00, 0x60, 0x97, 0x97, 0xea, 0x4f); DEFINE_GUID(CLSID_StartMenuPin, 0xa2a9545d, 0xa0c2, 0x42b4, 0x97, 0x08, 0xa0, 0xb2, 0xba, 0xdd, 0x77, 0xc8); DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); @@ -131,14 +132,22 @@ DEFINE_GUID(IID_IPreviewHandler, 0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f); DEFINE_GUID(IID_IPreviewHandlerFrame, 0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a); DEFINE_GUID(IID_IPreviewHandlerVisuals, 0x196bf9a5, 0xb346, 0x4ef0, 0xaa, 0x1e, 0x5d, 0xcd, 0xb7, 0x67, 0x68, 0xb1); +DEFINE_GUID(IID_IShellApp, 0xa3e14960, 0x935f, 0x11d1, 0xb8, 0xb8, 0x00, 0x60, 0x08, 0x05, 0x93, 0x82); DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); +DEFINE_GUID(IID_IShellFolderSearchable, 0x4e1ae66c, 0x204b, 0x11d2, 0x8d, 0xb3, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellFolderSearchableCallback,0xf98d8294, 0x2bbc, 0x11d2, 0x8d, 0xbd, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellFolderViewType, 0x49422c1e, 0x1c03, 0x11d2, 0x8d, 0xab, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellIconOverlay, 0x7d688a70, 0xc613, 0x11d0, 0x99, 0x9b, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_IContextMenuSite, 0x0811aebe, 0x0b87, 0x4c54, 0x9e, 0x72, 0x54, 0x8c, 0xf6, 0x49, 0x01, 0x6b); DEFINE_GUID(IID_IShellDesktopTray, 0x213e2df9, 0x9a14, 0x4328, 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9); DEFINE_GUID(IID_IShellFolderBand, 0x7fe80cc8, 0xc247, 0x11d0, 0xb9, 0x3a, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); DEFINE_GUID(IID_IShellFolderViewDual, 0xe7a1af80, 0x4d96, 0x11cf, 0x96, 0x0c, 0x00, 0x80, 0xc7, 0xf4, 0xee, 0x85); DEFINE_GUID(IID_IShellFolderViewDual2, 0x31c147b6, 0x0ade, 0x4a3c, 0xb5, 0x14, 0xdd, 0xf9, 0x32, 0xef, 0x6d, 0x17); +DEFINE_GUID(IID_IShellImageData, 0xbfdeec12, 0x8040, 0x4403, 0xa5, 0xea, 0x9e, 0x07, 0xda, 0xfc, 0xf5, 0x30); +DEFINE_GUID(IID_IShellImageDataAbort, 0x53fb8e58, 0x50c0, 0x4003, 0xb4, 0xaa, 0x0c, 0x8d, 0xf2, 0x8e, 0x7f, 0x3a); +DEFINE_GUID(IID_IShellImageDataFactory, 0x9be8ed5c, 0xedab, 0x4d75, 0x90, 0xf3, 0xbd, 0x5b, 0xdb, 0xb2, 0x1c, 0x82); DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Wed Feb 25 16:22:26 2015 @@ -35,6 +35,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -251,6 +252,7 @@ { 0xc, &IID_IPersistFolder }, { 0xc, &IID_IPersist }, { 0x10, &IID_IPersistPropertyBag }, + { 0x14, &IID_IShellIconOverlay }, } }, { @@ -272,6 +274,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -284,6 +287,7 @@ { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellIcon }, { FARAWY, &IID_IPersistFolder3 }, { FARAWY, &IID_IPersistFolder2 }, @@ -300,6 +304,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -340,6 +345,7 @@ { ID_NAME(CLSID_Printers), { + { -0xc, &IID_IRemoteComputer }, { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, @@ -347,6 +353,7 @@ { 0x4, &IID_IPersistFolder }, { 0x4, &IID_IPersist }, { 0x8, &IID_IContextMenuCB }, + { 0xc, &IID_IShellIconOverlay }, } }, { @@ -429,6 +436,7 @@ { 0x14, &IID_IContextMenuCB }, { 0x18, &IID_ITranslateShellChangeNotify }, { 0x20, &IID_IOleCommandTarget }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -440,6 +448,7 @@ { 0xc, &IID_IShellFolder2 }, { 0xc, &IID_IShellFolder }, { 0x10, &IID_IShellIcon }, + { 0x14, &IID_IShellIconOverlay }, { 0x18, &IID_IPersistFolder3 }, { 0x18, &IID_IPersistFolder2 }, { 0x18, &IID_IPersistFolder }, @@ -509,6 +518,7 @@ { 0x14, &IID_IContextMenu }, { 0x18, &IID_IDropTarget }, { 0x1c, &IID_IQueryInfo }, + { 0x20, &IID_IShellLinkDataList }, { 0x24, &IID_IExtractIconA }, { 0x28, &IID_IExtractIconW }, { 0x2c, &IID_IExtractImage2 },

9 years, 6 months

[gadamopoulos] 66454: [USER32_WINETEST] - Split user32:msg test to 14 separate tests - The original test consisted of more than 14k lines of code

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 25 15:55:57 2015 New Revision: 66454 URL: http://svn.reactos.org/svn/reactos?rev=66454&view=rev Log: [USER32_WINETEST] - Split user32:msg test to 14 separate tests - The original test consisted of more than 14k lines of code Modified: trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/testlist.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Wed Feb 25 15:55:57 2015 @@ -13324,7 +13324,11 @@ { ResetEvent( start_event ); ResetEvent( end_event ); +#if 0 sprintf( path, "%s msg %u", argv0, i ); +#else + sprintf( path, "%s msg_queue %u", argv0, i ); +#endif ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); ok( ret, "CreateProcess '%s' failed err %u.\n", path, GetLastError() ); if (ret) @@ -14483,6 +14487,7 @@ #undef X } +#if 0 START_TEST(msg) { char **test_argv; @@ -14623,3 +14628,239 @@ } DeleteCriticalSection( &sequence_cs ); } +#endif + +static void init_tests() +{ + HMODULE hModuleImm32; + BOOL (WINAPI *pImmDisableIME)(DWORD); + + init_funcs(); + + InitializeCriticalSection( &sequence_cs ); + init_procs(); + + hModuleImm32 = LoadLibraryA("imm32.dll"); + if (hModuleImm32) { + pImmDisableIME = (void *)GetProcAddress(hModuleImm32, "ImmDisableIME"); + if (pImmDisableIME) + pImmDisableIME(0); + } + pImmDisableIME = NULL; + FreeLibrary(hModuleImm32); + + if (!RegisterWindowClasses()) assert(0); + + cbt_hook_thread_id = GetCurrentThreadId(); + hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); + if (!hCBT_hook) win_skip( "cannot set global hook, will skip hook tests\n" ); +} + +static void cleanup_tests() +{ + BOOL ret; + UnhookWindowsHookEx(hCBT_hook); + if (pUnhookWinEvent && hEvent_hook) + { + ret = pUnhookWinEvent(hEvent_hook); + ok( ret, "UnhookWinEvent error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ok(!pUnhookWinEvent(hEvent_hook), "UnhookWinEvent succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */ + GetLastError() == 0xdeadbeef, /* Win9x */ + "unexpected error %d\n", GetLastError()); + } + DeleteCriticalSection( &sequence_cs ); + +} + +START_TEST(msg_queue) +{ + int argc; + char **test_argv; + argc = winetest_get_mainargs( &test_argv ); + if (argc >= 3) + { + unsigned int arg; + /* Child process. */ + sscanf (test_argv[2], "%d", (unsigned int *) &arg); + do_wait_idle_child( arg ); + return; + } + + init_tests(); + test_PostMessage(); + test_PeekMessage(); + test_PeekMessage2(); + test_interthread_messages(); + test_DispatchMessage(); + test_SendMessageTimeout(); + test_quit_message(); + test_WaitForInputIdle( test_argv[0] ); + test_DestroyWindow(); + cleanup_tests(); +} + +START_TEST(msg_messages) +{ + init_tests(); + test_message_conversion(); + test_messages(); + test_wmime_keydown_message(); + test_nullCallback(); + test_dbcs_wm_char(); + test_unicode_wm_char(); + test_defwinproc(); + cleanup_tests(); +} + +START_TEST(msg_focus) +{ + init_tests(); + test_SetFocus(); + test_SetActiveWindow(); + + /* keep it the last test, under Windows it tends to break the tests + * which rely on active/foreground windows being correct. + */ + test_SetForegroundWindow(); + cleanup_tests(); +} + +START_TEST(msg_winpos) +{ + init_tests(); + test_SetParent(); + test_ShowWindow(); + test_setwindowpos(); + test_showwindow(); + test_SetWindowRgn(); + invisible_parent_tests(); + cleanup_tests(); +} + +START_TEST(msg_paint) +{ + init_tests(); + test_scrollwindowex(); + test_paint_messages(); + test_paintingloop(); + cleanup_tests(); +} + +START_TEST(msg_input) +{ + init_tests(); + test_accelerators(); + if (!pTrackMouseEvent) + win_skip("TrackMouseEvent is not available\n"); + else + test_TrackMouseEvent(); + + test_keyflags(); + test_hotkey(); + cleanup_tests(); +} + +START_TEST(msg_timer) +{ + init_tests(); + test_timers(); + test_timers_no_wnd(); + cleanup_tests(); +} + +typedef BOOL (WINAPI *IS_WINEVENT_HOOK_INSTALLED)(DWORD); + +START_TEST(msg_hook) +{ +// HMODULE user32 = GetModuleHandleA("user32.dll"); +// IS_WINEVENT_HOOK_INSTALLED pIsWinEventHookInstalled = (IS_WINEVENT_HOOK_INSTALLED)GetProcAddress(user32, "IsWinEventHookInstalled"); + BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ + + init_tests(); + + if (pSetWinEventHook) + { + hEvent_hook = pSetWinEventHook(EVENT_MIN, EVENT_MAX, + GetModuleHandleA(0), win_event_proc, + 0, GetCurrentThreadId(), + WINEVENT_INCONTEXT); + if (pIsWinEventHookInstalled && hEvent_hook) + { + UINT event; + for (event = EVENT_MIN; event <= EVENT_MAX; event++) + ok(pIsWinEventHookInstalled(event), "IsWinEventHookInstalled(%u) failed\n", event); + } + } + if (!hEvent_hook) win_skip( "no win event hook support\n" ); + + test_winevents(); + + /* Fix message sequences before removing 4 lines below */ + if (pUnhookWinEvent && hEvent_hook) + { + BOOL ret; + ret = pUnhookWinEvent(hEvent_hook); + ok( ret, "UnhookWinEvent error %d\n", GetLastError()); + pUnhookWinEvent = 0; + } + hEvent_hook = 0; + if (hCBT_hook) test_set_hook(); + cleanup_tests(); +} + +START_TEST(msg_menu) +{ + init_tests(); + test_sys_menu(); + test_menu_messages(); + if(!winetest_interactive) + skip("CORE-8299 : Skip Tracking popup menu tests.\n"); + else + { + test_TrackPopupMenu(); + test_TrackPopupMenuEmpty(); + } + cleanup_tests(); +} + +START_TEST(msg_mdi) +{ + init_tests(); + test_mdi_messages(); + cleanup_tests(); +} + +START_TEST(msg_controls) +{ + init_tests(); + test_button_messages(); + test_static_messages(); + test_listbox_messages(); + test_combobox_messages(); + test_edit_messages(); + cleanup_tests(); +} + +START_TEST(msg_layered_window) +{ + init_tests(); + test_layered_window(); + cleanup_tests(); +} + +START_TEST(msg_dialog) +{ + init_tests(); + test_dialog_messages(); + test_EndDialog(); + cleanup_tests(); +} + +START_TEST(msg_clipboard) +{ + init_tests(); + test_clipboard_viewers(); + cleanup_tests(); +} Modified: trunk/rostests/winetests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/testlist… ============================================================================== --- trunk/rostests/winetests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/testlist.c [iso-8859-1] Wed Feb 25 15:55:57 2015 @@ -17,7 +17,21 @@ extern void func_listbox(void); extern void func_menu(void); extern void func_monitor(void); -extern void func_msg(void); +//extern void func_msg(void); +extern void func_msg_queue(void); +extern void func_msg_messages(void); +extern void func_msg_focus(void); +extern void func_msg_winpos(void); +extern void func_msg_paint(void); +extern void func_msg_input(void); +extern void func_msg_timer(void); +extern void func_msg_hook(void); +extern void func_msg_menu(void); +extern void func_msg_mdi(void); +extern void func_msg_controls(void); +extern void func_msg_layered_window(void); +extern void func_msg_dialog(void); +extern void func_msg_clipboard(void); extern void func_resource(void); extern void func_scroll(void); extern void func_static(void); @@ -44,7 +58,20 @@ { "listbox", func_listbox }, { "menu", func_menu }, { "monitor", func_monitor }, - { "msg", func_msg }, + { "msg_queue", func_msg_queue}, + { "msg_messages", func_msg_messages}, + { "msg_focus", func_msg_focus}, + { "msg_winpos", func_msg_winpos}, + { "msg_paint", func_msg_paint}, + { "msg_input", func_msg_input}, + { "msg_timer", func_msg_timer}, + { "msg_hook", func_msg_hook}, + { "msg_menu", func_msg_menu}, + { "msg_mdi", func_msg_mdi}, + { "msg_controls", func_msg_controls}, + { "msg_layered_window", func_msg_layered_window}, + { "msg_dialog", func_msg_dialog}, + { "msg_clipboard", func_msg_clipboard}, { "resource", func_resource }, { "scroll", func_scroll }, { "static", func_static },

9 years, 6 months

[tfaber] 66453: [COM_APITEST] - Add some more interfaces - Add CLSID_CDBurn

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 25 15:00:24 2015 New Revision: 66453 URL: http://svn.reactos.org/svn/reactos?rev=66453&view=rev Log: [COM_APITEST] - Add some more interfaces - Add CLSID_CDBurn Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -75,6 +75,7 @@ { 0x0, &IID_IAutoComplete2 }, { 0x0, &IID_IAutoComplete }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IAutoCompleteDropDown }, { 0x8, &IID_IEnumString }, { 0xc, &IID_IAccessible }, { 0xc, &IID_IDispatch }, @@ -218,6 +219,8 @@ { 0x0, &IID_IProgressDialog }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IOleWindow }, + { 0x8, &IID_IActionProgressDialog }, + { 0xc, &IID_IActionProgress }, { 0x10, &IID_IObjectWithSite }, }, L"Both" Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -39,6 +39,8 @@ { ID_NAME(IID_IAccessor) }, { ID_NAME(IID_IActiveDesktop), TRUE }, { ID_NAME(IID_IActiveDesktopP), TRUE }, + { ID_NAME(IID_IActionProgress) }, + { ID_NAME(IID_IActionProgressDialog) }, { ID_NAME(IID_IAddressBarParser), TRUE }, { ID_NAME(IID_IAddressBand), TRUE }, { ID_NAME(IID_IAddressEditBox), TRUE }, @@ -46,6 +48,8 @@ { ID_NAME(IID_IAugmentedShellFolder2), TRUE }, { ID_NAME(IID_IAutoComplete), TRUE }, { ID_NAME(IID_IAutoComplete2), TRUE }, + { ID_NAME(IID_IAutoCompleteDropDown) }, + { ID_NAME(IID_IBandHost) }, { ID_NAME(IID_IBandNavigate), TRUE }, { ID_NAME(IID_IBandProxy), TRUE }, { ID_NAME(IID_IBandSite) }, @@ -56,10 +60,16 @@ { ID_NAME(IID_IBrowserService) }, { ID_NAME(IID_IBrowserService2), TRUE }, { ID_NAME(IID_IBrowserService3), TRUE }, + { ID_NAME(IID_ICDBurn) }, + { ID_NAME(IID_ICDBurnExt) }, { ID_NAME(IID_IClassFactory) }, { ID_NAME(IID_IClassFactory2) }, { ID_NAME(IID_IClassFactory3), TRUE }, { ID_NAME(IID_IClientSecurity), TRUE }, + { ID_NAME(IID_ICommDlgBrowser) }, + { ID_NAME(IID_ICommDlgBrowser2) }, + { ID_NAME(IID_ICommDlgBrowser3) }, + { ID_NAME(IID_IComputerInfoChangeNotify), }, { ID_NAME(IID_IComThreadingInfo), TRUE }, { ID_NAME(IID_IContext), TRUE }, { ID_NAME(IID_IContextMenu), TRUE }, @@ -68,6 +78,8 @@ { ID_NAME(IID_IContextMenuCB), TRUE }, { ID_NAME(IID_IContextMenuSite) }, { ID_NAME(IID_IContinue) }, + { ID_NAME(IID_ICopyHookA), TRUE }, + { ID_NAME(IID_ICopyHookW), TRUE }, { ID_NAME(IID_IDVGetEnum), TRUE }, { ID_NAME(IID_IDataObject) }, //{ ID_NAME(IID_IDefViewID) }, == DefViewFrame3 @@ -98,6 +110,7 @@ { ID_NAME(IID_IEnumUnknown) }, { ID_NAME(IID_IEnumVARIANT) }, { ID_NAME(IID_IErrorLog) }, + { ID_NAME(IID_IExplorerBrowser) }, { ID_NAME(IID_IExplorerToolbar), TRUE }, { ID_NAME(IID_IExtractIconA), TRUE }, { ID_NAME(IID_IExtractIconW), TRUE }, @@ -108,14 +121,20 @@ { ID_NAME(IID_IFileOpenDialog) }, { ID_NAME(IID_IFileSaveDialog) }, { ID_NAME(IID_IFileSearchBand) }, + { ID_NAME(IID_IFileViewerA), TRUE }, + { ID_NAME(IID_IFileViewerSite), TRUE }, + { ID_NAME(IID_IFileViewerW), TRUE }, { ID_NAME(IID_IFolderBandPriv) }, { ID_NAME(IID_IFolderFilter) }, { ID_NAME(IID_IFolderFilterSite) }, { ID_NAME(IID_IFolderView) }, { ID_NAME(IID_IFolderView2) }, + { ID_NAME(IID_IFolderViewHost), TRUE }, { ID_NAME(IID_IFolderViewOC) }, { ID_NAME(IID_IFolderViewSettings) }, { ID_NAME(IID_IGlobalFolderSettings), TRUE }, + { ID_NAME(IID_IHWEventHandler) }, + { ID_NAME(IID_IHWEventHandler2) }, { ID_NAME(IID_IInitializeObject), TRUE }, { ID_NAME(IID_IInputObject) }, { ID_NAME(IID_IInputObjectSite) }, @@ -123,6 +142,7 @@ { ID_NAME(IID_IMarshal) }, { ID_NAME(IID_IMenuBand), TRUE }, { ID_NAME(IID_IMenuPopup), TRUE }, + { ID_NAME(IID_IModalWindow) }, { ID_NAME(IID_IMoniker) }, { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, { ID_NAME(IID_IMultiQI), TRUE }, @@ -157,6 +177,9 @@ { ID_NAME(IID_IPersistStorage) }, { ID_NAME(IID_IPersistStream) }, { ID_NAME(IID_IPersistStreamInit) }, + { ID_NAME(IID_IPreviewHandler) }, + { ID_NAME(IID_IPreviewHandlerFrame) }, + { ID_NAME(IID_IPreviewHandlerVisuals) }, { ID_NAME(IID_IProgressDialog), TRUE }, { ID_NAME(IID_IPropertyBag) }, { ID_NAME(IID_IPropertyBag2) }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -68,6 +68,7 @@ DEFINE_GUID(CLSID_AugmentedShellFolder, 0x91ea3f8b, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(CLSID_AugmentedShellFolder2, 0x6413ba2c, 0xb461, 0x11d1, 0xa1, 0x8a, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03); DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_CDBurn, 0xfbeb8a05, 0xbeee, 0x4442, 0x80, 0x4e, 0x40, 0x9d, 0x6c, 0x45, 0x15, 0xe9); DEFINE_GUID(CLSID_DeskMovr, 0x72267F6A, 0xA6F9, 0x11D0, 0xBC, 0x94, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91); DEFINE_GUID(CLSID_FileSearchBand, 0xc4ee31f3, 0x4768, 0x11d2, 0xbe, 0x5c, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); @@ -90,13 +91,21 @@ DEFINE_GUID(IID_IADesktopP2, 0xb22754e2, 0x4574, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IAccessControl, 0xeedd23e0, 0x8410, 0x11ce, 0xa1, 0xc3, 0x08, 0x00, 0x2b, 0x2b, 0x8d, 0x8f); DEFINE_GUID(IID_IAccessor, 0x0c733a8c, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(IID_IActionProgress, 0x49ff1173, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); +DEFINE_GUID(IID_IActionProgressDialog, 0x49ff1172, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IActiveDesktopP, 0x52502ee0, 0xec80, 0x11d0, 0x89, 0xab, 0x00, 0xc0, 0x4f, 0xc2, 0x97, 0x2d); DEFINE_GUID(IID_IAddressBarParser, 0xc9d81948, 0x443a, 0x40c7, 0x94, 0x5c, 0x5e, 0x17, 0x1b, 0x8c, 0x66, 0xb4); DEFINE_GUID(IID_IAugmentedShellFolder, 0x91ea3f8c, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8db3b3f4, 0x6cfe, 0x11d1, 0x8a, 0xe9, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); +DEFINE_GUID(IID_IBandHost, 0xb9075c7c, 0xd48e, 0x403f, 0xab, 0x99, 0xd6, 0xc7, 0x7a, 0x10, 0x84, 0xac); DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b, 0x34, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); -DEFINE_GUID(IID_IContext, 0x000001c0, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +DEFINE_GUID(IID_IComputerInfoChangeNotify, 0x0df60d92, 0x6818, 0x46d6, 0xb3, 0x58, 0xd6, 0x61, 0x70, 0xdd, 0xe4, 0x66); +DEFINE_OLEGUID(IID_IContext, 0x000001c0, 0x0000, 0x0000); +DEFINE_OLEGUID(IID_ICopyHookA, 0x000214ef, 0x0000, 0x0000); +DEFINE_OLEGUID(IID_ICopyHookW, 0x000214fc, 0x0000, 0x0000); +DEFINE_GUID(IID_ICDBurn, 0x3d73a659, 0xe5d0, 0x4d42, 0xaf, 0xc0, 0x51, 0x21, 0xba, 0x42, 0x5c, 0x8d); +DEFINE_GUID(IID_ICDBurnExt, 0x2271dcca, 0x74fc, 0x4414, 0x8f, 0xb7, 0xc5, 0x6b, 0x05, 0xac, 0xe2, 0xd7); DEFINE_GUID(IID_IDVGetEnum, 0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73, 0x43, 0xcb, 0x0a, 0x34, 0x8c); DEFINE_GUID(IID_IDefViewID, 0x985f64f0, 0xd410, 0x4e02, 0xbe, 0x22, 0xda, 0x07, 0xf2, 0xb5, 0xc5, 0xe1); DEFINE_GUID(IID_IDefViewFrame, 0x710EB7A0, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); @@ -114,8 +123,14 @@ DEFINE_GUID(IID_IFolderFilter, 0x9cc22886, 0xdc8e, 0x11d2, 0xb1, 0xd0, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IFolderFilterSite, 0xc0a651f5, 0xb48b, 0x11d2, 0xb5, 0xed, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); +DEFINE_GUID(IID_IFolderViewHost, 0x1ea58f02, 0xd55a, 0x411d, 0xb0, 0x9e, 0x9e, 0x65, 0xac, 0x21, 0x60, 0x5b); DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); +DEFINE_GUID(IID_IHWEventHandler, 0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x12, 0x8c, 0xdb, 0x91, 0x87, 0xb6, 0xd1); +DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); +DEFINE_GUID(IID_IPreviewHandler, 0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f); +DEFINE_GUID(IID_IPreviewHandlerFrame, 0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a); +DEFINE_GUID(IID_IPreviewHandlerVisuals, 0x196bf9a5, 0xb346, 0x4ef0, 0xaa, 0x1e, 0x5d, 0xcd, 0xb7, 0x67, 0x68, 0xb1); DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -13,6 +13,22 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { { + ID_NAME(CLSID_CDBurn), + { + { 0x0, &IID_IObjectWithSite }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IShellExtInit }, + { 0xc, &IID_IContextMenu }, + { 0x10, &IID_IShellPropSheetExt }, + { 0x18, &IID_IDropTarget }, + { 0x1c, &IID_IPersistFile }, + { 0x20, &IID_IOleCommandTarget }, + { 0x24, &IID_ICDBurn }, + { 0x2c, &IID_IPersistPropertyBag }, + { 0x3c, &IID_IServiceProvider }, + } + }, + { ID_NAME(CLSID_ControlPanel), { { 0x0, &IID_IUnknown }, @@ -131,7 +147,8 @@ { ID_NAME(CLSID_FolderViewHost), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IFolderViewHost }, + { 0x0, &IID_IUnknown }, { 0x4, &IID_IServiceProvider }, { 0x8, &IID_IOleWindow }, { 0xc, &IID_IFolderView },

9 years, 6 months

[jimtabor] 66452: [NtUser] - Fix API GetDCEx tests! Dedicated to the great work by Timo Kreuzer. - This uncovered a loop flaw, witch passed on any DCE last accessed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 25 13:25:57 2015 New Revision: 66452 URL: http://svn.reactos.org/svn/reactos?rev=66452&view=rev Log: [NtUser] - Fix API GetDCEx tests! Dedicated to the great work by Timo Kreuzer. - This uncovered a loop flaw, witch passed on any DCE last accessed. Modified: trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Wed Feb 25 13:25:57 2015 @@ -366,7 +366,7 @@ Flags |= DCX_CACHE; } - if (Flags & (DCX_WINDOW | DCX_PARENTCLIP)) Flags |= DCX_CACHE; + if (Flags & DCX_PARENTCLIP) Flags |= DCX_CACHE; // When GetDC is called with hWnd nz, DCX_CACHE & _WINDOW are clear w _USESTYLE set. if (Flags & DCX_USESTYLE) @@ -488,6 +488,7 @@ break; } } + Dce = NULL; // Loop issue? } KeLeaveCriticalRegion(); @@ -497,7 +498,7 @@ { Dce = DceAllocDCE(NULL, DCE_CACHE_DC); } - if (!Dce) return NULL; + if (Dce == NULL) return NULL; Dce->hwndCurrent = (Wnd ? Wnd->head.h : NULL); Dce->pwndOrg = Dce->pwndClip = Wnd; @@ -510,20 +511,31 @@ { Dce = CONTAINING_RECORD(ListEntry, DCE, List); ListEntry = ListEntry->Flink; - // Check for Window handle than HDC match for CLASS. - if (Dce->hwndCurrent == Wnd->head.h) + + // Skip Cache DCE entries. + if (!(Dce->DCXFlags & DCX_CACHE)) { - bUpdateVisRgn = FALSE; - break; + // Check for Window handle than HDC match for CLASS. + if (Dce->hwndCurrent == Wnd->head.h) + { + bUpdateVisRgn = FALSE; + break; + } + else if (Dce->hDC == hDC) break; } - if (Dce->hDC == hDC) break; + Dce = NULL; // Loop issue? } KeLeaveCriticalRegion(); + + if (Dce == NULL) + { + return(NULL); + } if ( (Flags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) && (Dce->DCXFlags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) ) { - DceDeleteClipRgn(Dce); + DceDeleteClipRgn(Dce); } } // First time use hax, need to use DceAllocDCE during window display init.

9 years, 6 months

[tfaber] 66451: [DESK.CPL] - Don't convert the selected wallpaper if it is already a bitmap. Patch by Ricardo Hanke. CORE-8802 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 25 13:24:13 2015 New Revision: 66451 URL: http://svn.reactos.org/svn/reactos?rev=66451&view=rev Log: [DESK.CPL] - Don't convert the selected wallpaper if it is already a bitmap. Patch by Ricardo Hanke. CORE-8802 #resolve Added: trunk/reactos/dll/cpl/desk/guid.c (with props) Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Wed Feb 25 13:24:13 2015 @@ -25,6 +25,7 @@ add_library(desk SHARED ${SOURCE} + guid.c desk.rc ${CMAKE_CURRENT_BINARY_DIR}/desk.def) Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Wed Feb 25 13:24:13 2015 @@ -913,6 +913,7 @@ TCHAR szWallpaper[MAX_PATH]; GpImage *image; CLSID encoderClsid; + GUID guidFormat; size_t length = 0; GpStatus status; @@ -953,6 +954,15 @@ if (!image) { RegCloseKey(regKey); + return; + } + + GdipGetImageRawFormat(image, &guidFormat); + if (IsEqualGUID(&guidFormat, &ImageFormatBMP)) + { + GdipDisposeImage(image); + RegCloseKey(regKey); + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, pData->backgroundItems[pData->backgroundSelection].szFilename, SPIF_UPDATEINIFILE); return; } Added: trunk/reactos/dll/cpl/desk/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/guid.c?rev=66… ============================================================================== --- trunk/reactos/dll/cpl/desk/guid.c (added) +++ trunk/reactos/dll/cpl/desk/guid.c [iso-8859-1] Wed Feb 25 13:24:13 2015 @@ -0,0 +1,14 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#define WIN32_NO_STATuS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <initguid.h> +#include <gdiplus.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/cpl/desk/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 6 months

[hbelusca] 66450: [CPLS]: Add the console CPL to the control panel.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 25 13:07:44 2015 New Revision: 66450 URL: http://svn.reactos.org/svn/reactos?rev=66450&view=rev Log: [CPLS]: Add the console CPL to the control panel. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Wed Feb 25 13:07:44 2015 @@ -19,7 +19,7 @@ HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" HKLM,"SOFTWARE\Classes\http","",0x00000000,"URL:HyperText Transfer Protocol" -HKLM,"SOFTWARE\Classes\http\DefaultIcon","",0x00000000,"%systemroot%\system32\url.dll,0" +HKLM,"SOFTWARE\Classes\http\DefaultIcon","",0x00000000,"%SystemRoot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\http\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" HKLM,"SOFTWARE\Classes\http\URL Protocol","",0x00000000,"" HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" @@ -30,7 +30,7 @@ ;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec\Topic","",0x00000000,"WWW_OpenURL" HKLM,"SOFTWARE\Classes\https","",0x00000000,"URL:HyperText Transfer Protocol with Privacy" -HKLM,"SOFTWARE\Classes\https\DefaultIcon","",0x00000000,"%systemroot%\system32\url.dll,0" +HKLM,"SOFTWARE\Classes\https\DefaultIcon","",0x00000000,"%SystemRoot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\https\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" HKLM,"SOFTWARE\Classes\https\URL Protocol","",0x00000000,"" ;see http @@ -86,7 +86,11 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion","WallPaperDir",0x00020002,"%SystemRoot%\Web\Wallpaper" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Applets",,0x00000012 + +; Extra Control Panel Applets HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls","Console",0x00020000,"%SystemRoot%\system32\console.dll" + ; Cursors Schemes HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,""",,,,,,,,,,,,,""" @@ -94,7 +98,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath","",0x00020000,"%systemroot%\system32\dfrg.msc %c:" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath","",0x00020000,"%SystemRoot%\system32\dfrg.msc %c:" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\BackupPath",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\BackupPath","",0x00020000,"%SystemRoot%\system32\ntbackup.exe"

9 years, 6 months

[tfaber] 66449: [USER32] - In MsgiUnicodeToAnsiMessage, use a single contiguous buffer for CREATESTRUCTA and its strings. This allows applications to modify the structure without ill effects - Don'...

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 25 12:24:38 2015 New Revision: 66449 URL: http://svn.reactos.org/svn/reactos?rev=66449&view=rev Log: [USER32] - In MsgiUnicodeToAnsiMessage, use a single contiguous buffer for CREATESTRUCTA and its strings. This allows applications to modify the structure without ill effects - Don't return the address of a stack structure in MsgiAnsiToUnicodeMessage CORE-8777 #resolve Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Wed Feb 25 12:24:38 2015 @@ -578,12 +578,12 @@ case WM_NCCREATE: case WM_CREATE: { - MDICREATESTRUCTW mdi_cs; struct s { - CREATESTRUCTW cs; /* new structure */ - LPCWSTR lpszName; /* allocated Name */ - LPCWSTR lpszClass; /* allocated Class */ + CREATESTRUCTW cs; /* new structure */ + MDICREATESTRUCTW mdi_cs; /* MDI info */ + LPCWSTR lpszName; /* allocated Name */ + LPCWSTR lpszClass; /* allocated Class */ }; struct s *xs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct s)); @@ -605,10 +605,10 @@ if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) { - mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; - mdi_cs.szTitle = xs->cs.lpszName; - mdi_cs.szClass = xs->cs.lpszClass; - xs->cs.lpCreateParams = &mdi_cs; + xs->mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; + xs->mdi_cs.szTitle = xs->cs.lpszName; + xs->mdi_cs.szClass = xs->cs.lpszClass; + xs->cs.lpCreateParams = &xs->mdi_cs; } UnicodeMsg->lParam = (LPARAM)xs; @@ -737,9 +737,10 @@ { struct s { - CREATESTRUCTW cs; /* new structure */ - LPWSTR lpszName; /* allocated Name */ - LPWSTR lpszClass; /* allocated Class */ + CREATESTRUCTW cs; /* new structure */ + MDICREATESTRUCTW mdi_cs; /* MDI info */ + LPWSTR lpszName; /* allocated Name */ + LPWSTR lpszClass; /* allocated Class */ }; struct s *xs = (struct s *)UnicodeMsg->lParam; @@ -847,10 +848,28 @@ MDICREATESTRUCTA *pmdi_cs; CREATESTRUCTA* CsA; CREATESTRUCTW* CsW; + ULONG NameSize, ClassSize; NTSTATUS Status; CsW = (CREATESTRUCTW*)(UnicodeMsg->lParam); - CsA = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CREATESTRUCTA) + sizeof(MDICREATESTRUCTA)); + RtlInitUnicodeString(&UnicodeString, CsW->lpszName); + NameSize = RtlUnicodeStringToAnsiSize(&UnicodeString); + if (NameSize == 0) + { + return FALSE; + } + ClassSize = 0; + if (!IS_ATOM(CsW->lpszClass)) + { + RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); + ClassSize = RtlUnicodeStringToAnsiSize(&UnicodeString); + if (ClassSize == 0) + { + return FALSE; + } + } + + CsA = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CREATESTRUCTA) + sizeof(MDICREATESTRUCTA) + NameSize + ClassSize); if (NULL == CsA) { return FALSE; @@ -861,21 +880,21 @@ pmdi_cs = (MDICREATESTRUCTA*)(CsA + 1); RtlInitUnicodeString(&UnicodeString, CsW->lpszName); - Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); + RtlInitEmptyAnsiString(&AnsiString, (PCHAR)(pmdi_cs + 1), NameSize); + Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, FALSE); if (! NT_SUCCESS(Status)) { RtlFreeHeap(GetProcessHeap(), 0, CsA); return FALSE; } CsA->lpszName = AnsiString.Buffer; - if (HIWORD((ULONG_PTR)CsW->lpszClass) != 0) + if (!IS_ATOM(CsW->lpszClass)) { RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); - Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); + RtlInitEmptyAnsiString(&AnsiString, (PCHAR)(pmdi_cs + 1) + NameSize, ClassSize); + Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, FALSE); if (! NT_SUCCESS(Status)) { - RtlInitAnsiString(&AnsiString, CsA->lpszName); - RtlFreeAnsiString(&AnsiString); RtlFreeHeap(GetProcessHeap(), 0, CsA); return FALSE; } @@ -1118,13 +1137,6 @@ CREATESTRUCTA* Cs; Cs = (CREATESTRUCTA*) AnsiMsg->lParam; - RtlInitAnsiString(&AnsiString, Cs->lpszName); - RtlFreeAnsiString(&AnsiString); - if (HIWORD((ULONG_PTR)Cs->lpszClass) != 0) - { - RtlInitAnsiString(&AnsiString, Cs->lpszClass); - RtlFreeAnsiString(&AnsiString); - } RtlFreeHeap(GetProcessHeap(), 0, Cs); break; }

9 years, 6 months

[tfaber] 66448: [WIN32K:NTUSER] - Store string system parameter settings null-terminated CORE-8653 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 25 09:12:56 2015 New Revision: 66448 URL: http://svn.reactos.org/svn/reactos?rev=66448&view=rev Log: [WIN32K:NTUSER] - Store string system parameter settings null-terminated CORE-8653 #resolve Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Wed Feb 25 09:12:56 2015 @@ -374,7 +374,7 @@ pwszValue, REG_SZ, (PWSTR)pwsz, - wcslen(pwsz) * sizeof(WCHAR)); + (wcslen(pwsz) + 1) * sizeof(WCHAR)); } static

9 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015