[tkreuzer] 56554: Sync with trunk r56553

Author: tkreuzer
Date: Wed May  9 20:21:00 2012
New Revision: 56554

URL: http://svn.reactos.org/svn/reactos?rev=56554&view=rev
Log:
Sync with trunk r56553

Modified:
    branches/dib_rewrite/   (props changed)
    branches/dib_rewrite/base/applications/wordpad/CMakeLists.txt
    branches/dib_rewrite/base/shell/explorer/services/startup.c
    branches/dib_rewrite/boot/bootdata/hivesft_i386.inf
    branches/dib_rewrite/win32ss/gdi/eng/eng.h
    branches/dib_rewrite/win32ss/gdi/eng/mem.c
    branches/dib_rewrite/win32ss/gdi/eng/stretchblt.c
    branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c

Propchange: branches/dib_rewrite/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 20:21:00 2012
@@ -13,4 +13,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:56444-56548
+/trunk/reactos:56444-56553

Modified: branches/dib_rewrite/base/applications/wordpad/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/applications/w…
==============================================================================
--- branches/dib_rewrite/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original)
+++ branches/dib_rewrite/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Wed May  9
20:21:00 2012
@@ -1,24 +1,20 @@
+
+remove_definitions(-D_WIN32_IE=0x600)
+
+add_definitions(-D__ROS_LONG64__)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_definitions(-D__ROS_LONG64__)
 
 list(APPEND SOURCE
     olecallback.c
     print.c
     registry.c
-    wordpad.c)
+    wordpad.c
+    rsrc.rc)
 
-add_executable(wordpad
-    ${SOURCE}
-    rsrc.rc)
+add_executable(wordpad ${SOURCE})
 
 set_module_type(wordpad win32gui)
 target_link_libraries(wordpad wine uuid)
 add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt
kernel32 ntdll)
 add_cd_file(TARGET wordpad DESTINATION reactos/system32 FOR all)
-
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(wordpad)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS
"-Wno-error")
-endif()

Modified: branches/dib_rewrite/base/shell/explorer/services/startup.c
URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/shell/explorer…
==============================================================================
--- branches/dib_rewrite/base/shell/explorer/services/startup.c [iso-8859-1] (original)
+++ branches/dib_rewrite/base/shell/explorer/services/startup.c [iso-8859-1] Wed May  9
20:21:00 2012
@@ -510,6 +510,8 @@
          res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE,
FALSE);
     if (res && ops.postlogin && ops.startup)
          res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE,
FALSE);
+    if (res && ops.postlogin && ops.startup)
+         res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUNONCE], TRUE,
FALSE);
 
     printf("Operation done\n");
 

Modified: branches/dib_rewrite/boot/bootdata/hivesft_i386.inf
URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/boot/bootdata/hives…
==============================================================================
Binary files - no diff available.

Modified: branches/dib_rewrite/win32ss/gdi/eng/eng.h
URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/eng…
==============================================================================
--- branches/dib_rewrite/win32ss/gdi/eng/eng.h [iso-8859-1] (original)
+++ branches/dib_rewrite/win32ss/gdi/eng/eng.h [iso-8859-1] Wed May  9 20:21:00 2012
@@ -26,3 +26,7 @@
 ULONGLONG APIENTRY EngGetTickCount(VOID);
 
 VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG
Delta, ULONG iFormat);
+
+HANDLE
+APIENTRY
+EngSecureMemForRead(PVOID Address, ULONG Length);

Modified: branches/dib_rewrite/win32ss/gdi/eng/mem.c
URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/mem…
==============================================================================
--- branches/dib_rewrite/win32ss/gdi/eng/mem.c [iso-8859-1] (original)
+++ branches/dib_rewrite/win32ss/gdi/eng/mem.c [iso-8859-1] Wed May  9 20:21:00 2012
@@ -157,11 +157,53 @@
 /*
  * @implemented
  */
-HANDLE APIENTRY
+HANDLE
+APIENTRY
 EngSecureMem(PVOID Address, ULONG Length)
 {
-    return (HANDLE)-1; // HACK!!!
+    {// HACK!!!
+        _SEH2_TRY
+        {
+            ProbeForWrite(Address, Length, 1);
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            _SEH2_YIELD(return NULL);
+        }
+        _SEH2_END;
+        return (HANDLE)-1;
+    }
     return MmSecureVirtualMemory(Address, Length, PAGE_READWRITE);
+}
+
+HANDLE
+APIENTRY
+EngSecureMemForRead(PVOID Address, ULONG Length)
+{
+    {// HACK!!!
+        ULONG cPages;
+        volatile BYTE *pjProbe;
+
+        _SEH2_TRY
+        {
+            ProbeForRead(Address, Length, 1);
+            cPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Address, Length);
+            pjProbe = ALIGN_DOWN_POINTER_BY(Address, PAGE_SIZE);
+            while(cPages--)
+            {
+                /* Do a read probe */
+                (void)*pjProbe;
+                pjProbe += PAGE_SIZE;
+            }
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            _SEH2_YIELD(return NULL);
+        }
+        _SEH2_END;
+        return (HANDLE)-1;
+    }
+    return MmSecureVirtualMemory(Address, Length, PAGE_READONLY);
 }
 
 /*

Modified: branches/dib_rewrite/win32ss/gdi/eng/stretchblt.c
URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/str…
==============================================================================
--- branches/dib_rewrite/win32ss/gdi/eng/stretchblt.c [iso-8859-1] (original)
+++ branches/dib_rewrite/win32ss/gdi/eng/stretchblt.c [iso-8859-1] Wed May  9 20:21:00
2012
@@ -390,6 +390,24 @@
     /* Sanity check */
     ASSERT(IS_VALID_ROP4(Rop4));
 
+    /* Check if source and dest size are equal */
+    if (((DestRect->right - DestRect->left) == (SourceRect->right -
SourceRect->left)) &&
+        ((DestRect->bottom - DestRect->top) == (SourceRect->bottom -
SourceRect->top)))
+    {
+        /* Pass the request to IntEngBitBlt */
+        return IntEngBitBlt(psoDest,
+                            psoSource,
+                            MaskSurf,
+                            ClipRegion,
+                            ColorTranslation,
+                            DestRect,
+                            (PPOINTL)SourceRect,
+                            pMaskOrigin,
+                            pbo,
+                            BrushOrigin,
+                            Rop4);
+    }
+
     InputClippedRect = *DestRect;
     if (InputClippedRect.right < InputClippedRect.left)
     {

Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/gdi32/o…
==============================================================================
--- branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original)
+++ branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Wed May  9
20:21:00 2012
@@ -200,9 +200,9 @@
                                          dwOffset,
                                          pConvertedInfo,
                                          Usage,
-                                         0,
-                                         0,
-                                         0,
+                                         ConvertedInfoSize,
+                                         0, // fl
+                                         0, // dwColorSpace
                                          &bmBits);
         if (BitmapInfo != pConvertedInfo)
             RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo);