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
86c4a369
Commit
86c4a369
authored
May 21, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Remove the CURSORICONINFO parameter in the CreateCursorIcon driver entry point.
parent
e25049e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
cursoricon.c
dlls/user32/cursoricon.c
+3
-3
driver.c
dlls/user32/driver.c
+3
-3
user_private.h
dlls/user32/user_private.h
+1
-3
No files found.
dlls/user32/cursoricon.c
View file @
86c4a369
...
...
@@ -1156,7 +1156,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi,
GetBitmapBits
(
hAndBits
,
sizeAnd
,
info
+
1
);
GetBitmapBits
(
hXorBits
,
sizeXor
,
(
char
*
)(
info
+
1
)
+
sizeAnd
);
release_icon_ptr
(
hObj
,
info
);
USER_Driver
->
pCreateCursorIcon
(
hObj
,
&
info
->
data
);
USER_Driver
->
pCreateCursorIcon
(
hObj
);
}
else
{
...
...
@@ -1776,7 +1776,7 @@ HICON WINAPI CopyIcon( HICON hIcon )
ptrNew
->
mask
=
copy_bitmap
(
ptrOld
->
mask
);
release_icon_ptr
(
hIcon
,
ptrOld
);
release_icon_ptr
(
hNew
,
ptrNew
);
USER_Driver
->
pCreateCursorIcon
(
hNew
,
&
ptrNew
->
data
);
USER_Driver
->
pCreateCursorIcon
(
hNew
);
return
hNew
;
}
...
...
@@ -2241,7 +2241,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
}
}
release_icon_ptr
(
hObj
,
info
);
USER_Driver
->
pCreateCursorIcon
(
hObj
,
&
info
->
data
);
USER_Driver
->
pCreateCursorIcon
(
hObj
);
}
return
hObj
;
}
...
...
dlls/user32/driver.c
View file @
86c4a369
...
...
@@ -217,7 +217,7 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout )
return
-
1
;
}
static
void
CDECL
nulldrv_CreateCursorIcon
(
HCURSOR
cursor
,
struct
tagCURSORICONINFO
*
info
)
static
void
CDECL
nulldrv_CreateCursorIcon
(
HCURSOR
cursor
)
{
}
...
...
@@ -570,9 +570,9 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout )
return
load_driver
()
->
pVkKeyScanEx
(
ch
,
layout
);
}
static
void
CDECL
loaderdrv_CreateCursorIcon
(
HCURSOR
cursor
,
struct
tagCURSORICONINFO
*
info
)
static
void
CDECL
loaderdrv_CreateCursorIcon
(
HCURSOR
cursor
)
{
load_driver
()
->
pCreateCursorIcon
(
cursor
,
info
);
load_driver
()
->
pCreateCursorIcon
(
cursor
);
}
static
void
CDECL
loaderdrv_DestroyCursorIcon
(
HCURSOR
cursor
)
...
...
dlls/user32/user_private.h
View file @
86c4a369
...
...
@@ -51,8 +51,6 @@ enum wine_internal_message
WM_WINE_LAST_DRIVER_MSG
=
0x80001fff
};
struct
tagCURSORICONINFO
;
typedef
struct
tagUSER_DRIVER
{
/* keyboard functions */
HKL
(
CDECL
*
pActivateKeyboardLayout
)(
HKL
,
UINT
);
...
...
@@ -68,7 +66,7 @@ typedef struct tagUSER_DRIVER {
BOOL
(
CDECL
*
pUnloadKeyboardLayout
)(
HKL
);
SHORT
(
CDECL
*
pVkKeyScanEx
)(
WCHAR
,
HKL
);
/* cursor/icon functions */
void
(
CDECL
*
pCreateCursorIcon
)(
HCURSOR
,
struct
tagCURSORICONINFO
*
);
void
(
CDECL
*
pCreateCursorIcon
)(
HCURSOR
);
void
(
CDECL
*
pDestroyCursorIcon
)(
HCURSOR
);
void
(
CDECL
*
pSetCursor
)(
HCURSOR
);
BOOL
(
CDECL
*
pGetCursorPos
)(
LPPOINT
);
...
...
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