Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[jimtabor] 62405: - Move code, this relates to CORE-6651.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Mar 2 22:42:00 2014 New Revision: 62405 URL: http://svn.reactos.org/svn/reactos?rev=62405&view=rev Log: - Move code, this relates to CORE-6651. Modified: trunk/reactos/win32ss/user/ntuser/focus.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Sun Mar 2 22:42:00 2014 @@ -298,28 +298,6 @@ } } -HWND FASTCALL -IntFindChildWindowToOwner(PWND Root, PWND Owner) -{ - HWND Ret; - PWND Child, OwnerWnd; - - for(Child = Root->spwndChild; Child; Child = Child->spwndNext) - { - OwnerWnd = Child->spwndOwner; - if(!OwnerWnd) - continue; - - if(OwnerWnd == Owner) - { - Ret = Child->head.h; - return Ret; - } - } - - return NULL; -} - VOID FASTCALL FindRemoveAsyncMsg(PWND Wnd, WPARAM wParam) { @@ -544,6 +522,30 @@ Ret = TRUE; } return Ret && fgRet; +} + +/* + Revision 7888, activate modal dialog when clicking on a disabled window. +*/ +HWND FASTCALL +IntFindChildWindowToOwner(PWND Root, PWND Owner) +{ + HWND Ret; + PWND Child, OwnerWnd; + + for(Child = Root->spwndChild; Child; Child = Child->spwndNext) + { + OwnerWnd = Child->spwndOwner; + if(!OwnerWnd) + continue; + + if(OwnerWnd == Owner) + { + Ret = Child->head.h; + return Ret; + } + } + return NULL; } BOOL FASTCALL

10 years, 9 months

[jimtabor] 62404: - Code cleanup and update. Change trace to error for tracking.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Mar 2 22:39:02 2014 New Revision: 62404 URL: http://svn.reactos.org/svn/reactos?rev=62404&view=rev Log: - Code cleanup and update. Change trace to error for tracking. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c 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] Sun Mar 2 22:39:02 2014 @@ -1381,7 +1381,7 @@ * * FIXME: hide/show owned popups when owner visibility changes. * - * ReactOS: See bug 6751 and 7228. + * ReactOS: See bug CORE-6129 and CORE-6554. * */ //// @@ -1450,7 +1450,7 @@ if (hWndInsertAfter == HWND_BOTTOM) { - TRACE("Window is HWND_BOTTOM\n"); + ERR("Window is HWND_BOTTOM\n"); if (List) ExFreePoolWithTag(List, USERTAG_WINDOWLIST); goto done; } @@ -1721,7 +1721,6 @@ RECTL CopyRect; PWND Ancestor; BOOL bPointerInWindow; - //BOOL bNoTopMost; ASSERT_REFS_CO(Window); @@ -1759,9 +1758,6 @@ } co_WinPosDoWinPosChanging(Window, &WinPos, &NewWindowRect, &NewClientRect); - - // HWND_NOTOPMOST is redirected in WinPosFixupFlags. - //bNoTopMost = WndInsertAfter == HWND_NOTOPMOST; /* Does the window still exist? */ if (!IntIsWindow(WinPos.hwnd)) @@ -1823,70 +1819,6 @@ if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow()) { IntLinkHwnd(Window, WinPos.hwndInsertAfter); -#if 0 - //// Fix bug 6751 & 7228 see WinPosDoOwnedPopups wine Fixme. - PWND ParentWindow; - PWND Sibling; - PWND InsertAfterWindow; - - if ((ParentWindow = Window->spwndParent)) // Must have a Parent window! - { - //ERR("SetWindowPos has parent window.\n"); - if (WinPos.hwndInsertAfter == HWND_TOPMOST) - { - InsertAfterWindow = NULL; - } - else if ( WinPos.hwndInsertAfter == HWND_TOP ) - { - InsertAfterWindow = NULL; - - Sibling = ParentWindow->spwndChild; - - while ( Sibling && Sibling->ExStyle & WS_EX_TOPMOST ) - { - InsertAfterWindow = Sibling; - Sibling = Sibling->spwndNext; - } - } - else if (WinPos.hwndInsertAfter == HWND_BOTTOM) - { - if (ParentWindow->spwndChild) - { - InsertAfterWindow = ParentWindow->spwndChild; - - if(InsertAfterWindow) - { - while (InsertAfterWindow->spwndNext) - InsertAfterWindow = InsertAfterWindow->spwndNext; - } - } - else - InsertAfterWindow = NULL; - } - else - InsertAfterWindow = IntGetWindowObject(WinPos.hwndInsertAfter); - /* Do nothing if hwndInsertAfter is HWND_BOTTOM and Window is already - the last window */ - if (InsertAfterWindow != Window) - { - IntUnlinkWindow(Window); - IntLinkWindow(Window, InsertAfterWindow); - } - - if ( ( WinPos.hwndInsertAfter == HWND_TOPMOST || - ( Window->ExStyle & WS_EX_TOPMOST && Window->spwndPrev && Window->spwndPrev->ExStyle & WS_EX_TOPMOST ) || - ( Window->spwndNext && Window->spwndNext->ExStyle & WS_EX_TOPMOST ) ) && - !bNoTopMost ) - { - Window->ExStyle |= WS_EX_TOPMOST; - } - else - { - Window->ExStyle &= ~ WS_EX_TOPMOST; - } - } - //// -#endif } OldWindowRect = Window->rcWindow;

