Commit in reactos/lib/winmm on MAIN
winmm_Cs.rc+128added 1.1
lolvldrv.c-31.6 -> 1.7
mci.c+2-11.4 -> 1.5
mmsystem.c+1-11.1 -> 1.2
winehq2ros.patch+15-281.6 -> 1.7
winmm.c+40-41.11 -> 1.12
winmm.spec+41.2 -> 1.3
winmm_res.rc+11.4 -> 1.5
+191-37
1 added + 7 modified, total 8 files
Sync to Wine-20040914:
David Kredba <kredba@ibot.cas.cz>
- Added Czech resources.
Robert Reif <reif@earthlink.net>
- Remove wine specific DRV_QUERYDSOUNDGUID message and calculate it in
  dsound.dll (like in 2k/xp).
Dmitry Timoshkov <dmitry@codeweavers.com>
- Fix an obvious typo leading to a crash.
Alexandre Julliard
- Function parameters don't need WINE_UNUSED.
Eric Pouech <pouech-eric@wanadoo.fr>
- Implemented the mmTask* functions.

reactos/lib/winmm
winmm_Cs.rc added at 1.1
diff -N winmm_Cs.rc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ winmm_Cs.rc	19 Sep 2004 11:07:39 -0000	1.1
@@ -0,0 +1,128 @@
+/*
+ * Czech resources for winmm
+ * Copyright 1999 Eric Pouech
+ * Copyright 2004 David Kredba 
+ *
+ * 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
+ */
+
+STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL
+BEGIN
+
+/* MMSYS errors */
+MMSYSERR_NOERROR, 		"Ur�en� p��kaz byl proveden."
+MMSYSERR_ERROR, 		"Nedefinovan� vn�j�� chyba."
+MMSYSERR_BADDEVICEID, 		"Pou�it� ID za��zen� je mimo mo�nosti syst�mu."
+MMSYSERR_NOTENABLED, 		"Ovlada� nebyl povolen."
+MMSYSERR_ALLOCATED, 		"Za��zen� je dosud pou��v�no. Vy�kejte na jeho uvoln�n� a zkuste to znovu."
+MMSYSERR_INVALHANDLE, 		"Ukazatel na za��zen� je neplatn�."
+MMSYSERR_NODRIVER, 		"V syst�mu nen� nainstalov�n ��dn� ovlada� !\n"
+MMSYSERR_NOMEM, 		"Nen� dost pam�ti pro tuto �lohu. Ukon�ete jednu nebo v�c aplikac� k z�sk�n� v�ce voln� pam�ti a zkuste to znovu."
+MMSYSERR_NOTSUPPORTED, 		"Tato funkce nen� podporov�na. Pou�ijte funkci Capabilities k ur�en�, jak� funkce a zpr�vy ovlada� podporuje."
+MMSYSERR_BADERRNUM, 		"Uveden� ��slo chyby nen� v syst�mu definov�no."
+MMSYSERR_INVALFLAG, 		"Syst�mov� funkci byl p�ed�n neplatn� p��znak."
+MMSYSERR_INVALPARAM, 		"Syst�mov� funkci byl p�ed�n neplatn� parametr."
+
+/* WAVE errors */
+WAVERR_BADFORMAT, 		"Tento form�t nen� podporov�n nebo nem��e b�t p�elo�en. Pou�ijte funkci Capabilities k ur�en� podporovan�ho form�tu."
+WAVERR_STILLPLAYING, 		"Nemohu prov�st tuto operaci dokud jsou data p�ehr�v�na. Zresetujte multimedi�ln� za��zen� nebo vy�kejte na konec p�ehr�v�n�."
+WAVERR_UNPREPARED, 		"Wave hlavi�ka nebyla p�ipravena. Pou�ijte funkci Prepare k jej� konstrukci a pak to zkuste znovu."
+WAVERR_SYNC, 			"Nemohu otev��t za��zen� bez pou�it� p��znaku WAVE_ALLOWSYNC. Pou�ijte ho a zkuste to znovu."
+
+/* MIDI errors */
+MIDIERR_UNPREPARED, 		"MIDI hlavi�ka nebyla p�ipravena. Pou�ijte funkci Prepare k jej� konstrukci a pak to zkuste znovu."
+MIDIERR_STILLPLAYING, 		"Nemohu prov�st tuto operaci dokud jsou data p�ehr�v�na. Zresetujte multimedi�ln� za��zen� nebo vy�kejte na konec p�ehr�v�n�."
+MIDIERR_NOMAP, 			"MIDI map nebyla nalezena. To m��e ukazovat na probl�m s ovlada�em nebo je soubor MIDIMAP.CFG po�kozen �i chyb�."
+MIDIERR_NOTREADY, 		"Port p�en��� data na za��zen�. Po�kejte na dokon�en� p�enosu a zkuste to znovu."
+MIDIERR_NODEVICE, 		"Sou�asn� nastaven� MIDI mapperu se odkazuje na MIDI za��zen� nep��tomn� v syst�mu. Upravte nastaven� MIDI mapperu."
+MIDIERR_INVALIDSETUP, 		"Sou�asn� nastaven� MIDI je po�kozen�. P�epi�te soubor MIDIMAP.CFG ve Windows slo�ce SYSTEM origin�lem a zkuste to znovu."
+
+/* MCI errors */
+MCIERR_INVALID_DEVICE_ID, 	"Neplatn� identifik�tor MCI za��zen�. Pou�ijte identifik�tor vr�cen� p�i otev�en� MCI za��zen�."
+MCIERR_UNRECOGNIZED_KEYWORD, 	"Ovlada� nep�ipou�t� pou�it� parametr p��kazu."
+MCIERR_UNRECOGNIZED_COMMAND,	"Ovlada� nep�ipou�t� pou�it� p��kaz."
+MCIERR_HARDWARE, 		"S multimedi�ln�m za��zen�m n�co nen� v po��dku. Ujist�te se, �e pracuje jak m�, p��padn� oslovte jeho v�robce."
+MCIERR_INVALID_DEVICE_NAME, 	"Uveden� za��zen� nen� pou�iteln� nebo nen� podporovan� MCI."
+MCIERR_OUT_OF_MEMORY, 		"Nen� dost pam�ti na proveden� t�to �lohy. \nUkon�ete jednu nebo v�c aplikac� a zkuste to znovu."
+MCIERR_DEVICE_OPEN, 		"Jm�no za��zen� u� je pou�ito jako alias touto aplikac�. Pou�ijte unik�tn� alias."
+MCIERR_CANNOT_LOAD_DRIVER, 	"Vyskytl se nerozpoznateln� probl�m p�i zav�d�n� uveden�ho ovlada�e."
+MCIERR_MISSING_COMMAND_STRING, 	"Nebyl zad�n ��dn� p��kaz."
+MCIERR_PARAM_OVERFLOW, 		"V�stupn� �et�zec se nevejde do v�stupn�ho z�sobn�ku. Zv�t�ete velikost z�sobn�ku."
+MCIERR_MISSING_STRING_ARGUMENT, "Tento p��kaz vy�aduje textov� parametr. Zadejte jeden."
+MCIERR_BAD_INTEGER, 		"Toto ��slo je neplatn� pro tento p��kaz."
+MCIERR_PARSER_INTERNAL, 	"Ovlada� za��zen� vr�til neplatn� n�vratov� typ. Zeptejte se dodavatele za��zen� na nov� ovlada�."
+MCIERR_DRIVER_INTERNAL, 	"Byl rozpozn�n probl�m s ovlada�em. Z�skejte od v�robce nov� ovlada�."
+MCIERR_MISSING_PARAMETER, 	"Tento p��kaz vy�aduje parametr. Zadejte ho."
+MCIERR_UNSUPPORTED_FUNCTION, 	"V�mi pou�it� MCI za��zen� nepodporuje uveden� p��kaz."
+MCIERR_FILE_NOT_FOUND, 		"Soubor nebyl nalezen. Ujist�te se, �e cesta k souboru a jeho jm�no jsou platn�."
+MCIERR_DEVICE_NOT_READY, 	"Ovlada� za��zen� nen� p�ipraven."
+MCIERR_INTERNAL, 		"P�i inicialiazaci MCI do�lo k probl�m�m. Zkuste zrestartovat Windows."
+MCIERR_DRIVER, 			"Ovlada� m� probl�my a ukon�il svou �innost. Ovlada� nevr�til popis chyby."
+MCIERR_CANNOT_USE_ALL, 		"Nemohu pou��t 'all' jako jm�no za��zen� p�i prov�d�n� tohoto p��kazu."
+MCIERR_MULTIPLE, 		"Vyskytly se chyby na v�ce za��zen�ch. Zadejte p��kazy zvl��� pro ka�d� jedno za��zen�ify, aby bylo zji�t�no, kter� za��zen� chybuje."
+MCIERR_EXTENSION_NOT_FOUND, 	"Nedok��i p�i�adit soubor s touto p��ponou vhodn�mu za��zen�."
+MCIERR_OUTOFRANGE, 		"Uveden� parametr je mimo meze uveden�ho p��kazu."
+MCIERR_FLAGS_NOT_COMPATIBLE, 	"Tyto parametry nemohou b�t po�ity spolu."
+MCIERR_FILE_NOT_SAVED, 		"Nemohu ulo�it soubor. Ujist�te se, �e je dost m�sta na disku nebo je-li Va�e s��ov� p�ipojen� pr�choz�."
+MCIERR_DEVICE_TYPE_REQUIRED, 	"Nemohu naj�t po�adovan� za��zen�. Ujist�te se, �e je nainstalov�no, nebo �e jste jeho n�zev uvedli p�esn�."
+MCIERR_DEVICE_LOCKED, 		"Toto za��zen� je pr�v� uzav�r�no. Vy�kejte n�kolik sekund a zkuste to znovu."
+MCIERR_DUPLICATE_ALIAS, 	"Tento alias je u� pou��v�n v t�to aplikaci. Pou�ijte jin� jm�no."
+MCIERR_BAD_CONSTANT, 		"Uveden� parametr je neplatn� pro tento p��kaz."
+MCIERR_MUST_USE_SHAREABLE, 	"Uveden� za��zen� je u� pou��v�no. Chcete-li ho sd�let, pou�ijte 'shareable' parametr s ka�d�m p��kazem 'open'."
+MCIERR_MISSING_DEVICE_NAME, 	"Tento p��kaz vy�aduje alias, soubor, ovlada� nebo n�zev za��zen�. Uve�te jeden pros�m."
+MCIERR_BAD_TIME_FORMAT, 	"Pou�it� form�t �asu je neplatn�. Nahl�dn�te do MCI dokumentace a zjist�te si platn� form�ty."
+MCIERR_NO_CLOSING_QUOTE, 	"Hodnota parametru nen� uzav�ena uvozovkami. Dopl�te je."
+MCIERR_DUPLICATE_FLAGS, 	"Parametr nebo hodnota byla zad�na dvakr�t. Zadejte jen jeden/jednu."
+MCIERR_INVALID_FILE, 		"Tento soubor nem��e b�t p�ehr�n na tomto MCI za��zen�. Soubor m��e b�t po�kozen nebo nem� spr�vn� form�t."
+MCIERR_NULL_PARAMETER_BLOCK, 	"MCI byl p�ed�n pr�zdn� blok parametr�."
+MCIERR_UNNAMED_RESOURCE, 	"Nemohu ulo�it soubor bez n�zvu. Zadejte n�zev."
+MCIERR_NEW_REQUIRES_ALIAS, 	"P�i pou�it� parametru 'new' mus�te zadat alias."
+MCIERR_NOTIFY_ON_AUTO_OPEN, 	"Nelze pou��t parametr 'notify' s automaticky otev�en�m za��zen�m."
+MCIERR_NO_ELEMENT_ALLOWED, 	"Nelze pou��t soubor s t�mto za��zen�m."
+MCIERR_NONAPPLICABLE_FUNCTION, 	"Nelze dokon�it skupinu p��kaz� v tomto po�ad�. Opravte po�ad� p��kaz� a zkuste to znovu."
+MCIERR_ILLEGAL_FOR_AUTO_OPEN, 	"Tento p��kaz nelze dokon�it na automaticky otev�en�m za��zen�. Vy�kejte na zav�en� za��zen� a zkuste to znovu."
+MCIERR_FILENAME_REQUIRED, 	"N�zev souboru je neplatn�. Ujist�te se, �e n�zev souboru m� 8 znak� n�sledovan�ch te�kou a p��ponou."
+MCIERR_EXTRA_CHARACTERS, 	"Nelze zadat znaky za �et�zec uzav�en� uvozovkami."
+MCIERR_DEVICE_NOT_INSTALLED, 	"Toto za��zen� nen� v syst�mu nainstalov�no. Nainstalujte ho v Ovl�dac�m panelu, na z�lo�ce Ovlada�e."
+MCIERR_GET_CD, 			"Nemohu p�istoupit k uveden�mu souboru nebo MCI za��zen�. Zm��te adres�� nebo restartujte V�� po��ta�."
+MCIERR_SET_CD, 			"Nemohu p�istoupit k uveden�mu souboru nebo MCI za��zen�, proto�e aplikace nem��e zm�nit adres��."
+MCIERR_SET_DRIVE, 		"Nemohu p�istoupit k uveden�mu souboru nebo MCI za��zen�, proto�e aplikace nem��e zm�nit jednotku disku."
+MCIERR_DEVICE_LENGTH, 		"Ur�ete za��zen� nebo ovlada� jeho� n�zev je krat�� ne� 79 znak�."
+MCIERR_DEVICE_ORD_LENGTH, 	"Ur�ete za��zen� nebo ovlada� jeho� n�zev je krat�� ne� 69 znak�."
+MCIERR_NO_INTEGER, 		"Tento p��kaz vy�aduje celo��seln� parametr. Pou�ijte ho pros�m."
+MCIERR_WAVE_OUTPUTSINUSE, 	"V�echna wave za��zen�, kter� by mohla p�ehr�t soubory s t�mto form�tem jsou pou��v�na. Vy�kejte na uvoln�n� za��zen� a zkuste to znovu."
+MCIERR_WAVE_SETOUTPUTINUSE, 	"Nemohu nastavit toto wave za��zen� na playback, jeliko� je pou��v�no. Vy�kejte na uvoln�n� za��zen� a zkuste to znovu."
+MCIERR_WAVE_INPUTSINUSE, 	"V�echna wave za��zen�, kter� by mohla nahr�vat oubory s t�mto form�tem jsou pou��v�na. Vy�kejte na uvoln�n� za��zen� a zkuste to znovu."
+MCIERR_WAVE_SETINPUTINUSE, 	"Nemohu nastavit toto wave za��zen� na nahr�v�n�, jeliko� je pou��v�no. Vy�kejte na uvoln�n� za��zen� a zkuste to znovu."
+MCIERR_WAVE_OUTPUTUNSPECIFIED,	"Jak�koliv waveform kompatibiln� p�ehr�vac� za��zen� m��e b�t pou�ito."
+MCIERR_WAVE_INPUTUNSPECIFIED, 	"Jak�koliv waveform kompatibiln� nahr�vac� za��zen� m��e b�t pou�ito."
+MCIERR_WAVE_OUTPUTSUNSUITABLE, 	"Nen� nainstalov�no ��dn� wave za��zen�, kter� by bylo schopno p�ehr�t soubory v tomto form�tu. Pou�ijte z�lo�ku Ovlada�e k instalaci wave za��zen�."
+MCIERR_WAVE_SETOUTPUTUNSUITABLE,"P�ehr�vac� za��zen� nedok�zalo rozpoznat form�t souboru."
+MCIERR_WAVE_INPUTSUNSUITABLE, 	"Nen� nainstalov�no ��dn� wave za��zen�, kter� by bylo schopno nahr�t soubory v tomto form�tu. Pou�ijte z�lo�ku Ovlada�e k instalaci wave za��zen�."
+MCIERR_WAVE_SETINPUTUNSUITABLE, "Za��zen�, ze kter�ho zkou��te nahr�vat, nedok��e rozpoznat form�t v�stupn�ho souboru."
+MCIERR_NO_WINDOW, 		"Okno display chyb�."
+MCIERR_CREATEWINDOW, 		"Nemohu vytvo�it nebo pou��t okno."
+MCIERR_FILE_READ, 		"Nemohu p�e��st zadan� soubor. Ujist�te se, �e soubor st�le existuje a zkontrolujte sv�j disk nebo s��ovou konektivitu."
+MCIERR_FILE_WRITE, 		"Nemohu zapisovat do zadan�ho souboru. Ujist�te se, �e m�te dost m�sta na disku nebo zda jste p�ipojeni k s�ti."
+MCIERR_SEQ_DIV_INCOMPATIBLE, 	"Form�ty �asu ""song pointer"" a SMPTE jsou vz�jemn� v�lu�n�. Nem��ete je pou��t sou�asn�."
+MCIERR_SEQ_NOMIDIPRESENT, 	"V syst�mu nejsou nainstalov�ny MIDI za��zen�. Nainstalujte je ze z�lo�ky Ovlada� v Ovl�dac�m panelu."
+MCIERR_SEQ_PORT_INUSE, 		"Tento MIDI port je pou��v�n. Vy�kejte na jeho uvoln�n�; pak to zkuste znovu."
+MCIERR_SEQ_PORT_MAPNODEVICE, 	"Nastaven� MIDI mapperu odkazuje na MIDI za��zen�, kter� nen� v syst�mu nainstalov�no. Nainstalujte ho pomoc� z�lo�ky MIDI Mapper v Ovl�dac�m panelu."
+MCIERR_SEQ_PORT_MISCERROR, 	"Nastala chyba p�i pr�ci s t�mto portem."
+MCIERR_SEQ_PORT_NONEXISTENT, 	"Toto MIDI za��zen� nen� nainstalov�no v syst�mu. Nainstalujte ho v Ovl�dac�m panelu na z�lo�ce Driver."
+MCIERR_SEQ_PORTUNSPECIFIED, 	"Syst�m nezn� tento MIDI port."
+MCIERR_SEQ_TIMER, 		"V�echny �asova�e multim�di� jsou pou��v�ny aplikacemi. Ukon�ete jednu z t�chto aplikac� a zkuste to znovu."
+
+END

