Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
462721a1
Commit
462721a1
authored
Mar 17, 2013
by
Ken Thomases
Committed by
Alexandre Julliard
Mar 25, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Move create_cgimage_from_icon_bitmaps() into new module, image.c.
parent
322ce433
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
158 additions
and
126 deletions
+158
-126
Makefile.in
dlls/winemac.drv/Makefile.in
+1
-0
image.c
dlls/winemac.drv/image.c
+152
-0
macdrv.h
dlls/winemac.drv/macdrv.h
+5
-0
mouse.c
dlls/winemac.drv/mouse.c
+0
-126
No files found.
dlls/winemac.drv/Makefile.in
View file @
462721a1
...
@@ -9,6 +9,7 @@ C_SRCS = \
...
@@ -9,6 +9,7 @@ C_SRCS = \
dragdrop.c
\
dragdrop.c
\
event.c
\
event.c
\
gdi.c
\
gdi.c
\
image.c
\
keyboard.c
\
keyboard.c
\
macdrv_main.c
\
macdrv_main.c
\
mouse.c
\
mouse.c
\
...
...
dlls/winemac.drv/image.c
0 → 100644
View file @
462721a1
/*
* MACDRV image functions
*
* Copyright 2013 Ken Thomases for CodeWeavers Inc.
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "macdrv.h"
#include "winuser.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
image
);
/***********************************************************************
* create_cgimage_from_icon_bitmaps
*/
CGImageRef
create_cgimage_from_icon_bitmaps
(
HDC
hdc
,
HANDLE
icon
,
HBITMAP
hbmColor
,
unsigned
char
*
color_bits
,
int
color_size
,
HBITMAP
hbmMask
,
unsigned
char
*
mask_bits
,
int
mask_size
,
int
width
,
int
height
,
int
istep
)
{
int
i
,
has_alpha
=
FALSE
;
DWORD
*
ptr
;
CGBitmapInfo
alpha_format
;
CGColorSpaceRef
colorspace
;
CFDataRef
data
;
CGDataProviderRef
provider
;
CGImageRef
cgimage
;
/* draw the cursor frame to a temporary buffer then create a CGImage from that */
memset
(
color_bits
,
0x00
,
color_size
);
SelectObject
(
hdc
,
hbmColor
);
if
(
!
DrawIconEx
(
hdc
,
0
,
0
,
icon
,
width
,
height
,
istep
,
NULL
,
DI_NORMAL
))
{
WARN
(
"Could not draw frame %d (walk past end of frames).
\n
"
,
istep
);
return
NULL
;
}
/* check if the cursor frame was drawn with an alpha channel */
for
(
i
=
0
,
ptr
=
(
DWORD
*
)
color_bits
;
i
<
width
*
height
;
i
++
,
ptr
++
)
if
((
has_alpha
=
(
*
ptr
&
0xff000000
)
!=
0
))
break
;
if
(
has_alpha
)
alpha_format
=
kCGImageAlphaFirst
;
else
alpha_format
=
kCGImageAlphaNoneSkipFirst
;
colorspace
=
CGColorSpaceCreateWithName
(
kCGColorSpaceGenericRGB
);
if
(
!
colorspace
)
{
WARN
(
"failed to create colorspace
\n
"
);
return
NULL
;
}
data
=
CFDataCreate
(
NULL
,
(
UInt8
*
)
color_bits
,
color_size
);
if
(
!
data
)
{
WARN
(
"failed to create data
\n
"
);
CGColorSpaceRelease
(
colorspace
);
return
NULL
;
}
provider
=
CGDataProviderCreateWithCFData
(
data
);
CFRelease
(
data
);
if
(
!
provider
)
{
WARN
(
"failed to create data provider
\n
"
);
CGColorSpaceRelease
(
colorspace
);
return
NULL
;
}
cgimage
=
CGImageCreate
(
width
,
height
,
8
,
32
,
width
*
4
,
colorspace
,
alpha_format
|
kCGBitmapByteOrder32Little
,
provider
,
NULL
,
FALSE
,
kCGRenderingIntentDefault
);
CGDataProviderRelease
(
provider
);
CGColorSpaceRelease
(
colorspace
);
if
(
!
cgimage
)
{
WARN
(
"failed to create image
\n
"
);
return
NULL
;
}
/* if no alpha channel was drawn then generate it from the mask */
if
(
!
has_alpha
)
{
unsigned
int
width_bytes
=
(
width
+
31
)
/
32
*
4
;
CGImageRef
cgmask
,
temp
;
/* draw the cursor mask to a temporary buffer */
memset
(
mask_bits
,
0xFF
,
mask_size
);
SelectObject
(
hdc
,
hbmMask
);
if
(
!
DrawIconEx
(
hdc
,
0
,
0
,
icon
,
width
,
height
,
istep
,
NULL
,
DI_MASK
))
{
WARN
(
"Failed to draw frame mask %d.
\n
"
,
istep
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
data
=
CFDataCreate
(
NULL
,
(
UInt8
*
)
mask_bits
,
mask_size
);
if
(
!
data
)
{
WARN
(
"failed to create data
\n
"
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
provider
=
CGDataProviderCreateWithCFData
(
data
);
CFRelease
(
data
);
if
(
!
provider
)
{
WARN
(
"failed to create data provider
\n
"
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
cgmask
=
CGImageMaskCreate
(
width
,
height
,
1
,
1
,
width_bytes
,
provider
,
NULL
,
FALSE
);
CGDataProviderRelease
(
provider
);
if
(
!
cgmask
)
{
WARN
(
"failed to create mask
\n
"
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
temp
=
CGImageCreateWithMask
(
cgimage
,
cgmask
);
CGImageRelease
(
cgmask
);
CGImageRelease
(
cgimage
);
if
(
!
temp
)
{
WARN
(
"failed to create masked image
\n
"
);
return
NULL
;
}
cgimage
=
temp
;
}
return
cgimage
;
}
dlls/winemac.drv/macdrv.h
View file @
462721a1
...
@@ -173,4 +173,9 @@ extern struct opengl_funcs *macdrv_wine_get_wgl_driver(PHYSDEV dev, UINT version
...
@@ -173,4 +173,9 @@ extern struct opengl_funcs *macdrv_wine_get_wgl_driver(PHYSDEV dev, UINT version
extern
void
sync_gl_view
(
struct
macdrv_win_data
*
data
)
DECLSPEC_HIDDEN
;
extern
void
sync_gl_view
(
struct
macdrv_win_data
*
data
)
DECLSPEC_HIDDEN
;
extern
void
set_gl_view_parent
(
HWND
hwnd
,
HWND
parent
)
DECLSPEC_HIDDEN
;
extern
void
set_gl_view_parent
(
HWND
hwnd
,
HWND
parent
)
DECLSPEC_HIDDEN
;
extern
CGImageRef
create_cgimage_from_icon_bitmaps
(
HDC
hdc
,
HANDLE
icon
,
HBITMAP
hbmColor
,
unsigned
char
*
color_bits
,
int
color_size
,
HBITMAP
hbmMask
,
unsigned
char
*
mask_bits
,
int
mask_size
,
int
width
,
int
height
,
int
istep
)
DECLSPEC_HIDDEN
;
#endif
/* __WINE_MACDRV_H */
#endif
/* __WINE_MACDRV_H */
dlls/winemac.drv/mouse.c
View file @
462721a1
...
@@ -467,132 +467,6 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width,
...
@@ -467,132 +467,6 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width,
/***********************************************************************
/***********************************************************************
* create_cgimage_from_icon_bitmaps
*/
static
CGImageRef
create_cgimage_from_icon_bitmaps
(
HDC
hdc
,
HANDLE
icon
,
HBITMAP
hbmColor
,
unsigned
char
*
color_bits
,
int
color_size
,
HBITMAP
hbmMask
,
unsigned
char
*
mask_bits
,
int
mask_size
,
int
width
,
int
height
,
int
istep
)
{
int
i
,
has_alpha
=
FALSE
;
DWORD
*
ptr
;
CGBitmapInfo
alpha_format
;
CGColorSpaceRef
colorspace
;
CFDataRef
data
;
CGDataProviderRef
provider
;
CGImageRef
cgimage
;
/* draw the cursor frame to a temporary buffer then create a CGImage from that */
memset
(
color_bits
,
0x00
,
color_size
);
SelectObject
(
hdc
,
hbmColor
);
if
(
!
DrawIconEx
(
hdc
,
0
,
0
,
icon
,
width
,
height
,
istep
,
NULL
,
DI_NORMAL
))
{
WARN
(
"Could not draw frame %d (walk past end of frames).
\n
"
,
istep
);
return
NULL
;
}
/* check if the cursor frame was drawn with an alpha channel */
for
(
i
=
0
,
ptr
=
(
DWORD
*
)
color_bits
;
i
<
width
*
height
;
i
++
,
ptr
++
)
if
((
has_alpha
=
(
*
ptr
&
0xff000000
)
!=
0
))
break
;
if
(
has_alpha
)
alpha_format
=
kCGImageAlphaFirst
;
else
alpha_format
=
kCGImageAlphaNoneSkipFirst
;
colorspace
=
CGColorSpaceCreateWithName
(
kCGColorSpaceGenericRGB
);
if
(
!
colorspace
)
{
WARN
(
"failed to create colorspace
\n
"
);
return
NULL
;
}
data
=
CFDataCreate
(
NULL
,
(
UInt8
*
)
color_bits
,
color_size
);
if
(
!
data
)
{
WARN
(
"failed to create data
\n
"
);
CGColorSpaceRelease
(
colorspace
);
return
NULL
;
}
provider
=
CGDataProviderCreateWithCFData
(
data
);
CFRelease
(
data
);
if
(
!
provider
)
{
WARN
(
"failed to create data provider
\n
"
);
CGColorSpaceRelease
(
colorspace
);
return
NULL
;
}
cgimage
=
CGImageCreate
(
width
,
height
,
8
,
32
,
width
*
4
,
colorspace
,
alpha_format
|
kCGBitmapByteOrder32Little
,
provider
,
NULL
,
FALSE
,
kCGRenderingIntentDefault
);
CGDataProviderRelease
(
provider
);
CGColorSpaceRelease
(
colorspace
);
if
(
!
cgimage
)
{
WARN
(
"failed to create image
\n
"
);
return
NULL
;
}
/* if no alpha channel was drawn then generate it from the mask */
if
(
!
has_alpha
)
{
unsigned
int
width_bytes
=
(
width
+
31
)
/
32
*
4
;
CGImageRef
cgmask
,
temp
;
/* draw the cursor mask to a temporary buffer */
memset
(
mask_bits
,
0xFF
,
mask_size
);
SelectObject
(
hdc
,
hbmMask
);
if
(
!
DrawIconEx
(
hdc
,
0
,
0
,
icon
,
width
,
height
,
istep
,
NULL
,
DI_MASK
))
{
WARN
(
"Failed to draw frame mask %d.
\n
"
,
istep
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
data
=
CFDataCreate
(
NULL
,
(
UInt8
*
)
mask_bits
,
mask_size
);
if
(
!
data
)
{
WARN
(
"failed to create data
\n
"
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
provider
=
CGDataProviderCreateWithCFData
(
data
);
CFRelease
(
data
);
if
(
!
provider
)
{
WARN
(
"failed to create data provider
\n
"
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
cgmask
=
CGImageMaskCreate
(
width
,
height
,
1
,
1
,
width_bytes
,
provider
,
NULL
,
FALSE
);
CGDataProviderRelease
(
provider
);
if
(
!
cgmask
)
{
WARN
(
"failed to create mask
\n
"
);
CGImageRelease
(
cgimage
);
return
NULL
;
}
temp
=
CGImageCreateWithMask
(
cgimage
,
cgmask
);
CGImageRelease
(
cgmask
);
CGImageRelease
(
cgimage
);
if
(
!
temp
)
{
WARN
(
"failed to create masked image
\n
"
);
return
NULL
;
}
cgimage
=
temp
;
}
return
cgimage
;
}
/***********************************************************************
* create_cursor_frame
* create_cursor_frame
*
*
* Create a frame dictionary for a cursor from a Windows icon.
* Create a frame dictionary for a cursor from a Windows icon.
...
...
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