diff --git a/reactos/base/applications/paint/drawing.c b/reactos/base/applications/paint/drawing.c
index 2bae28bce53..bb8d24a40a5 100644
--- a/reactos/base/applications/paint/drawing.c
+++ b/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));
}
diff --git a/reactos/base/applications/paint/winproc.c b/reactos/base/applications/paint/winproc.c
index 4e72294a99b..9500bdb1aa6 100644
--- a/reactos/base/applications/paint/winproc.c
+++ b/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);
diff --git a/reactos/base/setup/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c
index dde9dc52bc1..a2a7cf41cf3 100644
--- a/reactos/base/setup/reactos/reactos.c
+++ b/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
diff --git a/reactos/dll/cpl/mmsys/volume.c b/reactos/dll/cpl/mmsys/volume.c
index 7017e9983a3..f1f55f3adf9 100644
--- a/reactos/dll/cpl/mmsys/volume.c
+++ b/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);
diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild
index 64143e243f5..100eff7205a 100644
--- a/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@ -1,154 +1,144 @@
-
-
- .
- include
- include/reactos/subsys
-
- 0x0600
-
- 0x05020100
- errcodes
-
-
-
- -fno-unit-at-a-time
- -fno-exceptions
- -fno-rtti
-
-
- debugger.c
- output.c
-
-
- except.c
-
-
- backup.c
- bintype.c
- cnotify.c
- copy.c
- create.c
- curdir.c
- delete.c
- deviceio.c
- dir.c
- dosdev.c
- file.c
- find.c
- hardlink.c
- iocompl.c
- lfile.c
- lock.c
- mailslot.c
- move.c
- npipe.c
- pipe.c
- rw.c
- tape.c
- volume.c
-
-
- global.c
- heap.c
- isbad.c
- local.c
- procmem.c
- resnotify.c
- section.c
- virtual.c
-
-
- actctx.c
- atom.c
- chartype.c
- collation.c
- casemap.c
- comm.c
- commdcb.c
- computername.c
- console.c
- dllmain.c
- env.c
- error.c
- errormsg.c
- fold.c
- handle.c
- lang.c
- ldr.c
- lzexpand.c
- muldiv.c
- nls.c
- perfcnt.c
- power.c
- recovery.c
- res.c
- sortkey.c
- stubs.c
- sysinfo.c
- time.c
- timerqueue.c
- toolhelp.c
- version.c
-
-
- cmdline.c
- procsup.c
- job.c
- proc.c
- session.c
-
-
- lstring.c
-
-
- condvar.c
- critical.c
- event.c
- mutex.c
- sem.c
- timer.c
- wait.c
-
-
- fiber.c
- fls.c
- thread.c
- tls.c
-
-
- lcformat.c
- profile.c
- utils.c
-
-
-
-
- fiber.S
- thread.S
-
-
-
-
-
- icustubs.cpp
-
- normalize
-
-
-
- .
- .
- include
- kernel32_base
- wine
- pseh
-
- kernel32.rc
-
- ntdll
-
-
+
+
+ .
+ .
+ include
+ include/reactos/subsys
+ wine
+ pseh
+ normalize
+ ntdll
+
+ 0x0600
+
+ 0x05020100
+ errcodes
+
+
+
+ -fno-unit-at-a-time
+ -fno-exceptions
+ -fno-rtti
+
+
+ debugger.c
+ output.c
+
+
+ except.c
+
+
+ backup.c
+ bintype.c
+ cnotify.c
+ copy.c
+ create.c
+ curdir.c
+ delete.c
+ deviceio.c
+ dir.c
+ dosdev.c
+ file.c
+ find.c
+ hardlink.c
+ iocompl.c
+ lfile.c
+ lock.c
+ mailslot.c
+ move.c
+ npipe.c
+ pipe.c
+ rw.c
+ tape.c
+ volume.c
+
+
+ global.c
+ heap.c
+ isbad.c
+ local.c
+ procmem.c
+ resnotify.c
+ section.c
+ virtual.c
+
+
+ actctx.c
+ atom.c
+ chartype.c
+ collation.c
+ casemap.c
+ comm.c
+ commdcb.c
+ computername.c
+ console.c
+ dllmain.c
+ env.c
+ error.c
+ errormsg.c
+ fold.c
+ handle.c
+ lang.c
+ ldr.c
+ lzexpand.c
+ muldiv.c
+ nls.c
+ perfcnt.c
+ power.c
+ recovery.c
+ res.c
+ sortkey.c
+ stubs.c
+ sysinfo.c
+ time.c
+ timerqueue.c
+ toolhelp.c
+ version.c
+
+
+ cmdline.c
+ procsup.c
+ job.c
+ proc.c
+ session.c
+
+
+ lstring.c
+
+
+ condvar.c
+ critical.c
+ event.c
+ mutex.c
+ sem.c
+ timer.c
+ wait.c
+
+
+ fiber.c
+ fls.c
+ thread.c
+ tls.c
+
+
+ lcformat.c
+ profile.c
+ utils.c
+
+
+
+
+ fiber.S
+ thread.S
+
+
+
+
+ icustubs.cpp
+
+ kernel32.rc
+
diff --git a/reactos/include/ddk/strmini.h b/reactos/include/ddk/strmini.h
index 1cf4cf1ee68..a223fa24d02 100644
--- a/reactos/include/ddk/strmini.h
+++ b/reactos/include/ddk/strmini.h
@@ -2,6 +2,7 @@
#define _STREAM_H
#include
+#include
#include
#define STREAMAPI __stdcall
diff --git a/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c b/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
index 96b4ca2a410..f248a48e400 100644
--- a/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
+++ b/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,
diff --git a/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c b/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
index 9afe6100d62..c088dc01a65 100644
--- a/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
+++ b/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,
diff --git a/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c b/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
index 78db820b6ba..a08f80d4bd6 100644
--- a/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
+++ b/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,
diff --git a/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c b/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
index 1f330f88835..f4596912b05 100644
--- a/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
+++ b/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,
diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/header.c b/reactos/lib/drivers/sound/mmebuddy/wave/header.c
index 62cf83181d6..ac1c99bf434 100644
--- a/reactos/lib/drivers/sound/mmebuddy/wave/header.c
+++ b/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;
diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c b/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
index a3815b8cb9e..e3e5a491c31 100644
--- a/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
+++ b/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,
diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c b/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
index 968a50e5cbf..108941ee764 100644
--- a/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
+++ b/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,