[ros-diffs] [gbrunmar] 33402: Made user32.dll compile under MSVC (doesn't link though)

Author: gbrunmar
Date: Sat May 10 05:29:19 2008
New Revision: 33402

URL: http://svn.reactos.org/svn/reactos?rev=33402&view=rev
Log:
Made user32.dll compile under MSVC (doesn't link though)

Modified:
    trunk/reactos/dll/win32/user32/controls/edit.c
    trunk/reactos/dll/win32/user32/controls/listbox.c
    trunk/reactos/dll/win32/user32/include/dde_private.h
    trunk/reactos/dll/win32/user32/include/user32.h
    trunk/reactos/dll/win32/user32/misc/resources.c
    trunk/reactos/dll/win32/user32/windows/defwnd.c
    trunk/reactos/dll/win32/user32/windows/spy.c
    trunk/reactos/dll/win32/user32/windows/window.c

Modified: trunk/reactos/dll/win32/user32/controls/edit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sat May 10 05:29:19 2008
@@ -171,7 +171,7 @@
 /*
  *	These functions have trivial implementations
  *	We still like to call them internally
- *	"static inline" makes them more like macro's
+ *	"static __inline" makes them more like macro's
  */
 static __inline BOOL	EDIT_EM_CanUndo(EDITSTATE *es);
 static __inline void	EDIT_EM_EmptyUndoBuffer(EDITSTATE *es);
@@ -402,14 +402,14 @@
     return version;
 }
 
-static inline UINT get_text_length(EDITSTATE *es)
+static __inline UINT get_text_length(EDITSTATE *es)
 {
     if(es->text_length == (UINT)-1)
         es->text_length = strlenW(es->text);
     return es->text_length;
 }
 
-static inline void text_buffer_changed(EDITSTATE *es)
+static __inline void text_buffer_changed(EDITSTATE *es)
 {
     es->text_length = (UINT)-1;
 }

Modified: trunk/reactos/dll/win32/user32/controls/listbox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sat May 10 05:29:19
2008
@@ -894,7 +894,7 @@
     }
 }
 
-static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 )
+static __inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 )
 {
     INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, -1, str2, -1 );
     if (ret == CSTR_LESS_THAN)

Modified: trunk/reactos/dll/win32/user32/include/dde_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] Sat May 10 05:29:19
2008
@@ -243,7 +243,7 @@
 						 WPARAM wParam, LPARAM lParam);
 extern	void		WDML_NotifyThreadExit(DWORD tid);
 
-static inline void WDML_ExtractAck(WORD status, DDEACK* da)
+static __inline void WDML_ExtractAck(WORD status, DDEACK* da)
 {
     *da = *((DDEACK*)&status);
 }

Modified: trunk/reactos/dll/win32/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sat May 10 05:29:19 2008
@@ -23,6 +23,7 @@
 #include <windowsx.h>
 #include <winnls32.h>
 #include <ndk/ntndk.h>
+#include <ddk/ntstatus.h>
 
 /* CSRSS Headers */
 #include <csrss/csrss.h>
@@ -37,6 +38,9 @@
 
 /* Internal User32 Headers */
 #include "user32p.h"
+
+#include <libs\pseh\pseh.h>
+#include <libs\pseh\framebased.h>
 
 /* FIXME: Use ntgdi.h then cleanup... */
 HGDIOBJ STDCALL  NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj);

Modified: trunk/reactos/dll/win32/user32/misc/resources.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Sat May 10 05:29:19 2008
@@ -9,8 +9,8 @@
 #define CR_INVALID_DATA                   0x0000001F
 #endif
 
-typedef DWORD STDCALL (*CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG);
-typedef DWORD STDCALL (*CMP_UNREGNOTIFY) (ULONG );
+typedef DWORD (STDCALL *CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG);
+typedef DWORD (STDCALL *CMP_UNREGNOTIFY) (ULONG );
 
 /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
           does not seem to work properly for stack address space. */

Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 10 05:29:19 2008
@@ -1000,17 +1000,22 @@
 DefWndScreenshot(HWND hWnd)
 {
     RECT rect;
+    HDC hdc;
+    INT w;
+    INT h;
+    HBITMAP hbitmap;
+    HDC hdc2;
 
     OpenClipboard(hWnd);
     EmptyClipboard();
 
-    HDC hdc = GetWindowDC(hWnd);
+    hdc = GetWindowDC(hWnd);
     GetWindowRect(hWnd, &rect);
-    INT w = rect.right - rect.left;
-    INT h = rect.bottom - rect.top;
-
-    HBITMAP hbitmap = CreateCompatibleBitmap(hdc, w, h);
-    HDC hdc2 = CreateCompatibleDC(hdc);
+    w = rect.right - rect.left;
+    h = rect.bottom - rect.top;
+
+    hbitmap = CreateCompatibleBitmap(hdc, w, h);
+    hdc2 = CreateCompatibleDC(hdc);
     SelectObject(hdc2, hbitmap);
 
     BitBlt(hdc2, 0, 0, w, h,

Modified: trunk/reactos/dll/win32/user32/windows/spy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] Sat May 10 05:29:19 2008
@@ -1916,7 +1916,7 @@
 /***********************************************************************
  *           get_indent_level
  */
-inline static INT_PTR get_indent_level(void)
+__inline static INT_PTR get_indent_level(void)
 {
     return (INT_PTR)TlsGetValue( indent_tls_index );
 }
@@ -1925,7 +1925,7 @@
 /***********************************************************************
  *           set_indent_level
  */
-inline static void set_indent_level( INT_PTR level )
+__inline static void set_indent_level( INT_PTR level )
 {
     TlsSetValue( indent_tls_index, (void *)level );
 }

Modified: trunk/reactos/dll/win32/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat May 10 05:29:19 2008
@@ -277,6 +277,7 @@
     {
         POINT mPos[2];
         UINT id = 0;
+        HWND top_child;
 
         /* lpParams of WM_[NC]CREATE is different for MDI children.
         * MDICREATESTRUCT members have the originally passed values.
@@ -309,7 +310,7 @@
                 WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
         }
 
-        HWND top_child = GetWindow(hWndParent, GW_CHILD);
+        top_child = GetWindow(hWndParent, GW_CHILD);
 
         if (top_child)
         {
@@ -382,6 +383,7 @@
     {
         POINT mPos[2];
         UINT id = 0;
+        HWND top_child;
 
         /* lpParams of WM_[NC]CREATE is different for MDI children.
         * MDICREATESTRUCT members have the originally passed values.
@@ -414,7 +416,7 @@
                 WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
         }
 
-        HWND top_child = GetWindow(hWndParent, GW_CHILD);
+        top_child = GetWindow(hWndParent, GW_CHILD);
 
         if (top_child)
         {