10 years, 9 months

[akhaldi] 62403: [CMAKE] * Don't treat warnings like errors in the Clang build just yet.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 22:11:49 2014 New Revision: 62403 URL: http://svn.reactos.org/svn/reactos?rev=62403&view=rev Log: [CMAKE] * Don't treat warnings like errors in the Clang build just yet. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62403&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 2 22:11:49 2014 @@ -73,7 +73,11 @@ endif() # Warnings, errors -add_compile_flags("-Werror -Wall -Wpointer-arith") +if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags("-Werror") +endif() + +add_compile_flags("-Wall -Wpointer-arith") add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value") if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")

10 years, 9 months

[tkreuzer] 62402: [PSEH3] Start factoring out compiler support for nested functions (neither CLANG not C++ support it, so we will add some other crazy hacks later ; -))

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 2 22:04:15 2014 New Revision: 62402 URL: http://svn.reactos.org/svn/reactos?rev=62402&view=rev Log: [PSEH3] Start factoring out compiler support for nested functions (neither CLANG not C++ support it, so we will add some other crazy hacks later ;-)) Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3.c Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Mar 2 22:04:15 2014 @@ -89,7 +89,7 @@ void * __cdecl __attribute__((error("Can only be used inside an exception filter."))) _exception_info(void); /* This attribute allows automatic cleanup of the registered frames */ -#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_AutoCleanup))) +#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_Unregister))) /* CLANG specific definitions! */ #ifdef __clang__ @@ -133,6 +133,8 @@ } \ } while(0) +#define _SEH3$_SCARE_GCC() + #else /* !__clang__ */ #define _SEH3$_ASM_GOTO(_Label, ...) asm goto ("#\n" : : : "memory", ## __VA_ARGS__ : _Label) @@ -155,13 +157,48 @@ : "ecx", "edx", "memory" \ : _SEH3$_l_HandlerTarget) +/* Define the registers that get clobbered, when reaching the __except block. + We specify ebp on optimized builds without frame pointer, since it will be + used by GCC as a general purpose register then. */ +#if defined(__OPTIMIZE__) && defined(_ALLOW_OMIT_FRAME_POINTER) +#define _SEH3$_CLOBBER_ON_EXCEPTION "ebp", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" +#else +#define _SEH3$_CLOBBER_ON_EXCEPTION "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" +#endif + +/* This construct scares GCC so much, that it will stop moving code + around into places that are never executed. */ +#define _SEH3$_SCARE_GCC() \ + void *plabel; \ + _SEH3$_ASM_GOTO(_SEH3$_l_BeforeTry); \ + _SEH3$_ASM_GOTO(_SEH3$_l_HandlerTarget); \ + _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ + asm volatile ("#" : "=a"(plabel) : "p"(&&_SEH3$_l_BeforeTry), "p"(&&_SEH3$_l_HandlerTarget), "p"(&&_SEH3$_l_OnException) \ + : _SEH3$_CLOBBER_ON_EXCEPTION ); \ + goto _SEH3$_l_OnException; + #endif /* __clang__ */ +/* Neither CLANG nor C++ support nested functions */ +#if defined(__cplusplus) || defined(__clang__) + +/* Use the global unregister function */ +void +__attribute__((regparm(1))) +_SEH3$_Unregister( + volatile SEH3$_REGISTRATION_FRAME *Frame); + +/* These are only dummies here */ +#define _SEH3$_DECLARE_CLEANUP_FUNC(_Name) +#define _SEH3$_DEFINE_CLEANUP_FUNC(_Name) +#define _SEH3$_DECLARE_FILTER_FUNC(_Name) +#define _SEH3$_DEFINE_DUMMY_FINALLY(_Name) + +#else /* __cplusplus || __clang__ */ #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() \ inline __attribute__((always_inline, gnu_inline)) \ unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode; } - /* On GCC the filter function is a nested function with __fastcall calling convention. The eax register contains a base address the function uses @@ -219,25 +256,8 @@ _SEH3$_FinallyFunction(1); \ } -/* Define the registers that get clobbered, when reaching the __except block. - We specify ebp on optimized builds without frame pointer, since it will be - used by GCC as a general purpose register then. */ -#if defined(__OPTIMIZE__) && defined(_ALLOW_OMIT_FRAME_POINTER) -#define _SEH3$_CLOBBER_ON_EXCEPTION "ebp", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" -#else -#define _SEH3$_CLOBBER_ON_EXCEPTION "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" -#endif - -/* This construct scares GCC so much, that it will stop moving code - around into places that are never executed. */ -#define _SEH3$_SCARE_GCC() \ - void *plabel; \ - _SEH3$_ASM_GOTO(_SEH3$_l_BeforeTry); \ - _SEH3$_ASM_GOTO(_SEH3$_l_HandlerTarget); \ - _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ - asm volatile ("#" : "=a"(plabel) : "p"(&&_SEH3$_l_BeforeTry), "p"(&&_SEH3$_l_HandlerTarget), "p"(&&_SEH3$_l_OnException) \ - : _SEH3$_CLOBBER_ON_EXCEPTION ); \ - goto _SEH3$_l_OnException; +#endif /* __cplusplus || __clang__ */ + #define _SEH3_TRY \ @@ -259,7 +279,7 @@ }; \ \ /* Forward declaration of the auto cleanup function */ \ - _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ + _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_Unregister); \ \ /* Allocate a registration frame */ \ volatile SEH3$_REGISTRATION_FRAME _SEH3$_AUTO_CLEANUP _SEH3$_TrylevelFrame; \ @@ -355,7 +375,7 @@ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ /* Implementation of the auto cleanup function */ \ - _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ + _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_Unregister); \ \ /* Close the outer scope */ \ } while (0); Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Sun Mar 2 22:04:15 2014 @@ -50,8 +50,9 @@ C_ASSERT(SEH3_SCOPE_TABLE_Filter == FIELD_OFFSET(SEH3$_SCOPE_TABLE, Filter)); C_ASSERT(SEH3_SCOPE_TABLE_Target == FIELD_OFFSET(SEH3$_SCOPE_TABLE, Target)); -static inline -void _SEH3$_Unregister( +void +__attribute__((regparm(1))) +_SEH3$_Unregister( volatile SEH3$_REGISTRATION_FRAME *Frame) { if (Frame->Handler)

