Hi,
Bug 1927 ... I am just adding some code blind for now.
Ciao, Marcus
Changelog:
Added stub for EnumICMProfilesA/W.
? dlls/gdi/icm.c
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.99
diff -u -r1.99 wingdi.h
--- include/wingdi.h 30 Dec 2003 22:08:17 -0000 1.99
+++ include/wingdi.h 10 Jan 2004 16:06:19 -0000
@@ -431,6 +431,14 @@
#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
+/* ICM stuff */
+typedef INT (CALLBACK *EnumICMProfilesProcCallbackA)(LPSTR lpszFilename,LPARAM lParam);
+typedef INT (CALLBACK *EnumICMProfilesProcCallbackW)(LPWSTR lpszFilename,LPARAM lParam);
+DECL_WINELIB_TYPE_AW(EnumICMProfilesProcCallback)
+typedef EnumICMProfilesProcCallbackA ICMENUMPROCA;
+typedef EnumICMProfilesProcCallbackW ICMENUMPROCW;
+DECL_WINELIB_TYPE_AW(ICMENUMPROC)
+
#define ICM_OFF 1
#define ICM_ON 2
@@ -3216,6 +3224,9 @@
INT WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
INT WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
#define EnumFonts WINELIB_NAME_AW(EnumFonts)
+INT WINAPI EnumICMProfilesA(HDC,ICMENUMPROCA,LPARAM);
+INT WINAPI EnumICMProfilesW(HDC,ICMENUMPROCW,LPARAM);
+#define EnumICMProfiles WINELIB_NAME_AW(EnumICMProfiles)
BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
INT WINAPI EnumObjects(HDC,INT,GOBJENUMPROC,LPARAM);
BOOL WINAPI EqualRgn(HRGN,HRGN);
Index: dlls/gdi/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/gdi/Makefile.in,v
retrieving revision 1.56
diff -u -r1.56 Makefile.in
--- dlls/gdi/Makefile.in 14 Oct 2003 05:27:44 -0000 1.56
+++ dlls/gdi/Makefile.in 10 Jan 2004 16:06:19 -0000
@@ -48,6 +48,7 @@
enhmfdrv/objects.c \
freetype.c \
gdi_main.c \
+ icm.c \
mfdrv/bitblt.c \
mfdrv/dc.c \
mfdrv/graphics.c \
Index: dlls/gdi/gdi32.spec
===================================================================
RCS file: /home/wine/wine/dlls/gdi/gdi32.spec,v
retrieving revision 1.33
diff -u -r1.33 gdi32.spec
--- dlls/gdi/gdi32.spec 1 Dec 2003 22:42:56 -0000 1.33
+++ dlls/gdi/gdi32.spec 10 Jan 2004 16:06:19 -0000
@@ -97,8 +97,8 @@
@ stdcall EnumFontFamiliesW(long wstr ptr long)
@ stdcall EnumFontsA(long str ptr long)
@ stdcall EnumFontsW(long wstr ptr long)
-@ stub EnumICMProfilesA
-@ stub EnumICMProfilesW
+@ stdcall EnumICMProfilesA(long ptr long)
+@ stdcall EnumICMProfilesW(long ptr long)
@ stdcall EnumMetaFile(long long ptr ptr)
@ stdcall EnumObjects(long long ptr long)
@ stdcall EqualRgn(long long)
--
/*
* Image Color Management
*
* Copyright 2004 Marcus Meissner
*
* 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
*/
#include "config.h"
#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "wingdi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(icm);
/***********************************************************************
* EnumICMProfilesA (GDI32.@)
*/
INT WINAPI EnumICMProfilesA(HDC hdc,ICMENUMPROCA func,LPARAM lParam) {
FIXME("(%p, %p, 0x%08lx), stub.\n",hdc,func,lParam);
return -1;
}
/***********************************************************************
* EnumICMProfilesW (GDI32.@)
*/
INT WINAPI EnumICMProfilesW(HDC hdc,ICMENUMPROCW func,LPARAM lParam) {
FIXME("(%p, %p, 0x%08lx), stub.\n",hdc,func,lParam);
return -1;
}
