Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[akhaldi] 57244: [PSDK] * Use __attribute__((weak)) instead of __declspec(selectany) until http://llvm.org/bugs/show_bug.cgi?id=13778 is fixed.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 6 12:28:53 2012 New Revision: 57244 URL: http://svn.reactos.org/svn/reactos?rev=57244&view=rev Log: [PSDK] * Use __attribute__((weak)) instead of __declspec(selectany) until http://llvm.org/bugs/show_bug.cgi?id=13778 is fixed. 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] Thu Sep 6 12:28:53 2012 @@ -32,7 +32,12 @@ #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

12 years

[dgorbachev] 57243: Remove "bashisms" from configure.sh script, simplify it a bit.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Sep 5 21:40:14 2012 New Revision: 57243 URL: http://svn.reactos.org/svn/reactos?rev=57243&view=rev Log: Remove "bashisms" from configure.sh script, simplify it a bit. Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=57243&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Wed Sep 5 21:40:14 2012 @@ -1,6 +1,6 @@ -#!/bin/bash -if [ "x$ROS_ARCH" == "x" ] -then +#!/bin/sh + +if [ "x$ROS_ARCH" = "x" ]; then echo Could not detect RosBE. exit 1 fi @@ -10,34 +10,25 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] -then +if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then echo Creating directories in $REACTOS_OUTPUT_PATH - mkdir -p $REACTOS_OUTPUT_PATH + mkdir -p "$REACTOS_OUTPUT_PATH" cd "$REACTOS_OUTPUT_PATH" fi -mkdir -p host-tools -mkdir -p reactos +mkdir -p host-tools reactos echo Preparing host tools... cd host-tools -if [ -f CMakeCache.txt ] -then - rm -f CMakeCache.txt -fi +rm -f CMakeCache.txt REACTOS_BUILD_TOOLS_DIR="$PWD" cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" echo Preparing reactos... cd ../reactos -if [ -f CMakeCache.txt ] -then - rm -f CMakeCache.txt -fi +rm -f CMakeCache.txt cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: make, makex, etc...$. -

12 years

[dgorbachev] 57242: [ATACTL] Add set_cpp() to CMake script. [LIBUSB][UNIATA] Compile with no RTTI and exception handling.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Sep 5 21:39:43 2012 New Revision: 57242 URL: http://svn.reactos.org/svn/reactos?rev=57242&view=rev Log: [ATACTL] Add set_cpp() to CMake script. [LIBUSB][UNIATA] Compile with no RTTI and exception handling. Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/usb/usbd/CMakeLists.txt trunk/reactos/drivers/usb/usbehci/CMakeLists.txt trunk/reactos/lib/drivers/libusb/CMakeLists.txt Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/C… ============================================================================== --- trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -1,3 +1,4 @@ +set_cpp() add_definitions(-DUSER_MODE) include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata) Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -22,10 +22,14 @@ ${SOURCE} idedma.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 +if(MSVC) + #add_target_compile_flags(uniata "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") +else() #allow_warnings(uniata) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") + #add_target_compile_flags(uniata "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti -Wno-error") endif() add_pch(uniata stdafx.h) Modified: trunk/reactos/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/CMakeList… ============================================================================== --- trunk/reactos/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -10,4 +10,4 @@ add_importlibs(usbd ntoskrnl hal) -add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -34,4 +34,4 @@ set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal usbd) -add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/lib/drivers/libusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/CMakeLi… ============================================================================== --- trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -19,3 +19,11 @@ add_library(libusb ${SOURCE}) add_dependencies(libusb bugcodes) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 +if(MSVC) + #add_target_compile_flags(libusb "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") +else() + #add_target_compile_flags(libusb "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif()

12 years

[dgorbachev] 57241: [NTOSKRNL] - Remove an unused variable. [CHARMAP][CSRSRV][MOUNTMGR] - Declare variables extern.

by dgorbachev＠svn.reactos.org

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 *****************************************************************/

12 years

[dgorbachev] 57240: [PSDK] Mark Disconnect() method of INetConnectionConnectUi as pure in netcon.h

by dgorbachev＠svn.reactos.org

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)

12 years

[akhaldi] 57239: [SMSS] * Rename the folder back to smss now. See issue #7278 for more details.

by akhaldi＠svn.reactos.org

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)

12 years

[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

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)

12 years

[cgutman] 57237: [AFD] - Try to fix MSVC build

by cgutman＠svn.reactos.org

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;

12 years

[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

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;

12 years

[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

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)

12 years

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 September 2012