Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
22f146f0
Commit
22f146f0
authored
Mar 05, 2008
by
Hans Leidekker
Committed by
Alexandre Julliard
Mar 05, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11.drv: Retrieve X color profile in GetICMProfile.
parent
81e9b43f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
76 additions
and
10 deletions
+76
-10
graphics.c
dlls/winex11.drv/graphics.c
+74
-10
x11drv.h
dlls/winex11.drv/x11drv.h
+1
-0
x11drv_main.c
dlls/winex11.drv/x11drv_main.c
+1
-0
No files found.
dlls/winex11.drv/graphics.c
View file @
22f146f0
...
@@ -1381,6 +1381,39 @@ DWORD X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y )
...
@@ -1381,6 +1381,39 @@ DWORD X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y )
return
ret
;
return
ret
;
}
}
static
unsigned
char
*
get_icm_profile
(
unsigned
long
*
size
)
{
Atom
type
;
int
format
;
unsigned
long
count
,
remaining
;
unsigned
char
*
profile
,
*
ret
=
NULL
;
wine_tsx11_lock
();
XGetWindowProperty
(
gdi_display
,
DefaultRootWindow
(
gdi_display
),
x11drv_atom
(
_ICC_PROFILE
),
0
,
~
0UL
,
False
,
AnyPropertyType
,
&
type
,
&
format
,
&
count
,
&
remaining
,
&
profile
);
if
(
format
&&
count
)
{
*
size
=
count
*
(
format
/
8
);
if
((
ret
=
HeapAlloc
(
GetProcessHeap
(),
0
,
*
size
)))
memcpy
(
ret
,
profile
,
*
size
);
XFree
(
profile
);
}
wine_tsx11_unlock
();
return
ret
;
}
typedef
struct
{
unsigned
int
unknown
[
6
];
unsigned
int
state
[
5
];
unsigned
int
count
[
2
];
unsigned
char
buffer
[
64
];
}
sha_ctx
;
extern
void
WINAPI
A_SHAInit
(
sha_ctx
*
);
extern
void
WINAPI
A_SHAUpdate
(
sha_ctx
*
,
const
unsigned
char
*
,
unsigned
int
);
extern
void
WINAPI
A_SHAFinal
(
sha_ctx
*
,
unsigned
char
*
);
/***********************************************************************
/***********************************************************************
* GetICMProfile (X11DRV.@)
* GetICMProfile (X11DRV.@)
*/
*/
...
@@ -1398,22 +1431,53 @@ BOOL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR filenam
...
@@ -1398,22 +1431,53 @@ BOOL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR filenam
'V'
,
'e'
,
'r'
,
's'
,
'i'
,
'o'
,
'n'
,
'\\'
,
'I'
,
'C'
,
'M'
,
'\\'
,
'm'
,
'n'
,
't'
,
'r'
,
0
};
'V'
,
'e'
,
'r'
,
's'
,
'i'
,
'o'
,
'n'
,
'\\'
,
'I'
,
'C'
,
'M'
,
'\\'
,
'm'
,
'n'
,
't'
,
'r'
,
0
};
HKEY
hkey
;
HKEY
hkey
;
DWORD
required
;
DWORD
required
,
len
;
WCHAR
profile
[
MAX_PATH
],
fullname
[
MAX_PATH
];
WCHAR
profile
[
MAX_PATH
],
fullname
[
2
*
MAX_PATH
+
sizeof
(
path
)
/
sizeof
(
WCHAR
)];
unsigned
char
*
buffer
;
unsigned
long
buflen
;
if
(
!
size
)
return
FALSE
;
if
(
!
size
)
return
FALSE
;
strcpyW
(
profile
,
srgb
);
GetSystemDirectoryW
(
fullname
,
MAX_PATH
);
if
(
!
RegCreateKeyExW
(
HKEY_LOCAL_MACHINE
,
mntr
,
0
,
NULL
,
0
,
KEY_ALL_ACCESS
,
NULL
,
&
hkey
,
NULL
))
strcatW
(
fullname
,
path
);
len
=
sizeof
(
profile
)
/
sizeof
(
WCHAR
);
if
(
!
RegCreateKeyExW
(
HKEY_LOCAL_MACHINE
,
mntr
,
0
,
NULL
,
0
,
KEY_ALL_ACCESS
,
NULL
,
&
hkey
,
NULL
)
&&
!
RegEnumValueW
(
hkey
,
0
,
profile
,
&
len
,
NULL
,
NULL
,
NULL
,
NULL
))
/* FIXME handle multiple values */
{
{
DWORD
len
=
sizeof
(
profile
)
/
sizeof
(
WCHAR
);
strcatW
(
fullname
,
profile
);
/* FIXME handle multiple values */
RegEnumValueW
(
hkey
,
0
,
profile
,
&
len
,
NULL
,
NULL
,
NULL
,
NULL
);
RegCloseKey
(
hkey
);
RegCloseKey
(
hkey
);
}
}
GetSystemDirectoryW
(
fullname
,
MAX_PATH
);
else
if
((
buffer
=
get_icm_profile
(
&
buflen
)))
strcatW
(
fullname
,
path
);
{
strcatW
(
fullname
,
profile
);
static
const
WCHAR
fmt
[]
=
{
'%'
,
'0'
,
'2'
,
'x'
,
0
};
static
const
WCHAR
icm
[]
=
{
'.'
,
'i'
,
'c'
,
'm'
,
0
};
unsigned
char
sha1sum
[
20
];
unsigned
int
i
;
sha_ctx
ctx
;
HANDLE
file
;
A_SHAInit
(
&
ctx
);
A_SHAUpdate
(
&
ctx
,
buffer
,
buflen
);
A_SHAFinal
(
&
ctx
,
sha1sum
);
for
(
i
=
0
;
i
<
sizeof
(
sha1sum
);
i
++
)
sprintfW
(
&
profile
[
i
*
2
],
fmt
,
sha1sum
[
i
]
);
memcpy
(
&
profile
[
i
*
2
],
icm
,
sizeof
(
icm
)
);
strcatW
(
fullname
,
profile
);
file
=
CreateFileW
(
fullname
,
GENERIC_WRITE
,
0
,
NULL
,
CREATE_NEW
,
0
,
0
);
if
(
file
!=
INVALID_HANDLE_VALUE
)
{
DWORD
written
;
if
(
!
WriteFile
(
file
,
buffer
,
buflen
,
&
written
,
NULL
)
||
written
!=
buflen
)
ERR
(
"Unable to write color profile
\n
"
);
CloseHandle
(
file
);
}
HeapFree
(
GetProcessHeap
(),
0
,
buffer
);
}
else
strcatW
(
fullname
,
srgb
);
required
=
strlenW
(
fullname
)
+
1
;
required
=
strlenW
(
fullname
)
+
1
;
if
(
*
size
<
required
)
if
(
*
size
<
required
)
...
...
dlls/winex11.drv/x11drv.h
View file @
22f146f0
...
@@ -564,6 +564,7 @@ enum x11drv_atoms
...
@@ -564,6 +564,7 @@ enum x11drv_atoms
XATOM_KWM_DOCKWINDOW
,
XATOM_KWM_DOCKWINDOW
,
XATOM_DndProtocol
,
XATOM_DndProtocol
,
XATOM_DndSelection
,
XATOM_DndSelection
,
XATOM__ICC_PROFILE
,
XATOM__MOTIF_WM_HINTS
,
XATOM__MOTIF_WM_HINTS
,
XATOM__KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR
,
XATOM__KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR
,
XATOM__NET_SYSTEM_TRAY_OPCODE
,
XATOM__NET_SYSTEM_TRAY_OPCODE
,
...
...
dlls/winex11.drv/x11drv_main.c
View file @
22f146f0
...
@@ -128,6 +128,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
...
@@ -128,6 +128,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
"KWM_DOCKWINDOW"
,
"KWM_DOCKWINDOW"
,
"DndProtocol"
,
"DndProtocol"
,
"DndSelection"
,
"DndSelection"
,
"_ICC_PROFILE"
,
"_MOTIF_WM_HINTS"
,
"_MOTIF_WM_HINTS"
,
"_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR"
,
"_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR"
,
"_NET_SYSTEM_TRAY_OPCODE"
,
"_NET_SYSTEM_TRAY_OPCODE"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment