mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 00:43:21 +00:00
- 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
This commit is contained in:
parent
5e1ea71af7
commit
7aa73a6110
|
@ -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)
|
void Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, int color, int thickness)
|
||||||
{
|
{
|
||||||
|
HPEN oldPen;
|
||||||
POINT fourPoints[4];
|
POINT fourPoints[4];
|
||||||
fourPoints[0] = p1;
|
fourPoints[0] = p1;
|
||||||
fourPoints[1] = p2;
|
fourPoints[1] = p2;
|
||||||
fourPoints[2] = p3;
|
fourPoints[2] = p3;
|
||||||
fourPoints[3] = p4;
|
fourPoints[3] = p4;
|
||||||
HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
|
oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
|
||||||
PolyBezier(hdc, fourPoints, 4);
|
PolyBezier(hdc, fourPoints, 4);
|
||||||
DeleteObject(SelectObject(hdc, oldPen));
|
DeleteObject(SelectObject(hdc, oldPen));
|
||||||
}
|
}
|
||||||
|
|
|
@ -313,8 +313,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
|
||||||
if (hwnd==hwndMiniature)
|
if (hwnd==hwndMiniature)
|
||||||
{
|
{
|
||||||
long mclient[4];
|
long mclient[4];
|
||||||
|
HDC hdc;
|
||||||
GetClientRect(hwndMiniature, (LPRECT)&mclient);
|
GetClientRect(hwndMiniature, (LPRECT)&mclient);
|
||||||
HDC hdc = GetDC(hwndMiniature);
|
hdc = GetDC(hwndMiniature);
|
||||||
BitBlt(hdc, -min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]),
|
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);
|
-min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000, imgYRes-mclient[3]), imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY);
|
||||||
ReleaseDC(hwndMiniature, hdc);
|
ReleaseDC(hwndMiniature, hdc);
|
||||||
|
|
|
@ -364,8 +364,9 @@ LangSelDlgProc(HWND hwndDlg,
|
||||||
|
|
||||||
if (tindex != CB_ERR)
|
if (tindex != CB_ERR)
|
||||||
{
|
{
|
||||||
|
WORD LangID;
|
||||||
SetupData.SelectedLangId = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0);
|
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));
|
SetThreadLocale(MAKELCID(LangID, SORT_DEFAULT));
|
||||||
// FIXME: need to reload all resource to force
|
// FIXME: need to reload all resource to force
|
||||||
// the new language setting
|
// the new language setting
|
||||||
|
|
|
@ -292,9 +292,9 @@ VolumeDlgProc(HWND hwndDlg,
|
||||||
LPARAM lParam)
|
LPARAM lParam)
|
||||||
{
|
{
|
||||||
static IMGINFO ImgInfo;
|
static IMGINFO ImgInfo;
|
||||||
|
PGLOBAL_DATA pGlobalData;
|
||||||
UNREFERENCED_PARAMETER(lParam);
|
UNREFERENCED_PARAMETER(lParam);
|
||||||
UNREFERENCED_PARAMETER(wParam);
|
UNREFERENCED_PARAMETER(wParam);
|
||||||
PGLOBAL_DATA pGlobalData;
|
|
||||||
|
|
||||||
pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
|
pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
|
||||||
|
|
||||||
|
|
|
@ -1,154 +1,144 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
|
<!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="ReactOS">include/reactos/subsys</include>
|
<include base="kernel32">include</include>
|
||||||
<define name="_KERNEL32_" />
|
<include base="ReactOS">include/reactos/subsys</include>
|
||||||
<redefine name="_WIN32_WINNT">0x0600</redefine>
|
<library>wine</library>
|
||||||
<define name="__NO_CTYPE_INLINES" />
|
<library>pseh</library>
|
||||||
<define name="NTDDI_VERSION">0x05020100</define>
|
<library>normalize</library>
|
||||||
<dependency>errcodes</dependency>
|
<library>ntdll</library>
|
||||||
<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
|
<define name="_KERNEL32_" />
|
||||||
<pch>k32.h</pch>
|
<redefine name="_WIN32_WINNT">0x0600</redefine>
|
||||||
-->
|
<define name="__NO_CTYPE_INLINES" />
|
||||||
<group compilerset="gcc">
|
<define name="NTDDI_VERSION">0x05020100</define>
|
||||||
<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
|
<dependency>errcodes</dependency>
|
||||||
<compilerflag>-fno-unit-at-a-time</compilerflag>
|
<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
|
||||||
<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
|
<pch>k32.h</pch>
|
||||||
<compilerflag compiler="cxx">-fno-rtti</compilerflag>
|
-->
|
||||||
</group>
|
<group compilerset="gcc">
|
||||||
<directory name="debug">
|
<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
|
||||||
<file>debugger.c</file>
|
<compilerflag>-fno-unit-at-a-time</compilerflag>
|
||||||
<file>output.c</file>
|
<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
|
||||||
</directory>
|
<compilerflag compiler="cxx">-fno-rtti</compilerflag>
|
||||||
<directory name="except">
|
</group>
|
||||||
<file>except.c</file>
|
<directory name="debug">
|
||||||
</directory>
|
<file>debugger.c</file>
|
||||||
<directory name="file">
|
<file>output.c</file>
|
||||||
<file>backup.c</file>
|
</directory>
|
||||||
<file>bintype.c</file>
|
<directory name="except">
|
||||||
<file>cnotify.c</file>
|
<file>except.c</file>
|
||||||
<file>copy.c</file>
|
</directory>
|
||||||
<file>create.c</file>
|
<directory name="file">
|
||||||
<file>curdir.c</file>
|
<file>backup.c</file>
|
||||||
<file>delete.c</file>
|
<file>bintype.c</file>
|
||||||
<file>deviceio.c</file>
|
<file>cnotify.c</file>
|
||||||
<file>dir.c</file>
|
<file>copy.c</file>
|
||||||
<file>dosdev.c</file>
|
<file>create.c</file>
|
||||||
<file>file.c</file>
|
<file>curdir.c</file>
|
||||||
<file>find.c</file>
|
<file>delete.c</file>
|
||||||
<file>hardlink.c</file>
|
<file>deviceio.c</file>
|
||||||
<file>iocompl.c</file>
|
<file>dir.c</file>
|
||||||
<file>lfile.c</file>
|
<file>dosdev.c</file>
|
||||||
<file>lock.c</file>
|
<file>file.c</file>
|
||||||
<file>mailslot.c</file>
|
<file>find.c</file>
|
||||||
<file>move.c</file>
|
<file>hardlink.c</file>
|
||||||
<file>npipe.c</file>
|
<file>iocompl.c</file>
|
||||||
<file>pipe.c</file>
|
<file>lfile.c</file>
|
||||||
<file>rw.c</file>
|
<file>lock.c</file>
|
||||||
<file>tape.c</file>
|
<file>mailslot.c</file>
|
||||||
<file>volume.c</file>
|
<file>move.c</file>
|
||||||
</directory>
|
<file>npipe.c</file>
|
||||||
<directory name="mem">
|
<file>pipe.c</file>
|
||||||
<file>global.c</file>
|
<file>rw.c</file>
|
||||||
<file>heap.c</file>
|
<file>tape.c</file>
|
||||||
<file>isbad.c</file>
|
<file>volume.c</file>
|
||||||
<file>local.c</file>
|
</directory>
|
||||||
<file>procmem.c</file>
|
<directory name="mem">
|
||||||
<file>resnotify.c</file>
|
<file>global.c</file>
|
||||||
<file>section.c</file>
|
<file>heap.c</file>
|
||||||
<file>virtual.c</file>
|
<file>isbad.c</file>
|
||||||
</directory>
|
<file>local.c</file>
|
||||||
<directory name="misc">
|
<file>procmem.c</file>
|
||||||
<file>actctx.c</file>
|
<file>resnotify.c</file>
|
||||||
<file>atom.c</file>
|
<file>section.c</file>
|
||||||
<file>chartype.c</file>
|
<file>virtual.c</file>
|
||||||
<file>collation.c</file>
|
</directory>
|
||||||
<file>casemap.c</file>
|
<directory name="misc">
|
||||||
<file>comm.c</file>
|
<file>actctx.c</file>
|
||||||
<file>commdcb.c</file>
|
<file>atom.c</file>
|
||||||
<file>computername.c</file>
|
<file>chartype.c</file>
|
||||||
<file>console.c</file>
|
<file>collation.c</file>
|
||||||
<file>dllmain.c</file>
|
<file>casemap.c</file>
|
||||||
<file>env.c</file>
|
<file>comm.c</file>
|
||||||
<file>error.c</file>
|
<file>commdcb.c</file>
|
||||||
<file>errormsg.c</file>
|
<file>computername.c</file>
|
||||||
<file>fold.c</file>
|
<file>console.c</file>
|
||||||
<file>handle.c</file>
|
<file>dllmain.c</file>
|
||||||
<file>lang.c</file>
|
<file>env.c</file>
|
||||||
<file>ldr.c</file>
|
<file>error.c</file>
|
||||||
<file>lzexpand.c</file>
|
<file>errormsg.c</file>
|
||||||
<file>muldiv.c</file>
|
<file>fold.c</file>
|
||||||
<file>nls.c</file>
|
<file>handle.c</file>
|
||||||
<file>perfcnt.c</file>
|
<file>lang.c</file>
|
||||||
<file>power.c</file>
|
<file>ldr.c</file>
|
||||||
<file>recovery.c</file>
|
<file>lzexpand.c</file>
|
||||||
<file>res.c</file>
|
<file>muldiv.c</file>
|
||||||
<file>sortkey.c</file>
|
<file>nls.c</file>
|
||||||
<file>stubs.c</file>
|
<file>perfcnt.c</file>
|
||||||
<file>sysinfo.c</file>
|
<file>power.c</file>
|
||||||
<file>time.c</file>
|
<file>recovery.c</file>
|
||||||
<file>timerqueue.c</file>
|
<file>res.c</file>
|
||||||
<file>toolhelp.c</file>
|
<file>sortkey.c</file>
|
||||||
<file>version.c</file>
|
<file>stubs.c</file>
|
||||||
</directory>
|
<file>sysinfo.c</file>
|
||||||
<directory name="process">
|
<file>time.c</file>
|
||||||
<file>cmdline.c</file>
|
<file>timerqueue.c</file>
|
||||||
<file>procsup.c</file>
|
<file>toolhelp.c</file>
|
||||||
<file>job.c</file>
|
<file>version.c</file>
|
||||||
<file>proc.c</file>
|
</directory>
|
||||||
<file>session.c</file>
|
<directory name="process">
|
||||||
</directory>
|
<file>cmdline.c</file>
|
||||||
<directory name="string">
|
<file>procsup.c</file>
|
||||||
<file>lstring.c</file>
|
<file>job.c</file>
|
||||||
</directory>
|
<file>proc.c</file>
|
||||||
<directory name="synch">
|
<file>session.c</file>
|
||||||
<file>condvar.c</file>
|
</directory>
|
||||||
<file>critical.c</file>
|
<directory name="string">
|
||||||
<file>event.c</file>
|
<file>lstring.c</file>
|
||||||
<file>mutex.c</file>
|
</directory>
|
||||||
<file>sem.c</file>
|
<directory name="synch">
|
||||||
<file>timer.c</file>
|
<file>condvar.c</file>
|
||||||
<file>wait.c</file>
|
<file>critical.c</file>
|
||||||
</directory>
|
<file>event.c</file>
|
||||||
<directory name="thread">
|
<file>mutex.c</file>
|
||||||
<file>fiber.c</file>
|
<file>sem.c</file>
|
||||||
<file>fls.c</file>
|
<file>timer.c</file>
|
||||||
<file>thread.c</file>
|
<file>wait.c</file>
|
||||||
<file>tls.c</file>
|
</directory>
|
||||||
</directory>
|
<directory name="thread">
|
||||||
<directory name="misc">
|
<file>fiber.c</file>
|
||||||
<file>lcformat.c</file>
|
<file>fls.c</file>
|
||||||
<file>profile.c</file>
|
<file>thread.c</file>
|
||||||
<file>utils.c</file>
|
<file>tls.c</file>
|
||||||
</directory>
|
</directory>
|
||||||
<directory name="thread">
|
<directory name="misc">
|
||||||
<if property="ARCH" value="i386">
|
<file>lcformat.c</file>
|
||||||
<directory name="i386">
|
<file>profile.c</file>
|
||||||
<file>fiber.S</file>
|
<file>utils.c</file>
|
||||||
<file>thread.S</file>
|
</directory>
|
||||||
</directory>
|
<directory name="thread">
|
||||||
</if>
|
<if property="ARCH" value="i386">
|
||||||
</directory>
|
<directory name="i386">
|
||||||
|
<file>fiber.S</file>
|
||||||
<directory name="misc">
|
<file>thread.S</file>
|
||||||
<file>icustubs.cpp</file>
|
</directory>
|
||||||
</directory>
|
</if>
|
||||||
<library>normalize</library>
|
</directory>
|
||||||
</module>
|
<directory name="misc">
|
||||||
<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll">
|
<file>icustubs.cpp</file>
|
||||||
<importlibrary definition="kernel32.pspec" />
|
</directory>
|
||||||
<include base="kernel32">.</include>
|
<file>kernel32.rc</file>
|
||||||
<include base="kernel32" root="intermediate">.</include>
|
</module>
|
||||||
<include base="kernel32">include</include>
|
|
||||||
<library>kernel32_base</library>
|
|
||||||
<library>wine</library>
|
|
||||||
<library>pseh</library>
|
|
||||||
|
|
||||||
<file>kernel32.rc</file>
|
|
||||||
|
|
||||||
<library>ntdll</library>
|
|
||||||
</module>
|
|
||||||
</group>
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#define _STREAM_H
|
#define _STREAM_H
|
||||||
|
|
||||||
#include <ntddk.h>
|
#include <ntddk.h>
|
||||||
|
#include <windef.h>
|
||||||
#include <ks.h>
|
#include <ks.h>
|
||||||
|
|
||||||
#define STREAMAPI __stdcall
|
#define STREAMAPI __stdcall
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
/*
|
/*
|
||||||
Standard MME driver entry-point for messages relating to auxiliary devices.
|
Standard MME driver entry-point for messages relating to auxiliary devices.
|
||||||
*/
|
*/
|
||||||
APIENTRY DWORD
|
DWORD
|
||||||
|
APIENTRY
|
||||||
auxMessage(
|
auxMessage(
|
||||||
DWORD DeviceId,
|
DWORD DeviceId,
|
||||||
DWORD Message,
|
DWORD Message,
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
/*
|
/*
|
||||||
Standard MME driver entry-point for messages relating to MIDI input.
|
Standard MME driver entry-point for messages relating to MIDI input.
|
||||||
*/
|
*/
|
||||||
APIENTRY DWORD
|
DWORD
|
||||||
|
APIENTRY
|
||||||
midMessage(
|
midMessage(
|
||||||
DWORD DeviceId,
|
DWORD DeviceId,
|
||||||
DWORD Message,
|
DWORD Message,
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
/*
|
/*
|
||||||
Standard MME driver entry-point for messages relating to MIDI output.
|
Standard MME driver entry-point for messages relating to MIDI output.
|
||||||
*/
|
*/
|
||||||
APIENTRY DWORD
|
DWORD
|
||||||
|
APIENTRY
|
||||||
modMessage(
|
modMessage(
|
||||||
DWORD DeviceId,
|
DWORD DeviceId,
|
||||||
DWORD Message,
|
DWORD Message,
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
/*
|
/*
|
||||||
Standard MME driver entry-point for messages relating to mixers.
|
Standard MME driver entry-point for messages relating to mixers.
|
||||||
*/
|
*/
|
||||||
APIENTRY DWORD
|
DWORD
|
||||||
|
APIENTRY
|
||||||
mxdMessage(
|
mxdMessage(
|
||||||
DWORD DeviceId,
|
DWORD DeviceId,
|
||||||
DWORD Message,
|
DWORD Message,
|
||||||
|
|
|
@ -224,11 +224,11 @@ EnqueueWaveHeader(
|
||||||
PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
|
PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
|
||||||
IN PVOID Parameter)
|
IN PVOID Parameter)
|
||||||
{
|
{
|
||||||
|
PWAVEHDR WaveHeader = (PWAVEHDR) Parameter;
|
||||||
|
|
||||||
VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance );
|
VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance );
|
||||||
VALIDATE_MMSYS_PARAMETER( Parameter );
|
VALIDATE_MMSYS_PARAMETER( Parameter );
|
||||||
|
|
||||||
PWAVEHDR WaveHeader = (PWAVEHDR) Parameter;
|
|
||||||
|
|
||||||
/* Initialise */
|
/* Initialise */
|
||||||
WaveHeader->lpNext = NULL;
|
WaveHeader->lpNext = NULL;
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,8 @@
|
||||||
Standard MME driver entry-point for messages relating to wave audio
|
Standard MME driver entry-point for messages relating to wave audio
|
||||||
input.
|
input.
|
||||||
*/
|
*/
|
||||||
APIENTRY DWORD
|
DWORD
|
||||||
|
APIENTRY
|
||||||
widMessage(
|
widMessage(
|
||||||
DWORD DeviceId,
|
DWORD DeviceId,
|
||||||
DWORD Message,
|
DWORD Message,
|
||||||
|
|
|
@ -31,7 +31,8 @@ MMRESULT HelloWorld(PSOUND_DEVICE_INSTANCE Instance, PVOID String)
|
||||||
Standard MME driver entry-point for messages relating to wave audio
|
Standard MME driver entry-point for messages relating to wave audio
|
||||||
output.
|
output.
|
||||||
*/
|
*/
|
||||||
APIENTRY DWORD
|
DWORD
|
||||||
|
APIENTRY
|
||||||
wodMessage(
|
wodMessage(
|
||||||
DWORD DeviceId,
|
DWORD DeviceId,
|
||||||
DWORD Message,
|
DWORD Message,
|
||||||
|
|
Loading…
Reference in a new issue