10 years, 9 months

[akhaldi] 62401: [SHELL32] * Comment out some unused variables. * Remove some unused default debug channel declarations.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 21:45:44 2014 New Revision: 62401 URL: http://svn.reactos.org/svn/reactos?rev=62401&view=rev Log: [SHELL32] * Comment out some unused variables. * Remove some unused default debug channel declarations. Modified: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/shellpath.cpp trunk/reactos/dll/win32/shell32/shpolicy.cpp Modified: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] Sun Mar 2 21:45:44 2014 @@ -1,6 +1,4 @@ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup( POINTL *ppt, @@ -137,4 +135,3 @@ { return S_OK; } - Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Sun Mar 2 21:45:44 2014 @@ -19,8 +19,6 @@ #include "precomp.h" -WINE_DEFAULT_DEBUG_CHANNEL(shell); - WCHAR swShell32Name[MAX_PATH]; DWORD NumIconOverlayHandlers = 0; Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Sun Mar 2 21:45:44 2014 @@ -564,16 +564,20 @@ static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; +static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; +static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; + +#if 0 static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; -static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; -static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; +static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'}; +static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'}; +#endif + /* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're * acting more Windows 9x-like for now. */ -static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'}; -static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'}; typedef enum _CSIDL_Type { CSIDL_Type_User, Modified: trunk/reactos/dll/win32/shell32/shpolicy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shpolicy… ============================================================================== --- trunk/reactos/dll/win32/shell32/shpolicy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shpolicy.cpp [iso-8859-1] Sun Mar 2 21:45:44 2014 @@ -67,7 +67,7 @@ static const char strNoWindowsUpdate[] = {"NoWindowsUpdate"}; static const char strNoSetActiveDesktop[] = {"NoSetActiveDesktop"}; static const char strNoForgetSoftwareUpdate[] = {"NoForgetSoftwareUpdate"}; -static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"}; +//static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"}; static const char strForceCopyACLW[] = {"ForceCopyACLWithFile"}; static const char strNoResolveTrk[] = {"NoResolveTrack"}; static const char strNoResolveSearch[] = {"NoResolveSearch"};

10 years, 9 months

