- delayimp.h: Use FORCEINLINE instead of static __inline__

- winbase.h: Make winbase.h usable by MSVC
- winuser.h: Add missing const specifiers to GetTabbedTextExtentA/W, TabbedTextOutA/W, ToAscii/Ex and ToUnicode/Ex
- Make gdi32, user32, beepmidi and csrss drmk build in msvc
- Fix most msvc issues in win32k -- a few remain
- Make ntoskrnl compile with /W1 again

svn path=/trunk/; revision=42314

reactos/dll/win32/beepmidi/beepmidi.c

@@ -142,11 +142,13 @@ ProcessPlayingNotes(
 
         while ( ( node != NULL ) && ( arp_notes <= POLYPHONY ) )
         {
-            DPRINT("playing..\n");
             BEEP_SET_PARAMETERS beep_data;
             DWORD actually_playing = 0;
 
             double frequency = node->note;
+
+            DPRINT("playing..\n");
+
             frequency = frequency / 12;
             frequency = pow(2, frequency);
             frequency = 8.1758 * frequency;
@@ -481,10 +483,10 @@ PlayNote(
 {
     HANDLE heap = GetProcessHeap();
 
-    DPRINT("PlayNote\n");
-
     NoteNode* node;
 
+    DPRINT("PlayNote\n");
+
     if ( velocity == 0 )
     {
         DPRINT("Zero velocity\n");
@@ -757,8 +759,8 @@ ProcessLongMidiMessage(
     Exported function that receives messages from WINMM (the MME API.)
 */
 
-FAR PASCAL
 MMRESULT
+FAR PASCAL
 modMessage(
     UINT device_id,
     UINT message,
@@ -839,7 +841,8 @@ modMessage(
     Driver entrypoint.
 */
 
-FAR PASCAL LONG
+LONG
+FAR PASCAL
 DriverProc(
     DWORD driver_id,
     HDRVR driver_handle,

reactos/dll/win32/gdi32/misc/wingl.c

@@ -28,11 +28,11 @@
 
 
 
-typedef int  WINAPI (*CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
+typedef int  (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL WINAPI (*SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
+typedef BOOL (WINAPI *SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL WINAPI (*SWAPBUFFERS) (HDC hdc);
+typedef BOOL (WINAPI *SWAPBUFFERS) (HDC hdc);
-typedef int  WINAPI (*DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
+typedef int  (WINAPI *DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
-typedef int  WINAPI (*GETPIXELFMT) (HDC);
+typedef int  (WINAPI *GETPIXELFMT) (HDC);
 
 
 static CHOOSEPIXELFMT    glChoosePixelFormat   = NULL;

reactos/dll/win32/gdi32/objects/dc.c

@@ -1539,6 +1539,7 @@ SelectObject(HDC hDC,
 {
     PDC_ATTR pDc_Attr;
     HGDIOBJ hOldObj = NULL;
+    UINT uType
 //    PTEB pTeb;
 
     if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
@@ -1553,7 +1554,7 @@ SelectObject(HDC hDC,
         return NULL;
     }
 
-    UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj);
+    uType = GDI_HANDLE_GET_TYPE(hGdiObj);
 
     switch (uType)
     {

reactos/dll/win32/user32/include/user32.h

@@ -61,9 +61,11 @@ SharedPtrToUser(PVOID Ptr)
 static __inline PVOID
 DesktopPtrToUser(PVOID Ptr)
 {
+    PCLIENTINFO pci;
+    PDESKTOPINFO pdi;
     GetW32ThreadInfo();
-    PCLIENTINFO pci = GetWin32ClientInfo();
+    pci = GetWin32ClientInfo();
-    PDESKTOPINFO pdi = pci->pDeskInfo;
+    pdi = pci->pDeskInfo;
 
     ASSERT(Ptr != NULL);
     ASSERT(pdi != NULL);

reactos/dll/win32/user32/windows/menu.c

@@ -1234,9 +1234,10 @@ User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength)
 {
   HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU");
   LRESULT Result = (LRESULT)hmenu;
+  MENUINFO menuinfo = {0};
+  MENUITEMINFOW info = {0};
 
   // removing space for checkboxes from menu
-  MENUINFO menuinfo = {0};
   menuinfo.cbSize = sizeof(menuinfo);
   menuinfo.fMask = MIM_STYLE;
   GetMenuInfo(hmenu, &menuinfo);
@@ -1244,7 +1245,6 @@ User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength)
   SetMenuInfo(hmenu, &menuinfo);
 
   // adding bitmaps to menu items
-  MENUITEMINFOW info = {0};
   info.cbSize = sizeof(info);
   info.fMask |= MIIM_BITMAP;
   info.hbmpItem = HBMMENU_POPUP_MINIMIZE;

reactos/drivers/wdm/audio/drm/drmk/stubs.cpp

@@ -24,7 +24,8 @@
 /*
  * @unimplemented
  */
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
 DrmAddContentHandlers(
     IN  ULONG ContentId,
     IN  PVOID *paHandlers,
@@ -41,7 +42,8 @@ DrmAddContentHandlers(
 /*
  * @unimplemented
  */
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
 DrmCreateContentMixed(
     IN  PULONG paContentId,
     IN  ULONG cContentId,
@@ -57,7 +59,8 @@ DrmCreateContentMixed(
 /*
  * @unimplemented
  */
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
 DrmDestroyContent(
     IN  ULONG ContentId)
 {
@@ -72,7 +75,8 @@ DrmDestroyContent(
 /*
  * @unimplemented
  */
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
 DrmForwardContentToDeviceObject(
     IN  ULONG ContentId,
     IN  PVOID Reserved,
@@ -90,7 +94,8 @@ DrmForwardContentToDeviceObject(
 /*
  * @unimplemented
  */
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
 DrmForwardContentToFileObject(
     IN  ULONG ContentId,
     IN  PFILE_OBJECT FileObject)
@@ -106,7 +111,8 @@ DrmForwardContentToFileObject(
 /*
  * @unimplemented
  */
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
 DrmForwardContentToInterface(
     IN  ULONG ContentId,
     IN  PUNKNOWN pUnknown,
@@ -122,7 +128,8 @@ DrmForwardContentToInterface(
 /*
  * @unimplemented
  */
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
 DrmGetContentRights(
     IN  ULONG ContentId,
     OUT PDRMRIGHTS DrmRights)
@@ -130,4 +137,3 @@ DrmGetContentRights(
     UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
-

reactos/include/psdk/delayimp.h

@@ -65,7 +65,7 @@ typedef struct DelayLoadInfo
 
 typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo);
 
-static __inline__
+FORCEINLINE
 unsigned
 IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase)
 {
@@ -74,7 +74,7 @@ IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase)
 
 extern const IMAGE_DOS_HEADER __ImageBase;
 
-static __inline__
+FORCEINLINE
 PVOID
 PFromRva(RVA rva)
 {

reactos/include/psdk/winbase.h

@@ -1872,6 +1872,15 @@ PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY);
 VOID WINAPI InitializeSListHead(PSLIST_HEADER);
 USHORT WINAPI QueryDepthSList(PSLIST_HEADER);
 
+#ifdef _MSC_VER
+
+//
+// Intrinsics are a mess -- *sigh*
+//
+long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand);
+#pragma intrinsic(_InterlockedCompareExchange)
+#endif
+
 #if !defined(InterlockedAnd)
 #define InterlockedAnd InterlockedAnd_Inline
 FORCEINLINE

reactos/include/psdk/winuser.h

@@ -4090,8 +4090,8 @@ HBRUSH WINAPI GetSysColorBrush(int);
 #define GetSysModalWindow() (NULL)
 HMENU WINAPI GetSystemMenu(HWND,BOOL);
 int WINAPI GetSystemMetrics(int);
-DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,LPINT);
+DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST LPINT);
-DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,LPINT);
+DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST LPINT);
 LONG WINAPI GetWindowLongA(HWND,int);
 LONG WINAPI GetWindowLongW(HWND,int);
 #ifdef _WIN64
@@ -4411,13 +4411,13 @@ VOID WINAPI SwitchToThisWindow(HWND,BOOL);
 #endif /* (_WIN32_WINNT >= 0x0500) */
 BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT);
 BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT);
-LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,LPINT,int);
+LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST LPINT,int);
-LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,LPINT,int);
+LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST LPINT,int);
 WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *);
-int WINAPI ToAscii(UINT,UINT,PBYTE,LPWORD,UINT);
+int WINAPI ToAscii(UINT,UINT,CONST PBYTE,LPWORD,UINT);
-int WINAPI ToAsciiEx(UINT,UINT,PBYTE,LPWORD,UINT,HKL);
+int WINAPI ToAsciiEx(UINT,UINT,CONST PBYTE,LPWORD,UINT,HKL);
-int WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT);
+int WINAPI ToUnicode(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT);
-int WINAPI ToUnicodeEx(UINT,UINT,PBYTE,LPWSTR,int,UINT,HKL);
+int WINAPI ToUnicodeEx(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT,HKL);
 BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
 BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT);
 BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);

reactos/ntoskrnl/mm/ARM3/expool.c

@@ -379,7 +379,11 @@ ExFreeArmPoolWithTag(IN PVOID P,
     //
     // Quickly deal with big page allocations
     //
-    if (PAGE_ALIGN(P) == P) return (VOID)MiFreePoolPages(P);
+    if (PAGE_ALIGN(P) == P)
+    {
+        (VOID)MiFreePoolPages(P);
+        return;
+    }
     
     //
     // Get the entry for this pool allocation
@@ -497,7 +501,8 @@ ExFreeArmPoolWithTag(IN PVOID P,
         // In this case, release the nonpaged pool lock, and free the page
         //
         KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql);
-        return (VOID)MiFreePoolPages(Entry);
+        (VOID)MiFreePoolPages(Entry);
+        return;
     }
 
     //

reactos/ntoskrnl/mm/pool.c

@@ -291,7 +291,7 @@ ExFreePoolWithTag(
 #endif
             ExFreePagedPool(Block);
     }
-    else if (Block) return ExFreeArmPoolWithTag(Block, Tag);
+    else if (Block) ExFreeArmPoolWithTag(Block, Tag);
     else
     {
         /* Warn only for NULL pointers */

reactos/subsystems/win32/csrss/api/handle.c

@@ -180,7 +180,7 @@ CsrInsertObject(
         RtlCopyMemory(Block,
                       ProcessData->HandleTable,
                       ProcessData->HandleTableSize * sizeof(CSRSS_HANDLE));
-        Block = _InterlockedExchangePointer((volatile void*)&ProcessData->HandleTable, Block);
+        Block = _InterlockedExchangePointer((void* volatile)&ProcessData->HandleTable, Block);
         RtlFreeHeap( CsrssApiHeap, 0, Block );
         ProcessData->HandleTableSize += 64;
     }

reactos/subsystems/win32/csrss/api/wapi.c

@@ -123,7 +123,7 @@ CsrpHandleConnectionRequest (PPORT_MESSAGE Request,
                              IN HANDLE hApiListenPort)
 {
     NTSTATUS Status;
-    HANDLE ServerPort = (HANDLE) 0;
+    HANDLE ServerPort = NULL, ServerThread = NULL;
     PCSRSS_PROCESS_DATA ProcessData = NULL;
     REMOTE_PORT_VIEW LpcRead;
     LpcRead.Length = sizeof(LpcRead);
@@ -167,7 +167,6 @@ CsrpHandleConnectionRequest (PPORT_MESSAGE Request,
         return Status;
     }
 
-    HANDLE ServerThread = (HANDLE) 0;
     Status = RtlCreateUserThread(NtCurrentProcess(),
                                  NULL,
                                  FALSE,

reactos/subsystems/win32/win32k/eng/engbrush.c

@@ -156,7 +156,9 @@ EngRealizeBrush(
     }
 
     /* Copy the bits to the new format bitmap */
-    rclDest = (RECTL){0, 0, psoPattern->sizlBitmap.cx, psoPattern->sizlBitmap.cy};
+    rclDest.left = rclDest.top = 0;
+    rclDest.right = psoPattern->sizlBitmap.cx;
+    rclDest.bottom = psoPattern->sizlBitmap.cy;
     EngCopyBits(psoRealize, psoPattern, NULL, pxlo, &rclDest, &ptlSrc);
 
     /* Unlock the bitmap again */

reactos/subsystems/win32/win32k/eng/engmisc.c

@@ -250,7 +250,7 @@ EngGetCurrentCodePage(OUT PUSHORT OemCodePage,
                       OUT PUSHORT AnsiCodePage)
 {
     /* Forward to kernel */
-    return RtlGetDefaultCodePage(AnsiCodePage, OemCodePage);
+    RtlGetDefaultCodePage(AnsiCodePage, OemCodePage);
 }
 
 /* EOF */

reactos/subsystems/win32/win32k/eng/mem.c

@@ -175,7 +175,7 @@ EngSecureMem(PVOID Address, ULONG Length)
 VOID APIENTRY
 EngUnsecureMem(HANDLE Mem)
 {
-  return MmUnsecureVirtualMemory((PVOID) Mem);
+  MmUnsecureVirtualMemory((PVOID) Mem);
 }
 
 /* EOF */

reactos/subsystems/win32/win32k/ldr/loader.c

@@ -228,8 +228,9 @@ EngLoadImage (LPWSTR DriverName)
 			DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n", Status);
 		}
 		else {
+            PDRIVERS DriverInfo;
 			hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress;
-			PDRIVERS DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS));
+			DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS));
 			DriverInfo->DriverName.MaximumLength = GdiDriverInfo.DriverName.MaximumLength;
 			DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length;
 			DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool, GdiDriverInfo.DriverName.MaximumLength);

reactos/subsystems/win32/win32k/ntuser/menu.c

@@ -292,6 +292,7 @@ IntDestroyMenuObject(PMENU_OBJECT Menu,
                                          NULL);
       if(NT_SUCCESS(Status))
       {
+         BOOL ret;
          if (Menu->MenuInfo.Wnd)
          {
             Window = UserGetWindowObject(Menu->MenuInfo.Wnd);
@@ -301,7 +302,7 @@ IntDestroyMenuObject(PMENU_OBJECT Menu,
             }
          }
 //         UserDereferenceObject(Menu);
-         BOOL ret = UserDeleteObject(Menu->MenuInfo.Self, otMenu);
+         ret = UserDeleteObject(Menu->MenuInfo.Self, otMenu);
          ObDereferenceObject(WindowStation);
          return ret;
       }

reactos/subsystems/win32/win32k/ntuser/ntstubs.c

@@ -872,9 +872,10 @@ NtUserProcessConnect(
   DPRINT("NtUserProcessConnect\n");
   if (pUserConnect && ( Size == sizeof(USERCONNECT) ))
   {
+     PPROCESSINFO W32Process;
      UserEnterShared();
      GetW32ThreadInfo();
-     PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process();
+     W32Process = PsGetCurrentProcessWin32Process();
      _SEH2_TRY
      {
         pUserConnect->siClient.psi = gpsi;

reactos/subsystems/win32/win32k/objects/coord.c

@@ -127,8 +127,8 @@ IntGdiModifyWorldTransform(
     CONST LPXFORM lpXForm,
     DWORD Mode)
 {
-    ASSERT(pDc);
     XFORM xformWorld2Wnd;
+    ASSERT(pDc);
 
     switch (Mode)
     {

reactos/subsystems/win32/win32k/objects/dclife.c

@@ -658,7 +658,8 @@ NtGdiCreateCompatibleDC(HDC hDC)
     pdcattrNew->ulDirty_        = pdcattrOld->ulDirty_;
     pdcattrNew->iCS_CP          = pdcattrOld->iCS_CP;
 
-    pdcNew->erclWindow = (RECTL){0, 0, 1, 1};
+    pdcNew->erclWindow.left = pdcNew->erclWindow.top = 0;
+    pdcNew->erclWindow.right = pdcNew->erclWindow.bottom = 1;
 
     DC_UnlockDc(pdcNew);
     DC_UnlockDc(pdcOld);

reactos/subsystems/win32/win32k/objects/drawing.c

@@ -713,8 +713,9 @@ app_fill_ellipse(DC *g, Rect r, PBRUSH pbrush)
 }
 
 static
+POINT
 FASTCALL
-POINT app_boundary_point(Rect r, int angle)
+app_boundary_point(Rect r, int angle)
 {
 	int cx, cy;
 	double tangent;

reactos/subsystems/win32/win32k/objects/gdibatch.c

@@ -25,14 +25,17 @@ DoDeviceSync( SURFOBJ *Surface, PRECTL Rect, FLONG fl)
   if (!(Device->flFlags & PDEV_DRIVER_PUNTED_CALL) && (Surface->dhsurf))
   {
      if (Device->DriverFunctions.SynchronizeSurface)
-        return Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl);
+     {
+       Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl);
+     }
      else
      {
        if (Device->DriverFunctions.Synchronize)
-          return Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect);
+       {
+         Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect);
+       }
      }
   }
-  return;  
 }
 
 VOID

reactos/subsystems/win32/win32k/objects/gdiobj.c

@@ -349,6 +349,9 @@ GDIOBJ_AllocObjWithHandle(ULONG ObjectType)
     POBJ  newObject = NULL;
     HANDLE CurrentProcessId, LockedProcessId;
     UCHAR TypeIndex;
+    UINT Index;
+    PGDI_TABLE_ENTRY Entry;
+    LONG TypeInfo;
 
     GDIDBG_INITLOOPTRACE();
 
@@ -373,10 +376,6 @@ GDIOBJ_AllocObjWithHandle(ULONG ObjectType)
         return NULL;
     }
 
-    UINT Index;
-    PGDI_TABLE_ENTRY Entry;
-    LONG TypeInfo;
-
     CurrentProcessId = PsGetCurrentProcessId();
     LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1);
 

reactos/subsystems/win32/win32k/objects/path.c

@@ -64,8 +64,9 @@ BOOL
 FASTCALL
 PATH_Delete(HPATH hPath)
 {
+  PPATH pPath;
   if (!hPath) return FALSE;
-  PPATH pPath = PATH_LockPath( hPath );
+  pPath = PATH_LockPath( hPath );
   if (!pPath) return FALSE;
   PATH_DestroyGdiPath( pPath );
   PATH_UnlockPath( pPath );

reactos/subsystems/win32/win32k/objects/region.c

@@ -2081,7 +2081,7 @@ VOID FASTCALL
 REGION_Delete(PROSRGNDATA pRgn)
 {
   if ( pRgn == prgnDefault) return;
-  return REGION_FreeRgn(pRgn);
+  REGION_FreeRgn(pRgn);
 }