3 Aug
2009
3 Aug
'09
1:46 p.m.
Author: sginsberg
Date: Mon Aug 3 15:46:37 2009
New Revision: 42362
URL: http://svn.reactos.org/svn/reactos?rev=42362&view=rev
Log:
- 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
Modified:
trunk/reactos/base/applications/paint/drawing.c
trunk/reactos/base/applications/paint/winproc.c
trunk/reactos/base/setup/reactos/reactos.c
trunk/reactos/dll/cpl/mmsys/volume.c
trunk/reactos/dll/win32/kernel32/kernel32.rbuild
trunk/reactos/include/ddk/strmini.h
trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
Modified: trunk/reactos/base/applications/paint/drawing.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/dr…
==============================================================================
--- trunk/reactos/base/applications/paint/drawing.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/drawing.c [iso-8859-1] Mon Aug 3 15:46:37 2009
@@ -81,12 +81,13 @@
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));
}
Modified: trunk/reactos/base/applications/paint/winproc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi…
==============================================================================
--- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Mon Aug 3 15:46:37 2009
@@ -313,8 +313,9 @@
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);
Modified: trunk/reactos/base/setup/reactos/reactos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos…
==============================================================================
--- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Aug 3 15:46:37 2009
@@ -364,8 +364,9 @@
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
Modified: trunk/reactos/dll/cpl/mmsys/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Mon Aug 3 15:46:37 2009
@@ -292,9 +292,9 @@
LPARAM lParam)
{
static IMGINFO ImgInfo;
+ PGLOBAL_DATA pGlobalData;
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
- PGLOBAL_DATA pGlobalData;
pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Mon Aug 3 15:46:37
2009
@@ -1,154 +1,144 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
- <module name="kernel32_base" type="objectlibrary"
crt="dll">
- <include base="kernel32_base">.</include>
- <include base="kernel32_base">include</include>
- <include base="ReactOS">include/reactos/subsys</include>
- <define name="_KERNEL32_" />
- <redefine name="_WIN32_WINNT">0x0600</redefine>
- <define name="__NO_CTYPE_INLINES" />
- <define name="NTDDI_VERSION">0x05020100</define>
- <dependency>errcodes</dependency>
- <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
- <pch>k32.h</pch>
- -->
- <group compilerset="gcc">
- <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
- <compilerflag>-fno-unit-at-a-time</compilerflag>
- <compilerflag compiler="cxx">-fno-exceptions</compilerflag>
- <compilerflag compiler="cxx">-fno-rtti</compilerflag>
- </group>
- <directory name="debug">
- <file>debugger.c</file>
- <file>output.c</file>
- </directory>
- <directory name="except">
- <file>except.c</file>
- </directory>
- <directory name="file">
- <file>backup.c</file>
- <file>bintype.c</file>
- <file>cnotify.c</file>
- <file>copy.c</file>
- <file>create.c</file>
- <file>curdir.c</file>
- <file>delete.c</file>
- <file>deviceio.c</file>
- <file>dir.c</file>
- <file>dosdev.c</file>
- <file>file.c</file>
- <file>find.c</file>
- <file>hardlink.c</file>
- <file>iocompl.c</file>
- <file>lfile.c</file>
- <file>lock.c</file>
- <file>mailslot.c</file>
- <file>move.c</file>
- <file>npipe.c</file>
- <file>pipe.c</file>
- <file>rw.c</file>
- <file>tape.c</file>
- <file>volume.c</file>
- </directory>
- <directory name="mem">
- <file>global.c</file>
- <file>heap.c</file>
- <file>isbad.c</file>
- <file>local.c</file>
- <file>procmem.c</file>
- <file>resnotify.c</file>
- <file>section.c</file>
- <file>virtual.c</file>
- </directory>
- <directory name="misc">
- <file>actctx.c</file>
- <file>atom.c</file>
- <file>chartype.c</file>
- <file>collation.c</file>
- <file>casemap.c</file>
- <file>comm.c</file>
- <file>commdcb.c</file>
- <file>computername.c</file>
- <file>console.c</file>
- <file>dllmain.c</file>
- <file>env.c</file>
- <file>error.c</file>
- <file>errormsg.c</file>
- <file>fold.c</file>
- <file>handle.c</file>
- <file>lang.c</file>
- <file>ldr.c</file>
- <file>lzexpand.c</file>
- <file>muldiv.c</file>
- <file>nls.c</file>
- <file>perfcnt.c</file>
- <file>power.c</file>
- <file>recovery.c</file>
- <file>res.c</file>
- <file>sortkey.c</file>
- <file>stubs.c</file>
- <file>sysinfo.c</file>
- <file>time.c</file>
- <file>timerqueue.c</file>
- <file>toolhelp.c</file>
- <file>version.c</file>
- </directory>
- <directory name="process">
- <file>cmdline.c</file>
- <file>procsup.c</file>
- <file>job.c</file>
- <file>proc.c</file>
- <file>session.c</file>
- </directory>
- <directory name="string">
- <file>lstring.c</file>
- </directory>
- <directory name="synch">
- <file>condvar.c</file>
- <file>critical.c</file>
- <file>event.c</file>
- <file>mutex.c</file>
- <file>sem.c</file>
- <file>timer.c</file>
- <file>wait.c</file>
- </directory>
- <directory name="thread">
- <file>fiber.c</file>
- <file>fls.c</file>
- <file>thread.c</file>
- <file>tls.c</file>
- </directory>
- <directory name="misc">
- <file>lcformat.c</file>
- <file>profile.c</file>
- <file>utils.c</file>
- </directory>
- <directory name="thread">
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>fiber.S</file>
- <file>thread.S</file>
- </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>
+<module name="kernel32" type="win32dll" crt="dll"
baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32"
installname="kernel32.dll">
+ <importlibrary definition="kernel32.pspec" />
+ <include base="kernel32">.</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" />
+ <define name="NTDDI_VERSION">0x05020100</define>
+ <dependency>errcodes</dependency>
+ <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
+ <pch>k32.h</pch>
+ -->
+ <group compilerset="gcc">
+ <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
+ <compilerflag>-fno-unit-at-a-time</compilerflag>
+ <compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+ <compilerflag compiler="cxx">-fno-rtti</compilerflag>
+ </group>
+ <directory name="debug">
+ <file>debugger.c</file>
+ <file>output.c</file>
+ </directory>
+ <directory name="except">
+ <file>except.c</file>
+ </directory>
+ <directory name="file">
+ <file>backup.c</file>
+ <file>bintype.c</file>
+ <file>cnotify.c</file>
+ <file>copy.c</file>
+ <file>create.c</file>
+ <file>curdir.c</file>
+ <file>delete.c</file>
+ <file>deviceio.c</file>
+ <file>dir.c</file>
+ <file>dosdev.c</file>
+ <file>file.c</file>
+ <file>find.c</file>
+ <file>hardlink.c</file>
+ <file>iocompl.c</file>
+ <file>lfile.c</file>
+ <file>lock.c</file>
+ <file>mailslot.c</file>
+ <file>move.c</file>
+ <file>npipe.c</file>
+ <file>pipe.c</file>
+ <file>rw.c</file>
+ <file>tape.c</file>
+ <file>volume.c</file>
+ </directory>
+ <directory name="mem">
+ <file>global.c</file>
+ <file>heap.c</file>
+ <file>isbad.c</file>
+ <file>local.c</file>
+ <file>procmem.c</file>
+ <file>resnotify.c</file>
+ <file>section.c</file>
+ <file>virtual.c</file>
+ </directory>
+ <directory name="misc">
+ <file>actctx.c</file>
+ <file>atom.c</file>
+ <file>chartype.c</file>
+ <file>collation.c</file>
+ <file>casemap.c</file>
+ <file>comm.c</file>
+ <file>commdcb.c</file>
+ <file>computername.c</file>
+ <file>console.c</file>
+ <file>dllmain.c</file>
+ <file>env.c</file>
+ <file>error.c</file>
+ <file>errormsg.c</file>
+ <file>fold.c</file>
+ <file>handle.c</file>
+ <file>lang.c</file>
+ <file>ldr.c</file>
+ <file>lzexpand.c</file>
+ <file>muldiv.c</file>
+ <file>nls.c</file>
+ <file>perfcnt.c</file>
+ <file>power.c</file>
+ <file>recovery.c</file>
+ <file>res.c</file>
+ <file>sortkey.c</file>
+ <file>stubs.c</file>
+ <file>sysinfo.c</file>
+ <file>time.c</file>
+ <file>timerqueue.c</file>
+ <file>toolhelp.c</file>
+ <file>version.c</file>
+ </directory>
+ <directory name="process">
+ <file>cmdline.c</file>
+ <file>procsup.c</file>
+ <file>job.c</file>
+ <file>proc.c</file>
+ <file>session.c</file>
+ </directory>
+ <directory name="string">
+ <file>lstring.c</file>
+ </directory>
+ <directory name="synch">
+ <file>condvar.c</file>
+ <file>critical.c</file>
+ <file>event.c</file>
+ <file>mutex.c</file>
+ <file>sem.c</file>
+ <file>timer.c</file>
+ <file>wait.c</file>
+ </directory>
+ <directory name="thread">
+ <file>fiber.c</file>
+ <file>fls.c</file>
+ <file>thread.c</file>
+ <file>tls.c</file>
+ </directory>
+ <directory name="misc">
+ <file>lcformat.c</file>
+ <file>profile.c</file>
+ <file>utils.c</file>
+ </directory>
+ <directory name="thread">
+ <if property="ARCH" value="i386">
+ <directory name="i386">
+ <file>fiber.S</file>
+ <file>thread.S</file>
+ </directory>
+ </if>
+ </directory>
+ <directory name="misc">
+ <file>icustubs.cpp</file>
+ </directory>
+ <file>kernel32.rc</file>
+</module>
Modified: trunk/reactos/include/ddk/strmini.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/strmini.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/strmini.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/strmini.h [iso-8859-1] Mon Aug 3 15:46:37 2009
@@ -2,6 +2,7 @@
#define _STREAM_H
#include <ntddk.h>
+#include <windef.h>
#include <ks.h>
#define STREAMAPI __stdcall
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1]
(original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Mon Aug
3 15:46:37 2009
@@ -21,7 +21,8 @@
/*
Standard MME driver entry-point for messages relating to auxiliary devices.
*/
-APIENTRY DWORD
+DWORD
+APIENTRY
auxMessage(
DWORD DeviceId,
DWORD Message,
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Mon Aug 3
15:46:37 2009
@@ -21,7 +21,8 @@
/*
Standard MME driver entry-point for messages relating to MIDI input.
*/
-APIENTRY DWORD
+DWORD
+APIENTRY
midMessage(
DWORD DeviceId,
DWORD Message,
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Mon Aug 3
15:46:37 2009
@@ -21,7 +21,8 @@
/*
Standard MME driver entry-point for messages relating to MIDI output.
*/
-APIENTRY DWORD
+DWORD
+APIENTRY
modMessage(
DWORD DeviceId,
DWORD Message,
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Mon Aug 3
15:46:37 2009
@@ -21,7 +21,8 @@
/*
Standard MME driver entry-point for messages relating to mixers.
*/
-APIENTRY DWORD
+DWORD
+APIENTRY
mxdMessage(
DWORD DeviceId,
DWORD Message,
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Mon Aug 3
15:46:37 2009
@@ -224,10 +224,10 @@
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;
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Mon Aug 3
15:46:37 2009
@@ -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,
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Mon Aug 3
15:46:37 2009
@@ -31,7 +31,8 @@
Standard MME driver entry-point for messages relating to wave audio
output.
*/
-APIENTRY DWORD
+DWORD
+APIENTRY
wodMessage(
DWORD DeviceId,
DWORD Message,