- Implementation stubs for GenerateCopyFilePaths,

  SpoolerCopyFileEvent.
- Call DisableThreadLibraryCalls on process attach.
- Document more functions.

diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec
index 0c1b03aee6f9c1a97d92f242b45ba46c145122a9..3a719cbf35e9ff3ac7cc3e5f3f34ee63e92a4b5b 100644 (file)
--- a/dlls/mscms/mscms.spec
+++ b/dlls/mscms/mscms.spec
@@ -16,7 +16,7 @@
 @ stdcall DisassociateColorProfileFromDeviceW(ptr ptr ptr)
 @ stdcall EnumColorProfilesA(ptr ptr ptr ptr ptr)
 @ stdcall EnumColorProfilesW(ptr ptr ptr ptr ptr)
-@ stub GenerateCopyFilePaths
+@ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long)
 @ stdcall GetCMMInfo(ptr long)
 @ stdcall GetColorDirectoryA(ptr ptr long)
 @ stdcall GetColorDirectoryW(ptr ptr long)
@@ -52,7 +52,7 @@
 @ stdcall SetColorProfileHeader(ptr ptr)
 @ stdcall SetStandardColorSpaceProfileA(ptr long ptr)
 @ stdcall SetStandardColorSpaceProfileW(ptr long ptr)
-@ stub SpoolerCopyFileEvent
+@ stdcall SpoolerCopyFileEvent(wstr wstr long)
 @ stdcall TranslateBitmapBits(ptr ptr long long long long ptr long long ptr long)
 @ stdcall TranslateColors(ptr ptr long long ptr long)
 @ stdcall UninstallColorProfileA(ptr ptr long)

diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c
index 895a8af90bdeba2f9b480d5a13e678295830c67d..894c4547e4702f87a4e8e16e1008b92b0b053601 100644 (file)
--- a/dlls/mscms/mscms_main.c
+++ b/dlls/mscms/mscms_main.c
@@ -125,12 +125,12 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
     switch (reason)
     {
     case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls( hinst );
         return MSCMS_init_lcms();
 
     case DLL_PROCESS_DETACH:
         MSCMS_deinit_lcms();
         break;
     }
-
     return TRUE;
 }

diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c
index 45492b12b1d46aeb05e410fac5dd961b46b133ac..080aa04a71e666b92c01cbe55dd2dd916563b9f0 100644 (file)
--- a/dlls/mscms/profile.c
+++ b/dlls/mscms/profile.c
@@ -340,6 +340,11 @@ BOOL WINAPI GetCountColorProfileElements( HPROFILE profile, PDWORD count )
     return ret;
 }
 
+/******************************************************************************
+ * GetStandardColorSpaceProfileA               [MSCMS.@]
+ *
+ * See GetStandardColorSpaceProfileW.
+ */
 BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile, PDWORD size )
 {
     INT len;
@@ -378,6 +383,22 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile
     return ret;
 }
 
+/******************************************************************************
+ * GetStandardColorSpaceProfileW               [MSCMS.@]
+ *
+ * Retrieve the profile filename for a given standard color space id.
+ *
+ * PARAMS
+ *  machine  [I]   Name of the machine for which to get the standard color space.
+ *                 Must be NULL, which indicates the local machine.
+ *  id       [I]   Id of a standard color space.
+ *  profile  [O]   Buffer to recieve the profile filename.
+ *  size     [I/O] Size of the filename buffer in bytes.
+ *
+ * RETURNS
+ *  Success: TRUE
+ *  Failure: FALSE
+ */
 BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile, PDWORD size )
 {
     DWORD len;
@@ -595,6 +616,19 @@ BOOL WINAPI SetColorProfileElement( HPROFILE profile, TAGTYPE type, DWORD offset
     return ret;
 }
 
+/******************************************************************************
+ * SetColorProfileHeader               [MSCMS.@]
+ *
+ * Set header data for a given profile.
+ *
+ * PARAMS
+ *  profile  [I] Handle to a color profile.
+ *  header   [I] Buffer holding the header data.
+ *
+ * RETURNS
+ *  Success: TRUE
+ *  Failure: FALSE
+ */
 BOOL WINAPI SetColorProfileHeader( HPROFILE profile, PPROFILEHEADER header )
 {
     BOOL ret = FALSE;
@@ -614,20 +648,6 @@ BOOL WINAPI SetColorProfileHeader( HPROFILE profile, PPROFILEHEADER header )
     return ret;
 }
 
-BOOL WINAPI SetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile )
-{
-    FIXME( "( 0x%08lx, %p ) stub\n", id, profile );
-
-    return TRUE;
-}
-
-BOOL WINAPI SetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile )
-{
-    FIXME( "( 0x%08lx, %p ) stub\n", id, profile );
-
-    return TRUE;
-}
-
 /******************************************************************************
  * UninstallColorProfileA               [MSCMS.@]
  *

diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c
index 46cc9a58cf1c805d83c858cbc10781958e204b9a..ae2e2b3363282b115ac641571bd41eee7f91980c 100644 (file)
--- a/dlls/mscms/stub.c
+++ b/dlls/mscms/stub.c
@@ -130,6 +130,16 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer,
     return FALSE;
 }
 
+DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE clientinfo,
+                                    DWORD level, LPWSTR sourcedir, LPDWORD sourcedirsize,
+                                    LPWSTR targetdir, LPDWORD targetdirsize, DWORD flags )
+{
+    FIXME( "( %s, %s, %p, 0x%08lx, %p, %p, %p, %p, 0x%08lx ) stub\n",
+           debugstr_w(printer), debugstr_w(directory), clientinfo, level, sourcedir,
+           sourcedirsize, targetdir, targetdirsize, flags );
+    return ERROR_SUCCESS;
+}
+
 DWORD WINAPI GetCMMInfo( HTRANSFORM transform, DWORD info )
 {
     FIXME( "( %p, 0x%08lx ) stub\n", transform, info );
@@ -202,6 +212,24 @@ BOOL WINAPI SetColorProfileElementSize( HPROFILE profile, TAGTYPE type, DWORD si
     return FALSE;
 }
 
+BOOL WINAPI SetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile )
+{
+    FIXME( "( 0x%08lx, %p ) stub\n", id, profile );
+    return TRUE;
+}
+
+BOOL WINAPI SetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile )
+{
+    FIXME( "( 0x%08lx, %p ) stub\n", id, profile );
+    return TRUE;
+}
+
+BOOL WINAPI SpoolerCopyFileEvent( LPWSTR printer, LPWSTR key, DWORD event )
+{
+    FIXME( "( %s, %s, 0x%08lx ) stub\n", debugstr_w(printer), debugstr_w(key), event );
+    return TRUE;
+}
+
 BOOL WINAPI TranslateColors( HTRANSFORM transform, PCOLOR inputcolors, DWORD number,
                              COLORTYPE input, PCOLOR outputcolors, COLORTYPE output )
 {