Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sam Joan Roque-Worcel
wine
Commits
8eeed94f
Commit
8eeed94f
authored
23 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Export DestroyIcon32 from user32 and use GetProcAddress to call it
from FreeResource16.
parent
7e49205d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/user/user32.spec
+1
-0
1 addition, 0 deletions
dlls/user/user32.spec
include/cursoricon.h
+1
-4
1 addition, 4 deletions
include/cursoricon.h
loader/resource.c
+8
-3
8 additions, 3 deletions
loader/resource.c
windows/cursoricon.c
+5
-5
5 additions, 5 deletions
windows/cursoricon.c
with
15 additions
and
12 deletions
dlls/user/user32.spec
+
1
−
0
View file @
8eeed94f
...
...
@@ -672,6 +672,7 @@ debug_channels (accel caret class clipboard combo cursor dc dde ddeml dialog dri
@ stdcall CallWindowProc16(long long long long long) CallWindowProc16
@ stdcall CloseDriver16(long long long) CloseDriver16
@ stdcall CreateDialogIndirectParam16(long ptr long long long) CreateDialogIndirectParam16
@ stdcall DestroyIcon32(long long) DestroyIcon32
@ stdcall DefDriverProc16(long long long long long) DefDriverProc16
@ stdcall DialogBoxIndirectParam16(long long long long long) DialogBoxIndirectParam16
@ stdcall GetDriverModuleHandle16(long) GetDriverModuleHandle16
...
...
This diff is collapsed.
Click to expand it.
include/cursoricon.h
+
1
−
4
View file @
8eeed94f
...
...
@@ -80,9 +80,6 @@ extern HGLOBAL CURSORICON_Load( HINSTANCE hInstance, LPCWSTR name,
extern
HGLOBAL
CURSORICON_ExtCopy
(
HGLOBAL
handle
,
UINT
type
,
INT
desiredx
,
INT
desiredy
,
UINT
flags
);
extern
WORD
WINAPI
CURSORICON_Destroy
(
HGLOBAL16
handle
,
UINT16
flags
);
extern
void
CURSORICON_FreeModuleIcons
(
HMODULE
hModule
);
#endif
/* __WINE_CURSORICON_H */
This diff is collapsed.
Click to expand it.
loader/resource.c
+
8
−
3
View file @
8eeed94f
...
...
@@ -17,7 +17,6 @@
#include
"wine/winbase16.h"
#include
"wine/exception.h"
#include
"heap.h"
#include
"callback.h"
#include
"cursoricon.h"
#include
"module.h"
#include
"file.h"
...
...
@@ -409,6 +408,9 @@ LPVOID WINAPI LockResource( HGLOBAL handle )
return
LockResource16
(
handle
);
}
typedef
WORD
WINAPI
(
*
pDestroyIcon32Proc
)(
HGLOBAL16
handle
,
UINT16
flags
);
/**********************************************************************
* FreeResource (KERNEL.63)
* FreeResource16 (KERNEL32.@)
...
...
@@ -428,8 +430,11 @@ BOOL16 WINAPI FreeResource16( HGLOBAL16 handle )
GlobalFree16() */
if
(
retv
)
{
if
(
Callout
.
DestroyIcon32
)
retv
=
Callout
.
DestroyIcon32
(
handle
,
CID_RESOURCE
);
pDestroyIcon32Proc
proc
;
HMODULE
user
=
GetModuleHandleA
(
"user32.dll"
);
if
(
user
&&
(
proc
=
(
pDestroyIcon32Proc
)
GetProcAddress
(
user
,
"DestroyIcon32"
)))
retv
=
proc
(
handle
,
CID_RESOURCE
);
else
retv
=
GlobalFree16
(
handle
);
}
...
...
This diff is collapsed.
Click to expand it.
windows/cursoricon.c
+
5
−
5
View file @
8eeed94f
...
...
@@ -1293,7 +1293,7 @@ HCURSOR16 WINAPI CopyCursor16( HINSTANCE16 hInstance, HCURSOR16 hCursor )
* the Win95 one exactly, especially the return values, which
* depend on the setting of various flags.
*/
WORD
WINAPI
CURSORICON_
Destroy
(
HGLOBAL16
handle
,
UINT16
flags
)
WORD
WINAPI
Destroy
Icon32
(
HGLOBAL16
handle
,
UINT16
flags
)
{
WORD
retv
;
...
...
@@ -1330,7 +1330,7 @@ WORD WINAPI CURSORICON_Destroy( HGLOBAL16 handle, UINT16 flags )
*/
BOOL16
WINAPI
DestroyIcon16
(
HICON16
hIcon
)
{
return
CURSORICON_
Destroy
(
hIcon
,
0
);
return
Destroy
Icon32
(
hIcon
,
0
);
}
/***********************************************************************
...
...
@@ -1338,7 +1338,7 @@ BOOL16 WINAPI DestroyIcon16( HICON16 hIcon )
*/
BOOL
WINAPI
DestroyIcon
(
HICON
hIcon
)
{
return
CURSORICON_
Destroy
(
hIcon
,
CID_WIN32
);
return
Destroy
Icon32
(
hIcon
,
CID_WIN32
);
}
/***********************************************************************
...
...
@@ -1346,7 +1346,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon )
*/
BOOL16
WINAPI
DestroyCursor16
(
HCURSOR16
hCursor
)
{
return
CURSORICON_
Destroy
(
hCursor
,
0
);
return
Destroy
Icon32
(
hCursor
,
0
);
}
/***********************************************************************
...
...
@@ -1354,7 +1354,7 @@ BOOL16 WINAPI DestroyCursor16( HCURSOR16 hCursor )
*/
BOOL
WINAPI
DestroyCursor
(
HCURSOR
hCursor
)
{
return
CURSORICON_
Destroy
(
hCursor
,
CID_WIN32
);
return
Destroy
Icon32
(
hCursor
,
CID_WIN32
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment