- strmini.h: Include windef.h so CDECL gets defined for msvc version of DEFINE_GUIDEX in ks.h

- Fix misc msvc issues in paint, setup, mmsys and mmebuddy
- Simplify the way kernel32 is built, reverting the "test" from 14241

svn path=/trunk/; revision=42362

reactos/base/applications/paint/drawing.c

@@ -81,12 +81,13 @@ void Poly(HDC hdc, POINT *lpPoints, int nCount, int fg, int bg, int thickness, i
 
 void Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, int color, int thickness)
 {
+    HPEN oldPen;
     POINT fourPoints[4];
     fourPoints[0] = p1;
     fourPoints[1] = p2;
     fourPoints[2] = p3;
     fourPoints[3] = p4;
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
+    oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
     PolyBezier(hdc, fourPoints, 4);
     DeleteObject(SelectObject(hdc, oldPen));
 }

reactos/base/applications/paint/winproc.c

@@ -313,8 +313,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
             if (hwnd==hwndMiniature)
             {
                 long mclient[4];
+                HDC hdc;
                 GetClientRect(hwndMiniature, (LPRECT)&mclient);
-                HDC hdc = GetDC(hwndMiniature);
+                hdc = GetDC(hwndMiniature);
                 BitBlt(hdc, -min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]), 
                     -min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000, imgYRes-mclient[3]), imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY);
                 ReleaseDC(hwndMiniature, hdc);

reactos/base/setup/reactos/reactos.c

@@ -364,8 +364,9 @@ LangSelDlgProc(HWND hwndDlg,
 
                     if (tindex != CB_ERR)
                     {
+                        WORD LangID;
                         SetupData.SelectedLangId = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0);
-                        WORD LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16);
+                        LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16);
                         SetThreadLocale(MAKELCID(LangID, SORT_DEFAULT));
                         // FIXME: need to reload all resource to force
                         // the new language setting

reactos/dll/cpl/mmsys/volume.c

@@ -292,9 +292,9 @@ VolumeDlgProc(HWND hwndDlg,
               LPARAM lParam)
 {
     static IMGINFO ImgInfo;
+    PGLOBAL_DATA pGlobalData;
     UNREFERENCED_PARAMETER(lParam);
     UNREFERENCED_PARAMETER(wParam);
-    PGLOBAL_DATA pGlobalData;
 
     pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
 

reactos/dll/win32/kernel32/kernel32.rbuild

@@ -1,10 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
+<module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">
-	<module name="kernel32_base" type="objectlibrary" crt="dll">
+	<importlibrary definition="kernel32.pspec" />
-		<include base="kernel32_base">.</include>
+	<include base="kernel32">.</include>
-		<include base="kernel32_base">include</include>
+	<include base="kernel32" root="intermediate">.</include>
+	<include base="kernel32">include</include>
 	<include base="ReactOS">include/reactos/subsys</include>
+	<library>wine</library>
+	<library>pseh</library>
+	<library>normalize</library>
+	<library>ntdll</library>
 	<define name="_KERNEL32_" />
 	<redefine name="_WIN32_WINNT">0x0600</redefine>
 	<define name="__NO_CTYPE_INLINES" />
@@ -132,23 +137,8 @@
 			</directory>
 		</if>
 	</directory>
-
 	<directory name="misc">
 		<file>icustubs.cpp</file>
 	</directory>
-		<library>normalize</library>
-	</module>
-	<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll">
-		<importlibrary definition="kernel32.pspec" />
-		<include base="kernel32">.</include>
-		<include base="kernel32" root="intermediate">.</include>
-		<include base="kernel32">include</include>
-		<library>kernel32_base</library>
-		<library>wine</library>
-		<library>pseh</library>
-
 	<file>kernel32.rc</file>
-
-		<library>ntdll</library>
 </module>
-</group>

reactos/include/ddk/strmini.h

@@ -2,6 +2,7 @@
 #define _STREAM_H
 
 #include <ntddk.h>
+#include <windef.h>
 #include <ks.h>
 
 #define STREAMAPI __stdcall

reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c

@@ -21,7 +21,8 @@
 /*
     Standard MME driver entry-point for messages relating to auxiliary devices.
 */
-APIENTRY DWORD
+DWORD
+APIENTRY
 auxMessage(
     DWORD DeviceId,
     DWORD Message,

reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c

@@ -21,7 +21,8 @@
 /*
     Standard MME driver entry-point for messages relating to MIDI input.
 */
-APIENTRY DWORD
+DWORD
+APIENTRY
 midMessage(
     DWORD DeviceId,
     DWORD Message,

reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c

@@ -21,7 +21,8 @@
 /*
     Standard MME driver entry-point for messages relating to MIDI output.
 */
-APIENTRY DWORD
+DWORD
+APIENTRY
 modMessage(
     DWORD DeviceId,
     DWORD Message,

reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c

@@ -21,7 +21,8 @@
 /*
     Standard MME driver entry-point for messages relating to mixers.
 */
-APIENTRY DWORD
+DWORD
+APIENTRY
 mxdMessage(
     DWORD DeviceId,
     DWORD Message,

reactos/lib/drivers/sound/mmebuddy/wave/header.c

@@ -224,11 +224,11 @@ EnqueueWaveHeader(
     PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
     IN  PVOID Parameter)
 {
+    PWAVEHDR WaveHeader = (PWAVEHDR) Parameter;
+
     VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance );
     VALIDATE_MMSYS_PARAMETER( Parameter );
 
-    PWAVEHDR WaveHeader = (PWAVEHDR) Parameter;
-
     /* Initialise */
     WaveHeader->lpNext = NULL;
 

reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c

@@ -22,7 +22,8 @@
     Standard MME driver entry-point for messages relating to wave audio
     input.
 */
-APIENTRY DWORD
+DWORD
+APIENTRY
 widMessage(
     DWORD DeviceId,
     DWORD Message,

reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c

@@ -31,7 +31,8 @@ MMRESULT HelloWorld(PSOUND_DEVICE_INSTANCE Instance, PVOID String)
     Standard MME driver entry-point for messages relating to wave audio
     output.
 */
-APIENTRY DWORD
+DWORD
+APIENTRY
 wodMessage(
     DWORD DeviceId,
     DWORD Message,