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
89df78e2
Commit
89df78e2
authored
Dec 30, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Move the RunDLL_CallEntry16 implementation to shell.dll.
parent
c3e9de0b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
29 deletions
+30
-29
shell.c
dlls/shell.dll16/shell.c
+25
-0
shell.dll16.spec
dlls/shell.dll16/shell.dll16.spec
+4
-0
control.c
dlls/shell32/control.c
+0
-28
shell32.spec
dlls/shell32/shell32.spec
+1
-1
No files found.
dlls/shell.dll16/shell.c
View file @
89df78e2
...
...
@@ -612,3 +612,28 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
return
HINSTANCE_16
(
WOWShellExecute
(
HWND_32
(
hWnd
),
lpOperation
,
lpFile
,
lpParameters
,
lpDirectory
,
iShowCmd
,
SHELL_Execute16
));
}
/*************************************************************************
* RunDLL_CallEntry16
*
* Only exported from shell32 on Windows, probably imported
* from shell through the 16/32 thunks.
*/
void
WINAPI
RunDLL_CallEntry16
(
DWORD
proc
,
HWND
hwnd
,
HINSTANCE
inst
,
LPCSTR
cmdline
,
INT
cmdshow
)
{
WORD
args
[
5
];
SEGPTR
cmdline_seg
;
TRACE
(
"proc %x hwnd %p inst %p cmdline %s cmdshow %d
\n
"
,
proc
,
hwnd
,
inst
,
debugstr_a
(
cmdline
),
cmdshow
);
cmdline_seg
=
MapLS
(
cmdline
);
args
[
4
]
=
HWND_16
(
hwnd
);
args
[
3
]
=
MapHModuleLS
(
inst
);
args
[
2
]
=
SELECTOROF
(
cmdline_seg
);
args
[
1
]
=
OFFSETOF
(
cmdline_seg
);
args
[
0
]
=
cmdshow
;
WOWCallback16Ex
(
proc
,
WCB16_PASCAL
,
sizeof
(
args
),
args
,
NULL
);
UnMapLS
(
cmdline_seg
);
}
dlls/shell.dll16/shell.dll16.spec
View file @
89df78e2
...
...
@@ -43,3 +43,7 @@
# 402 _RUNDLLCHECKDRIVE
#32 WCI
################################################################
# Wine extensions: functions needed by shell32
@ stdcall -arch=win32 RunDLL_CallEntry16(long long ptr str long)
dlls/shell32/control.c
View file @
89df78e2
...
...
@@ -29,8 +29,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "wine/winbase16.h"
#include "wownt32.h"
#include "wine/debug.h"
#include "cpl.h"
#include "wine/unicode.h"
...
...
@@ -878,32 +876,6 @@ HRESULT WINAPI Control_FillCache_RunDLLA(HWND hWnd, HANDLE hModule, DWORD w, DWO
return
Control_FillCache_RunDLLW
(
hWnd
,
hModule
,
w
,
x
);
}
/*************************************************************************
* RunDLL_CallEntry16 [SHELL32.122]
* the name is probably wrong
*/
void
WINAPI
RunDLL_CallEntry16
(
DWORD
proc
,
HWND
hwnd
,
HINSTANCE
inst
,
LPCSTR
cmdline
,
INT
cmdshow
)
{
#ifdef __i386__
WORD
args
[
5
];
SEGPTR
cmdline_seg
;
TRACE
(
"proc %x hwnd %p inst %p cmdline %s cmdshow %d
\n
"
,
proc
,
hwnd
,
inst
,
debugstr_a
(
cmdline
),
cmdshow
);
cmdline_seg
=
MapLS
(
cmdline
);
args
[
4
]
=
HWND_16
(
hwnd
);
args
[
3
]
=
MapHModuleLS
(
inst
);
args
[
2
]
=
SELECTOROF
(
cmdline_seg
);
args
[
1
]
=
OFFSETOF
(
cmdline_seg
);
args
[
0
]
=
cmdshow
;
WOWCallback16Ex
(
proc
,
WCB16_PASCAL
,
sizeof
(
args
),
args
,
NULL
);
UnMapLS
(
cmdline_seg
);
#endif
}
/*************************************************************************
* CallCPLEntry16 [SHELL32.166]
*
...
...
dlls/shell32/shell32.spec
View file @
89df78e2
...
...
@@ -114,7 +114,7 @@
119 stdcall -noname IsLFNDrive(ptr) IsLFNDriveAW
120 stdcall -noname FileMenu_AbortInitMenu()
121 stdcall -noname SHFlushClipboard()
122 stdcall -
noname RunDLL_CallEntry16(long long long str long) #name wrong?
122 stdcall -
private @(long long long str long) shell.dll16.RunDLL_CallEntry16
123 stdcall -noname SHFreeUnusedLibraries()
124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long)
125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)
...
...
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