reactos/lib/winmm
lolvldrv.c 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- lolvldrv.c	16 Jun 2004 18:48:46 -0000	1.6
+++ lolvldrv.c	19 Sep 2004 11:07:39 -0000	1.7
@@ -510,12 +510,9 @@
     case DRV_QUERYDEVICEINTERFACESIZE:
         return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
 
-#ifdef __WINESRC__
     case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */
     case DRV_QUERYDSOUNDDESC: /* Wine-specific: Retrieve DirectSound driver description*/
-    case DRV_QUERYDSOUNDGUID: /* Wine-specific: Retrieve DirectSound driver GUID */
 	return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
-#endif
 
     default:
 	WARN("Unknown call %04x\n", uMsg);

reactos/lib/winmm
mci.c 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- mci.c	8 Aug 2004 21:36:20 -0000	1.4
+++ mci.c	19 Sep 2004 11:07:39 -0000	1.5
@@ -1514,7 +1514,8 @@
 	    }
 	    if (!s) {
 		if (GetPrivateProfileStringA("mci", 0, "", buf, sizeof(buf), "system.ini")) {
-		    for(p = buf; *p; p += strlen(s) + 1, cnt++) {
+		    for(p = buf; *p; p += strlen(p) + 1, cnt++) {
+                        TRACE("%ld: %s\n", cnt, p);
 			if (cnt == lpParms->dwNumber - 1) {
 			    s = p;
 			    break;

reactos/lib/winmm
mmsystem.c 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- mmsystem.c	25 Feb 2004 20:00:42 -0000	1.1
+++ mmsystem.c	19 Sep 2004 11:07:39 -0000	1.2
@@ -1839,7 +1839,7 @@
 /**************************************************************************
  * 				mmTaskBlock		[MMSYSTEM.902]
  */
-void	WINAPI	mmTaskBlock16(HINSTANCE16 WINE_UNUSED hInst)
+void WINAPI mmTaskBlock16(HINSTANCE16 hInst)
 {
     MSG		msg;
 

reactos/lib/winmm
winehq2ros.patch 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- winehq2ros.patch	14 Aug 2004 20:36:35 -0000	1.6
+++ winehq2ros.patch	19 Sep 2004 11:07:39 -0000	1.7
@@ -1,24 +1,11 @@
 Index: lolvldrv.c
 ===================================================================
 RCS file: /home/wine/wine/dlls/winmm/lolvldrv.c,v
-retrieving revision 1.58
-diff -u -r1.58 lolvldrv.c
---- lolvldrv.c	1 Jun 2004 19:40:48 -0000	1.58
-+++ lolvldrv.c	14 Aug 2004 20:50:50 -0000
-@@ -510,10 +510,12 @@
-     case DRV_QUERYDEVICEINTERFACESIZE:
-         return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
- 
-+#ifdef __WINESRC__
-     case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */
-     case DRV_QUERYDSOUNDDESC: /* Wine-specific: Retrieve DirectSound driver description*/
-     case DRV_QUERYDSOUNDGUID: /* Wine-specific: Retrieve DirectSound driver GUID */
- 	return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
-+#endif
- 
-     default:
- 	WARN("Unknown call %04x\n", uMsg);
-@@ -759,11 +761,18 @@
+retrieving revision 1.59
+diff -u -r1.59 lolvldrv.c
+--- lolvldrv.c	20 Aug 2004 20:01:31 -0000	1.59
++++ lolvldrv.c	19 Sep 2004 11:16:24 -0000
+@@ -758,11 +758,18 @@
  {
      TRACE("()\n");
      /* first load hardware drivers */
@@ -45,7 +32,7 @@
 retrieving revision 1.26
 diff -u -r1.26 time.c
 --- time.c	12 Jan 2004 21:03:10 -0000	1.26
-+++ time.c	14 Aug 2004 20:50:50 -0000
++++ time.c	19 Sep 2004 11:16:24 -0000
 @@ -175,14 +175,19 @@
      volatile HANDLE *pActive = (volatile HANDLE *)&TIME_hMMTimer;
      DWORD last_time, cur_time;
@@ -69,10 +56,10 @@
 Index: winmm.c
 ===================================================================
 RCS file: /home/wine/wine/dlls/winmm/winmm.c,v
-retrieving revision 1.41
-diff -u -r1.41 winmm.c
---- winmm.c	9 Aug 2004 18:45:05 -0000	1.41
-+++ winmm.c	14 Aug 2004 20:50:51 -0000
+retrieving revision 1.42
+diff -u -r1.42 winmm.c
+--- winmm.c	16 Aug 2004 23:19:17 -0000	1.42
++++ winmm.c	19 Sep 2004 11:16:25 -0000
 @@ -126,10 +126,12 @@
          loaded = -1;
          if (h)
@@ -89,11 +76,11 @@
 Index: winmm_res.rc
 ===================================================================
 RCS file: /home/wine/wine/dlls/winmm/winmm_res.rc,v
-retrieving revision 1.16
-diff -u -r1.16 winmm_res.rc
---- winmm_res.rc	29 Jul 2004 02:40:15 -0000	1.16
-+++ winmm_res.rc	14 Aug 2004 20:50:51 -0000
-@@ -33,7 +33,7 @@
+retrieving revision 1.17
+diff -u -r1.17 winmm_res.rc
+--- winmm_res.rc	16 Aug 2004 20:02:09 -0000	1.17
++++ winmm_res.rc	19 Sep 2004 11:16:26 -0000
+@@ -34,7 +34,7 @@
  #include "winmm_Es.rc"
  #include "winmm_Fr.rc"
  #include "winmm_It.rc"

reactos/lib/winmm
winmm.c 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- winmm.c	14 Aug 2004 22:36:38 -0000	1.11
+++ winmm.c	19 Sep 2004 11:07:39 -0000	1.12
@@ -83,9 +83,7 @@
 	return FALSE;
     WINMM_IData->hWinMM32Instance = hInstDLL;
     InitializeCriticalSection(&WINMM_IData->cs);
-/* FIXME crashes in ReactOS
     WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData";
-*/
     WINMM_IData->psStopEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
     WINMM_IData->psLastEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
     TRACE("Created IData (%p)\n", WINMM_IData);
@@ -3237,7 +3235,7 @@
     HANDLE              event;
 };
 
-DWORD WINAPI mmTaskRun(void* pmt)
+static DWORD WINAPI mmTaskRun(void* pmt)
 {
     struct mm_starter mms;
 
@@ -3248,6 +3246,9 @@
     return 0;
 }
 
+/******************************************************************
+ *		mmTaskCreate (WINMM.@)
+ */
 MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD client)
 {
     HANDLE               hThread;
@@ -3255,7 +3256,7 @@
     struct mm_starter   *mms;
 
     mms = HeapAlloc(GetProcessHeap(), 0, sizeof(struct mm_starter));
-    if (mms == NULL) { return TASKERR_OUTOFMEMORY; }
+    if (mms == NULL) return TASKERR_OUTOFMEMORY;
 
     mms->cb = cb;
     mms->client = client;
@@ -3272,3 +3273,38 @@
     CloseHandle(hThread);
     return 0;
 }
+
+/******************************************************************
+ *		mmTaskBlock (WINMM.@)
+ */
+void     WINAPI mmTaskBlock(HANDLE tid)
+{
+    MSG		msg;
+
+    do
+    {
+	GetMessageA(&msg, 0, 0, 0);
+	if (msg.hwnd) DispatchMessageA(&msg);
+    } while (msg.message != WM_USER);
+}
+
+/******************************************************************
+ *		mmTaskSignal (WINMM.@)
+ */
+BOOL     WINAPI mmTaskSignal(HANDLE tid)
+{
+    return PostThreadMessageW((DWORD)tid, WM_USER, 0, 0);
+}
+
+/******************************************************************
+ *		mmTaskYield (WINMM.@)
+ */
+void     WINAPI mmTaskYield(void) {}
+
+/******************************************************************
+ *		mmGetCurrentTask (WINMM.@)
+ */
+HANDLE   WINAPI mmGetCurrentTask(void)
+{
+    return (HANDLE)GetCurrentThreadId();
+}

reactos/lib/winmm
winmm.spec 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- winmm.spec	16 Jul 2004 20:24:59 -0000	1.2
+++ winmm.spec	19 Sep 2004 11:07:39 -0000	1.3
@@ -112,6 +112,7 @@
 @ stdcall mixerMessage(long long long long)
 @ stdcall mixerOpen(ptr long long long long)
 @ stdcall mixerSetControlDetails(long ptr long)
+@ stdcall mmGetCurrentTask()
 @ stdcall mmioAdvance(long ptr long)
 @ stdcall mmioAscend(long ptr long)
 @ stdcall mmioClose(long long)
@@ -135,7 +136,10 @@
 @ stdcall mmioStringToFOURCCW(wstr long)
 @ stdcall mmioWrite(long ptr long)
 @ stdcall mmsystemGetVersion()
+@ stdcall mmTaskBlock(long)
 @ stdcall mmTaskCreate(ptr ptr long)
+@ stdcall mmTaskSignal(long)
+@ stdcall mmTaskYield()
 @ stdcall sndPlaySoundA(ptr long)
 @ stdcall sndPlaySoundW(ptr long)
 @ stdcall timeBeginPeriod(long)

reactos/lib/winmm
winmm_res.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- winmm_res.rc	14 Aug 2004 20:36:35 -0000	1.4
+++ winmm_res.rc	19 Sep 2004 11:07:39 -0000	1.5
@@ -28,6 +28,7 @@
 #include "winnls.h"
 
 /* Add your language specific defines here */
+#include "winmm_Cs.rc"
 #include "winmm_De.rc"
 #include "winmm_En.rc"
 #include "winmm_Es.rc"
CVSspam 0.2.8