diff --git a/reactos/baseaddress.xml b/reactos/baseaddress.xml index b24e3c3a917..c2a2e215cd7 100644 --- a/reactos/baseaddress.xml +++ b/reactos/baseaddress.xml @@ -49,6 +49,7 @@ + diff --git a/reactos/lib/directory.xml b/reactos/lib/directory.xml index b19a3697d0c..afbfebf5421 100644 --- a/reactos/lib/directory.xml +++ b/reactos/lib/directory.xml @@ -136,9 +136,6 @@ - - - @@ -275,7 +272,7 @@ - + diff --git a/reactos/lib/midimap/Makefile.in b/reactos/lib/midimap/Makefile.in deleted file mode 100644 index 35bfeac72c8..00000000000 --- a/reactos/lib/midimap/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = midimap.drv -IMPORTS = winmm user32 advapi32 kernel32 - -C_SRCS = \ - midimap.c - -@MAKE_DLL_RULES@ - -### Dependencies: diff --git a/reactos/lib/midimap/midimap.c b/reactos/lib/midimap/midimap.c deleted file mode 100644 index 42d6094f0cf..00000000000 --- a/reactos/lib/midimap/midimap.c +++ /dev/null @@ -1,556 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * Wine MIDI mapper driver - * - * Copyright 1999, 2000, 2001 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * TODO: - * notification has to be implemented - * IDF file loading - */ - -#include -#include -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "winreg.h" -#include "wine/debug.h" - -/* - * Here's how Windows stores the midiOut mapping information. - * - * Full form (in HKU) is: - * - * [Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap] 988836060 - * "AutoScheme"=dword:00000000 - * "ConfigureCount"=dword:00000004 - * "CurrentInstrument"="Wine OSS midi" - * "CurrentScheme"="epp" - * "DriverList"="" - * "UseScheme"=dword:00000000 - * - * AutoScheme: ? - * CurrentInstrument: name of midiOut device to use when UseScheme is 0. Wine uses an extension - * of the form #n to link to n'th midiOut device of the system - * CurrentScheme: when UseScheme is non null, it's the scheme to use (see below) - * DriverList: ? - * UseScheme: trigger for simple/complex mapping - * - * A scheme is defined (in HKLM) as: - * - * [System\\CurrentControlSet\\Control\\MediaProperties\\PrivateProperties\\Midi\\Schemes\\] - * : one key for each defined scheme (system wide) - * under each one of these keys, there's: - * [...\\\\] - * "Channels"="" - * (the default value of this key also refers to the name of the device). - * - * this defines, for each midiOut device (identified by its index in ), which - * channels have to be mapped onto it. The defines the channels (from 0 to 15) - * will be mapped (mapping occurs for channel if bit is set in - * - * Further mapping information can also be defined in: - * [System\\CurrentControlSet\\Control\\MediaProperties\\PrivateProperties\\Midi\\Ports\\\\Instruments\\] - * "Definition"="<.idf file>" - * "FriendlyName"="#for .idx file#" - * "Port"="" - * - * This last part isn't implemented (.idf file support). - */ - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); - -typedef struct tagMIDIOUTPORT -{ - char name[MAXPNAMELEN]; - int loaded; - HMIDIOUT hMidi; - unsigned short uDevID; - LPBYTE lpbPatch; - unsigned int aChn[16]; -} MIDIOUTPORT; - -typedef struct tagMIDIMAPDATA -{ - struct tagMIDIMAPDATA* self; - MIDIOUTPORT* ChannelMap[16]; -} MIDIMAPDATA; - -static MIDIOUTPORT* midiOutPorts; -static unsigned numMidiOutPorts; - -static BOOL MIDIMAP_IsBadData(MIDIMAPDATA* mm) -{ - if (!IsBadReadPtr(mm, sizeof(MIDIMAPDATA)) && mm->self == mm) - return FALSE; - TRACE("Bad midimap data (%p)\n", mm); - return TRUE; -} - -static BOOL MIDIMAP_FindPort(const char* name, unsigned* dev) -{ - for (*dev = 0; *dev < numMidiOutPorts; (*dev)++) - { - TRACE("%s\n", midiOutPorts[*dev].name); - if (strcmp(midiOutPorts[*dev].name, name) == 0) - return TRUE; - } - /* try the form #nnn */ - if (*name == '#' && isdigit(name[1])) - { - *dev = atoi(name + 1); - if (*dev < numMidiOutPorts) - return TRUE; - } - return FALSE; -} - -static BOOL MIDIMAP_LoadSettingsDefault(MIDIMAPDATA* mom, const char* port) -{ - unsigned i, dev = 0; - - if (port != NULL && !MIDIMAP_FindPort(port, &dev)) - { - ERR("Registry glitch: couldn't find midi out (%s)\n", port); - dev = 0; - } - - /* this is necessary when no midi out ports are present */ - if (dev >= numMidiOutPorts) - return FALSE; - /* sets default */ - for (i = 0; i < 16; i++) mom->ChannelMap[i] = &midiOutPorts[dev]; - - return TRUE; -} - -static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const char* scheme) -{ - HKEY hSchemesKey, hKey, hPortKey; - unsigned i, idx, dev; - char buffer[256], port[256]; - DWORD type, size, mask; - - for (i = 0; i < 16; i++) mom->ChannelMap[i] = NULL; - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Control\\MediaProperties\\PrivateProperties\\Midi\\Schemes", - &hSchemesKey)) - { - return FALSE; - } - if (RegOpenKeyA(hSchemesKey, scheme, &hKey)) - { - RegCloseKey(hSchemesKey); - return FALSE; - } - - for (idx = 0; !RegEnumKeyA(hKey, idx, buffer, sizeof(buffer)); idx++) - { - if (RegOpenKeyA(hKey, buffer, &hPortKey)) continue; - - size = sizeof(port); - if (RegQueryValueExA(hPortKey, NULL, 0, &type, port, &size)) continue; - - if (!MIDIMAP_FindPort(port, &dev)) continue; - - size = sizeof(mask); - if (RegQueryValueExA(hPortKey, "Channels", 0, &type, (void*)&mask, &size)) - continue; - - for (i = 0; i < 16; i++) - { - if (mask & (1 << i)) - { - if (mom->ChannelMap[i]) - ERR("Quirks in registry, channel %u is mapped twice\n", i); - mom->ChannelMap[i] = &midiOutPorts[dev]; - } - } - } - - RegCloseKey(hSchemesKey); - RegCloseKey(hKey); - - return TRUE; -} - -static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) -{ - HKEY hKey; - BOOL ret; - - if (RegOpenKeyA(HKEY_CURRENT_USER, - "Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap", &hKey)) - { - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); - } - else - { - DWORD type, size, out; - char buffer[256]; - - ret = 2; - size = sizeof(out); - if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) - { - size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "CurrentScheme", 0, &type, buffer, &size)) - { - if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); - } - else - { - ERR("Wrong registry: UseScheme is active, but no CurrentScheme found\n"); - } - } - if (ret == 2) - { - size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "CurrentInstrument", 0, &type, buffer, &size) && *buffer) - { - ret = MIDIMAP_LoadSettingsDefault(mom, buffer); - } - else - { - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); - } - } - } - RegCloseKey(hKey); - - if (ret && TRACE_ON(msacm)) - { - unsigned i; - - for (i = 0; i < 16; i++) - { - TRACE("chnMap[%2d] => %d\n", - i, mom->ChannelMap[i] ? mom->ChannelMap[i]->uDevID : -1); - } - } - return ret; -} - -static DWORD modOpen(LPDWORD lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); - - TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags); - - if (!mom) return MMSYSERR_NOMEM; - - if (MIDIMAP_LoadSettings(mom)) - { - *lpdwUser = (DWORD)mom; - mom->self = mom; - - return MMSYSERR_NOERROR; - } - HeapFree(GetProcessHeap(), 0, mom); - return MIDIERR_INVALIDSETUP; -} - -static DWORD modClose(MIDIMAPDATA* mom) -{ - UINT i; - DWORD ret = MMSYSERR_NOERROR; - - if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; - - for (i = 0; i < 16; i++) - { - DWORD t; - if (mom->ChannelMap[i] && mom->ChannelMap[i]->loaded > 0) - { - t = midiOutClose(mom->ChannelMap[i]->hMidi); - if (t == MMSYSERR_NOERROR) - { - mom->ChannelMap[i]->loaded = 0; - mom->ChannelMap[i]->hMidi = 0; - } - else if (ret == MMSYSERR_NOERROR) - ret = t; - } - } - if (ret == MMSYSERR_NOERROR) - HeapFree(GetProcessHeap(), 0, mom); - return ret; -} - -static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) -{ - WORD chn; - DWORD ret = MMSYSERR_NOERROR; - MIDIHDR mh; - - if (MIDIMAP_IsBadData(mom)) - return MMSYSERR_ERROR; - - mh = *lpMidiHdr; - for (chn = 0; chn < 16; chn++) - { - if (mom->ChannelMap[chn] && mom->ChannelMap[chn]->loaded > 0) - { - mh.dwFlags = 0; - midiOutPrepareHeader(mom->ChannelMap[chn]->hMidi, &mh, sizeof(mh)); - ret = midiOutLongMsg(mom->ChannelMap[chn]->hMidi, &mh, sizeof(mh)); - midiOutUnprepareHeader(mom->ChannelMap[chn]->hMidi, &mh, sizeof(mh)); - if (ret != MMSYSERR_NOERROR) break; - } - } - return ret; -} - -static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) -{ - BYTE lb = LOBYTE(LOWORD(dwParam)); - WORD chn = lb & 0x0F; - DWORD ret = MMSYSERR_NOERROR; - - if (MIDIMAP_IsBadData(mom)) - return MMSYSERR_ERROR; - - if (!mom->ChannelMap[chn]) return MMSYSERR_NOERROR; - - switch (lb & 0xF0) - { - case 0x80: - case 0x90: - case 0xA0: - case 0xB0: - case 0xC0: - case 0xD0: - case 0xE0: - if (mom->ChannelMap[chn]->loaded == 0) - { - if (midiOutOpen(&mom->ChannelMap[chn]->hMidi, mom->ChannelMap[chn]->uDevID, - 0L, 0L, CALLBACK_NULL) == MMSYSERR_NOERROR) - mom->ChannelMap[chn]->loaded = 1; - else - mom->ChannelMap[chn]->loaded = -1; - /* FIXME: should load here the IDF midi data... and allow channel and - * patch mappings - */ - } - if (mom->ChannelMap[chn]->loaded > 0) - { - /* change channel */ - dwParam &= ~0x0F; - dwParam |= mom->ChannelMap[chn]->aChn[chn]; - - if ((LOBYTE(LOWORD(dwParam)) & 0xF0) == 0xC0 /* program change */ && - mom->ChannelMap[chn]->lpbPatch) - { - BYTE patch = HIBYTE(LOWORD(dwParam)); - - /* change patch */ - dwParam &= ~0x0000FF00; - dwParam |= mom->ChannelMap[chn]->lpbPatch[patch]; - } - ret = midiOutShortMsg(mom->ChannelMap[chn]->hMidi, dwParam); - } - break; - case 0xF0: - for (chn = 0; chn < 16; chn++) - { - if (mom->ChannelMap[chn]->loaded > 0) - ret = midiOutShortMsg(mom->ChannelMap[chn]->hMidi, dwParam); - } - break; - default: - FIXME("ooch %lu\n", dwParam); - } - - return ret; -} - -static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) -{ - if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; - if (lpMidiHdr->dwFlags & (MHDR_ISSTRM|MHDR_PREPARED)) - return MMSYSERR_INVALPARAM; - - lpMidiHdr->dwFlags |= MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - -static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) -{ - if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; - if ((lpMidiHdr->dwFlags & MHDR_ISSTRM) || !(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_INVALPARAM; - - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - -static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSA lpMidiCaps, DWORD size) -{ - lpMidiCaps->wMid = 0x00FF; - lpMidiCaps->wPid = 0x0001; - lpMidiCaps->vDriverVersion = 0x0100; - strcpy(lpMidiCaps->szPname, "Wine midi out mapper"); - lpMidiCaps->wTechnology = MOD_MAPPER; - lpMidiCaps->wVoices = 0; - lpMidiCaps->wNotes = 0; - lpMidiCaps->wChannelMask = 0xFFFF; - lpMidiCaps->dwSupport = 0L; - - return MMSYSERR_NOERROR; -} - -static DWORD modReset(MIDIMAPDATA* mom) -{ - WORD chn; - DWORD ret = MMSYSERR_NOERROR; - - if (MIDIMAP_IsBadData(mom)) - return MMSYSERR_ERROR; - - for (chn = 0; chn < 16; chn++) - { - if (mom->ChannelMap[chn] && mom->ChannelMap[chn]->loaded > 0) - { - ret = midiOutReset(mom->ChannelMap[chn]->hMidi); - if (ret != MMSYSERR_NOERROR) break; - } - } - return ret; -} - -/************************************************************************** - * modMessage (MIDIMAP.@) - */ -DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", - wDevID, wMsg, dwUser, dwParam1, dwParam2); - - switch (wMsg) - { - case DRVM_INIT: - case DRVM_EXIT: - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; - - case MODM_OPEN: return modOpen ((LPDWORD)dwUser, (LPMIDIOPENDESC)dwParam1,dwParam2); - case MODM_CLOSE: return modClose ((MIDIMAPDATA*)dwUser); - - case MODM_DATA: return modData ((MIDIMAPDATA*)dwUser, dwParam1); - case MODM_LONGDATA: return modLongData ((MIDIMAPDATA*)dwUser, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_PREPARE: return modPrepare ((MIDIMAPDATA*)dwUser, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: return modUnprepare ((MIDIMAPDATA*)dwUser, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_RESET: return modReset ((MIDIMAPDATA*)dwUser); - - case MODM_GETDEVCAPS: return modGetDevCaps (wDevID, (MIDIMAPDATA*)dwUser, (LPMIDIOUTCAPSA)dwParam1,dwParam2); - case MODM_GETNUMDEVS: return 1; - case MODM_GETVOLUME: return MMSYSERR_NOTSUPPORTED; - case MODM_SETVOLUME: return MMSYSERR_NOTSUPPORTED; - default: - FIXME("unknown message %d!\n", wMsg); - } - return MMSYSERR_NOTSUPPORTED; -} - -/*======================================================================* - * Driver part * - *======================================================================*/ - -/************************************************************************** - * MIDIMAP_drvOpen [internal] - */ -static DWORD MIDIMAP_drvOpen(LPSTR str) -{ - MIDIOUTCAPSA moc; - unsigned dev, i; - - if (midiOutPorts) - return 0; - - numMidiOutPorts = midiOutGetNumDevs(); - midiOutPorts = HeapAlloc(GetProcessHeap(), 0, - numMidiOutPorts * sizeof(MIDIOUTPORT)); - for (dev = 0; dev < numMidiOutPorts; dev++) - { - if (midiOutGetDevCapsA(dev, &moc, sizeof(moc)) == 0L) - { - strcpy(midiOutPorts[dev].name, moc.szPname); - midiOutPorts[dev].loaded = 0; - midiOutPorts[dev].hMidi = 0; - midiOutPorts[dev].uDevID = dev; - midiOutPorts[dev].lpbPatch = NULL; - for (i = 0; i < 16; i++) - midiOutPorts[dev].aChn[i] = i; - } - else - { - midiOutPorts[dev].loaded = -1; - } - } - - return 1; -} - -/************************************************************************** - * MIDIMAP_drvClose [internal] - */ -static DWORD MIDIMAP_drvClose(DWORD dwDevID) -{ - if (midiOutPorts) - { - HeapFree(GetProcessHeap(), 0, midiOutPorts); - midiOutPorts = NULL; - return 1; - } - return 0; -} - -/************************************************************************** - * DriverProc (MIDIMAP.@) - */ -LONG CALLBACK MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) -{ -/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ -/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ - - switch (wMsg) - { - case DRV_LOAD: return 1; - case DRV_FREE: return 1; - case DRV_OPEN: return MIDIMAP_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return MIDIMAP_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; - case DRV_CONFIGURE: MessageBoxA(0, "MIDIMAP MultiMedia Driver !", "OSS Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } -} diff --git a/reactos/lib/midimap/midimap.rc b/reactos/lib/midimap/midimap.rc deleted file mode 100644 index d566d7c95ca..00000000000 --- a/reactos/lib/midimap/midimap.rc +++ /dev/null @@ -1,7 +0,0 @@ -/* $Id$ */ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/WINE MIDI Mapper\0" -#define REACTOS_STR_INTERNAL_NAME "midimap\0" -#define REACTOS_STR_ORIGINAL_FILENAME "midimap.drv\0" -#include diff --git a/reactos/lib/midimap/midimap.spec b/reactos/lib/midimap/midimap.spec deleted file mode 100644 index e83446b9187..00000000000 --- a/reactos/lib/midimap/midimap.spec +++ /dev/null @@ -1,2 +0,0 @@ -@ stdcall DriverProc(long long long long long) MIDIMAP_DriverProc -@ stdcall modMessage(long long long long long) MIDIMAP_modMessage diff --git a/reactos/lib/midimap/winehq2ros.patch b/reactos/lib/midimap/winehq2ros.patch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/reactos/lib/winmm/Makefile.in b/reactos/lib/winmm/Makefile.in deleted file mode 100644 index 82e20a67d98..00000000000 --- a/reactos/lib/winmm/Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -EXTRADEFS = -D_WINMM_ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = winmm.dll -IMPORTLIB = libwinmm.$(IMPLIBEXT) -IMPORTS = user32 advapi32 kernel32 ntdll -EXTRALIBS = $(LIBUNICODE) - -C_SRCS = \ - driver.c \ - joystick.c \ - lolvldrv.c \ - mci.c \ - mmio.c \ - playsound.c \ - time.c \ - winmm.c - -C_SRCS16 = \ - message16.c \ - mmsystem.c \ - sound16.c - -SPEC_SRCS16 = \ - mmsystem.spec \ - sound.spec - -RC_SRCS = winmm_res.rc - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: diff --git a/reactos/lib/winmm/Makefile.ros-template b/reactos/lib/winmm/Makefile.ros-template deleted file mode 100644 index 68f3e03dfea..00000000000 --- a/reactos/lib/winmm/Makefile.ros-template +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = winmm - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_WINMM) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk diff --git a/reactos/lib/winmm/directory.xml b/reactos/lib/winmm/directory.xml new file mode 100644 index 00000000000..e03c2a74391 --- /dev/null +++ b/reactos/lib/winmm/directory.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/reactos/lib/winmm/midimap/Makefile.in b/reactos/lib/winmm/midimap/Makefile.in deleted file mode 100644 index 044c17a4c09..00000000000 --- a/reactos/lib/winmm/midimap/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = midimap.drv -IMPORTS = winmm user32 advapi32 kernel32 - -C_SRCS = \ - midimap.c - -@MAKE_DLL_RULES@ - -### Dependencies: diff --git a/reactos/lib/winmm/midimap/Makefile.ros-template b/reactos/lib/winmm/midimap/Makefile.ros-template deleted file mode 100644 index 261fd10301a..00000000000 --- a/reactos/lib/winmm/midimap/Makefile.ros-template +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = midimap - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_LIB_BASE_MIDIMAP) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -TARGET_EXTENSION = .dll - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk diff --git a/reactos/lib/winmm/midimap/makefile b/reactos/lib/winmm/midimap/makefile deleted file mode 100644 index 11941603f41..00000000000 --- a/reactos/lib/winmm/midimap/makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $Id: makefile 8620 2004-03-10 15:22:45Z silverblade $ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = winedll - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk diff --git a/reactos/lib/midimap/midimap.xml b/reactos/lib/winmm/midimap/midimap.xml similarity index 100% rename from reactos/lib/midimap/midimap.xml rename to reactos/lib/winmm/midimap/midimap.xml diff --git a/reactos/lib/winmm/wavemap/Makefile.in b/reactos/lib/winmm/wavemap/Makefile.in deleted file mode 100644 index 071f5f84d7a..00000000000 --- a/reactos/lib/winmm/wavemap/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = msacm.drv -IMPORTS = msacm32 winmm user32 kernel32 - -C_SRCS = \ - wavemap.c - -@MAKE_DLL_RULES@ - -### Dependencies: diff --git a/reactos/lib/winmm/wavemap/Makefile.ros-template b/reactos/lib/winmm/wavemap/Makefile.ros-template deleted file mode 100644 index 96c5a52f7fd..00000000000 --- a/reactos/lib/winmm/wavemap/Makefile.ros-template +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = msacm - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a - -TARGET_BASE = 0x76160000 - -TARGET_RC_SRCS = wavemap.rc -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -TARGET_EXTENSION = .drv - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk diff --git a/reactos/lib/winmm/wavemap/makefile b/reactos/lib/winmm/wavemap/makefile deleted file mode 100644 index 11941603f41..00000000000 --- a/reactos/lib/winmm/wavemap/makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $Id: makefile 8620 2004-03-10 15:22:45Z silverblade $ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = winedll - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk diff --git a/reactos/lib/winmm/wavemap/wavemap.xml b/reactos/lib/winmm/wavemap/wavemap.xml new file mode 100644 index 00000000000..968e858f8bd --- /dev/null +++ b/reactos/lib/winmm/wavemap/wavemap.xml @@ -0,0 +1,23 @@ + + + . + include/wine + + + + + 0x600 + 0x501 + 0x501 + wine + msacm32 + uuid + ntdll + kernel32 + advapi32 + user32 + winmm + wavemap.c + wavemap.rc + msacm.spec +