Jacek Caban : winex11: Directly use ntdll in X11DRV_GetICMProfile.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 30c266a625286f264e65b1e205001f781e5d55c9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=30c266a625286f264e65b1e20...

Author: Jacek Caban 
Date:   Fri Apr 22 14:46:45 2022 +0200

winex11: Directly use ntdll in X11DRV_GetICMProfile.

Signed-off-by: Jacek Caban 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/winex11.drv/graphics.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c
index dadedf2d9cf..715afcb8f6a 100644
--- a/dlls/winex11.drv/graphics.c
+++ b/dlls/winex11.drv/graphics.c
@@ -1660,7 +1660,7 @@ static const WCHAR mntr_key[] =
      'V','e','r','s','i','o','n','\','I','C','M','\','m','n','t','r'};

static const WCHAR color_path[] =
-    {'c',':','\','w','i','n','d','o','w','s','\','s','y','s','t','e','m','3','2',
+    {'\','?','?','\','c',':','\','w','i','n','d','o','w','s','\','s','y','s','t','e','m','3','2',
      '\','s','p','o','o','l','\','d','r','i','v','e','r','s','\','c','o','l','o','r','\'};

/***********************************************************************
@@ -1679,6 +1679,8 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size,
     unsigned long buflen, i;
     ULONG full_size;
     WCHAR fullname[MAX_PATH + ARRAY_SIZE( color_path )], *p;
+    UNICODE_STRING name;
+    OBJECT_ATTRIBUTES attr;

if (!size) return FALSE;

@@ -1697,8 +1699,10 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size,
     else if ((buffer = get_icm_profile( &buflen )))
     {
         static const WCHAR icm[] = {'.','i','c','m',0};
+        IO_STATUS_BLOCK io;
         UINT64 hash = 0;
         HANDLE file;
+        NTSTATUS status;

for (i = 0; i < buflen; i++) hash = (hash << 16) - hash + buffer[i];
         for (i = 0; i < sizeof(hash) * 2; i++)
@@ -1710,14 +1714,15 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size,

memcpy( p + i, icm, sizeof(icm) );

-        file = CreateFileW( fullname, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0 );
-        if (file != INVALID_HANDLE_VALUE)
+        RtlInitUnicodeString( &name, fullname );
+        InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL );
+        status = NtCreateFile( &file, GENERIC_WRITE, &attr, &io, NULL, 0, 0, FILE_CREATE,
+                               FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, NULL, 0 );
+        if (!status)
         {
-            DWORD written;
-
-            if (!WriteFile( file, buffer, buflen, &written, NULL ) || written != buflen)
-                ERR( "Unable to write color profile\n" );
-            CloseHandle( file );
+            status = NtWriteFile( file, NULL, NULL, NULL, &io, buffer, buflen, NULL, NULL );
+            if (status) ERR( "Unable to write color profile: %x\n", status );
+            NtClose( file );
         }
         HeapFree( GetProcessHeap(), 0, buffer );
     }
@@ -1725,7 +1730,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size,
     else lstrcpyW( p, srgb );

NtClose( hkey );
-    required = strlenW( fullname ) + 1;
+    required = strlenW( fullname ) + 1 - 4 /* skip NT prefix */;
     if (*size < required)
     {
         *size = required;
@@ -1734,9 +1739,12 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size,
     }
     if (filename)
     {
-        strcpyW( filename, fullname );
-        if (GetFileAttributesW( filename ) == INVALID_FILE_ATTRIBUTES)
-            WARN( "color profile not found\n" );
+        FILE_BASIC_INFORMATION info;
+        strcpyW( filename, fullname + 4 );
+        RtlInitUnicodeString( &name, fullname );
+        InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL );
+        if (NtQueryAttributesFile( &attr, &info ))
+            WARN( "color profile not found in %s\n", debugstr_w(fullname) );
     }
     *size = required;
     return TRUE;