Implemented most of '*Format*' API.
Improved internal object and messages handling.
Started some '*Filter*' functions.
Fixed standard headers for Winelib.
Fixed acmMetrics.
diff --git a/dlls/msacm/wineacm.h b/dlls/msacm/wineacm.h
index b86641c..819dd59 100644
--- a/dlls/msacm/wineacm.h
+++ b/dlls/msacm/wineacm.h
@@ -6,9 +6,15 @@
typedef struct _WINE_ACMDRIVERID *PWINE_ACMDRIVERID;
typedef struct _WINE_ACMDRIVER *PWINE_ACMDRIVER;
+#define WINE_ACMOBJ_DONTCARE 0x5EED0000
+#define WINE_ACMOBJ_DRIVERID 0x5EED0001
+#define WINE_ACMOBJ_DRIVER 0x5EED0002
+#define WINE_ACMOBJ_STREAM 0x5EED0003
+
typedef struct _WINE_ACMOBJ
{
- PWINE_ACMDRIVERID pACMDriverID;
+ DWORD dwType;
+ PWINE_ACMDRIVERID pACMDriverID;
} WINE_ACMOBJ, *PWINE_ACMOBJ;
typedef struct _WINE_ACMDRIVER
@@ -29,6 +35,7 @@
typedef struct _WINE_ACMDRIVERID
{
+ WINE_ACMOBJ obj;
LPSTR pszDriverAlias;
LPSTR pszFileName;
HINSTANCE hInstModule; /* NULL if global */
@@ -43,13 +50,33 @@
extern HANDLE MSACM_hHeap;
extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID;
extern PWINE_ACMDRIVERID MSACM_pLastACMDriverID;
-PWINE_ACMDRIVERID MSACM_RegisterDriver(
- LPSTR pszDriverAlias, LPSTR pszFileName,
- HINSTANCE hinstModule);
-void MSACM_RegisterAllDrivers(void);
-PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p);
-void MSACM_UnregisterAllDrivers(void);
-PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID);
-PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver);
-PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj);
+extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPSTR pszDriverAlias, LPSTR pszFileName,
+ HINSTANCE hinstModule);
+extern void MSACM_RegisterAllDrivers(void);
+extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p);
+extern void MSACM_UnregisterAllDrivers(void);
+extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID);
+extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver);
+extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type);
+extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM);
+
+/* From msacm32.c */
+extern HINSTANCE MSACM_hInstance32;
+
+/* Dialog box templates */
+#define DLG_ACMFORMATCHOOSE_ID 70
+#define IDD_ACMFORMATCHOOSE_BTN_HELP 9
+#define IDD_ACMFORMATCHOOSE_CMB_CUSTOM 100
+#define IDD_ACMFORMATCHOOSE_CMB_FORMATTAG 101
+#define IDD_ACMFORMATCHOOSE_CMB_FORMAT 102
+#define IDD_ACMFORMATCHOOSE_BTN_SETNAME 103
+#define IDD_ACMFORMATCHOOSE_BTN_DELNAME 104
+
+#define DLG_ACMFILTERCHOOSE_ID 71
+#define IDD_ACMFILTERCHOOSE_BTN_HELP 9
+#define IDD_ACMFILTERCHOOSE_CMB_CUSTOM 100
+#define IDD_ACMFILTERCHOOSE_CMB_FILTERTAG 101
+#define IDD_ACMFILTERCHOOSE_CMB_FILTER 102
+#define IDD_ACMFILTERCHOOSE_BTN_SETNAME 103
+#define IDD_ACMFILTERCHOOSE_BTN_DELNAME 104