[akhaldi] 62400: [PSDK] * Fix a FIXME.. Actually, the LLVM/Clang folks did this ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 21:42:19 2014 New Revision: 62400 URL: http://svn.reactos.org/svn/reactos?rev=62400&view=rev Log: [PSDK] * Fix a FIXME.. Actually, the LLVM/Clang folks did this ;) Modified: trunk/reactos/include/psdk/guiddef.h Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Sun Mar 2 21:42:19 2014 @@ -32,12 +32,7 @@ #endif #ifndef DECLSPEC_SELECTANY -#ifdef __clang__ -/* FIXME: http://llvm.org/bugs/show_bug.cgi?id=13778 */ -#define DECLSPEC_SELECTANY __attribute__((weak)) -#else #define DECLSPEC_SELECTANY __declspec(selectany) -#endif #endif #ifndef EXTERN_C

10 years, 9 months

[akhaldi] 62399: [LIB/ATL] * Who came up with this _declspec thing ? Was it you Arch ?

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 21:40:58 2014 New Revision: 62399 URL: http://svn.reactos.org/svn/reactos?rev=62399&view=rev Log: [LIB/ATL] * Who came up with this _declspec thing ? Was it you Arch ? Modified: trunk/reactos/lib/atl/atlwin.h Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=62399… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Sun Mar 2 21:40:58 2014 @@ -360,7 +360,7 @@ } }; -_declspec(selectany) RECT CWindow::rcDefault = { CW_USEDEFAULT, CW_USEDEFAULT, 0, 0 }; +__declspec(selectany) RECT CWindow::rcDefault = { CW_USEDEFAULT, CW_USEDEFAULT, 0, 0 }; template <class TBase = CWindow, class TWinTraits = CControlWinTraits> class CWindowImplBaseT : public TBase, public CMessageMap

10 years, 9 months

[akhaldi] 62398: [SHELL32] * Remove accidentally added line (you'll get this Drag and Drop fun later ; ) ).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 21:35:18 2014 New Revision: 62398 URL: http://svn.reactos.org/svn/reactos?rev=62398&view=rev Log: [SHELL32] * Remove accidentally added line (you'll get this Drag and Drop fun later ;) ). Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Mar 2 21:35:18 2014 @@ -54,7 +54,6 @@ folders/fonts.cpp folders/cpanel.cpp folders/recyclebin.cpp - droptargets/CexeDropHandler.cpp shlexec.cpp shlfileop.cpp shlfolder.cpp

10 years, 9 months

[akhaldi] 62397: [PSDK][SHELL32] * Fix ShellMessageBox{A, W} calling convention. Spotted by Clang.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 21:23:04 2014 New Revision: 62397 URL: http://svn.reactos.org/svn/reactos?rev=62397&view=rev Log: [PSDK][SHELL32] * Fix ShellMessageBox{A,W} calling convention. Spotted by Clang. Modified: trunk/reactos/dll/win32/shell32/shellord.cpp trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Sun Mar 2 21:23:04 2014 @@ -309,7 +309,7 @@ * ordinal. If you change the implementation here please update the code in * shlwapi as well. */ -EXTERN_C int WINAPI ShellMessageBoxW( +EXTERN_C int ShellMessageBoxW( HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, @@ -367,7 +367,7 @@ * NOTES * Exported by ordinal */ -EXTERN_C int WINAPI ShellMessageBoxA( +EXTERN_C int ShellMessageBoxA( HINSTANCE hInstance, HWND hWnd, LPCSTR lpText, Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Sun Mar 2 21:23:04 2014 @@ -476,7 +476,6 @@ _In_opt_ HICON hIcon); int -WINAPI ShellMessageBoxA( _In_opt_ HINSTANCE hAppInst, _In_opt_ HWND hWnd, @@ -486,7 +485,6 @@ ...); int -WINAPI ShellMessageBoxW( _In_opt_ HINSTANCE hAppInst, _In_opt_ HWND hWnd,

10 years, 9 months

[akhaldi] 62396: [PSDK] * Don't warn about ignored attributes in Clang build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 2 21:18:32 2014 New Revision: 62396 URL: http://svn.reactos.org/svn/reactos?rev=62396&view=rev Log: [PSDK] * Don't warn about ignored attributes in Clang build. Modified: trunk/reactos/include/psdk/strsafe.h Modified: trunk/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/strsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/strsafe.h [iso-8859-1] Sun Mar 2 21:18:32 2014 @@ -11,6 +11,11 @@ #include <string.h> #include <stdarg.h> #include <specstrings.h> + +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wignored-attributes" +#endif #ifndef _SIZE_T_DEFINED #define _SIZE_T_DEFINED @@ -2059,4 +2064,9 @@ #undef _getws #define _getws _getws_instead_use_StringCbGetsW_or_StringCchGetsW; #endif + +#ifdef __clang__ +#pragma clang diagnostic pop #endif + +#endif /* _STRSAFE_H_INCLUDED_ */

10 years, 9 months

← Newer
1
...
17
18
19
20
21
22
23
24
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 March 2014