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
48aec004
Commit
48aec004
authored
Dec 07, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Use proper dllimports for shlwapi functions.
parent
d92b5971
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
67 deletions
+7
-67
Makefile.in
dlls/kernelbase/Makefile.in
+1
-1
main.c
dlls/shcore/main.c
+1
-0
shell32.spec
dlls/shell32/shell32.spec
+4
-4
shellord.c
dlls/shell32/shellord.c
+0
-62
Makefile.in
dlls/shlwapi/Makefile.in
+1
-0
shlwapi.h
include/shlwapi.h
+0
-0
No files found.
dlls/kernelbase/Makefile.in
View file @
48aec004
EXTRADEFS
=
-DWINBASEAPI
=
-DWINADVAPI
=
-DWINUSERAPI
=
EXTRADEFS
=
-DWINBASEAPI
=
-DWINADVAPI
=
-DWINUSERAPI
=
-DWINSHLWAPI
=
MODULE
=
kernelbase.dll
IMPORTLIB
=
kernelbase
IMPORTS
=
uuid ntdll winecrt0
...
...
dlls/shcore/main.c
View file @
48aec004
...
...
@@ -29,6 +29,7 @@
#include "ocidl.h"
#include "featurestagingapi.h"
#include "shellscalingapi.h"
#define WINSHLWAPI
#include "shlwapi.h"
#include "wine/debug.h"
...
...
dlls/shell32/shell32.spec
View file @
48aec004
...
...
@@ -225,10 +225,10 @@
511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr)
512 stdcall SHRegDeleteKeyW (long wstr)
520 stdcall -noname SHAllocShared(ptr long long)
521 stdcall -noname SHLockShared(long long)
522 stdcall -noname SHUnlockShared(ptr)
523 stdcall -noname SHFreeShared(long long)
520 stdcall -noname
-import
SHAllocShared(ptr long long)
521 stdcall -noname
-import
SHLockShared(long long)
522 stdcall -noname
-import
SHUnlockShared(ptr)
523 stdcall -noname
-import
SHFreeShared(long long)
524 stdcall -ordinal RealDriveType(long long)
525 stub RealDriveTypeFlags
526 stdcall SHFlushSFCache()
...
...
dlls/shell32/shellord.c
View file @
48aec004
...
...
@@ -84,24 +84,6 @@ extern INT WINAPI FindMRUData(HANDLE hList, LPCVOID lpData, DWORD cbData, LPI
extern
INT
WINAPI
EnumMRUListA
(
HANDLE
hList
,
INT
nItemPos
,
LPVOID
lpBuffer
,
DWORD
nBufferSize
);
/* Get a function pointer from a DLL handle */
#define GET_FUNC(func, module, name, fail) \
do { \
if (!func) { \
if (!SHELL32_h##module && !(SHELL32_h##module = LoadLibraryA(#module ".dll"))) return fail; \
func = (void*)GetProcAddress(SHELL32_h##module, name); \
if (!func) return fail; \
} \
} while (0)
/* Function pointers for GET_FUNC macro */
static
HMODULE
SHELL32_hshlwapi
=
NULL
;
static
HANDLE
(
WINAPI
*
pSHAllocShared
)(
LPCVOID
,
DWORD
,
DWORD
);
static
LPVOID
(
WINAPI
*
pSHLockShared
)(
HANDLE
,
DWORD
);
static
BOOL
(
WINAPI
*
pSHUnlockShared
)(
LPVOID
);
static
BOOL
(
WINAPI
*
pSHFreeShared
)(
HANDLE
,
DWORD
);
/*************************************************************************
* ParseFieldA [internal]
*
...
...
@@ -1324,50 +1306,6 @@ BOOL WINAPI IsUserAnAdmin(VOID)
}
/*************************************************************************
* SHAllocShared [SHELL32.520]
*
* See shlwapi.SHAllocShared
*/
HANDLE
WINAPI
SHAllocShared
(
const
void
*
lpvData
,
DWORD
dwSize
,
DWORD
dwProcId
)
{
GET_FUNC
(
pSHAllocShared
,
shlwapi
,
(
char
*
)
7
,
NULL
);
return
pSHAllocShared
(
lpvData
,
dwSize
,
dwProcId
);
}
/*************************************************************************
* SHLockShared [SHELL32.521]
*
* See shlwapi.SHLockShared
*/
LPVOID
WINAPI
SHLockShared
(
HANDLE
hShared
,
DWORD
dwProcId
)
{
GET_FUNC
(
pSHLockShared
,
shlwapi
,
(
char
*
)
8
,
NULL
);
return
pSHLockShared
(
hShared
,
dwProcId
);
}
/*************************************************************************
* SHUnlockShared [SHELL32.522]
*
* See shlwapi.SHUnlockShared
*/
BOOL
WINAPI
SHUnlockShared
(
LPVOID
lpView
)
{
GET_FUNC
(
pSHUnlockShared
,
shlwapi
,
(
char
*
)
9
,
FALSE
);
return
pSHUnlockShared
(
lpView
);
}
/*************************************************************************
* SHFreeShared [SHELL32.523]
*
* See shlwapi.SHFreeShared
*/
BOOL
WINAPI
SHFreeShared
(
HANDLE
hShared
,
DWORD
dwProcId
)
{
GET_FUNC
(
pSHFreeShared
,
shlwapi
,
(
char
*
)
10
,
FALSE
);
return
pSHFreeShared
(
hShared
,
dwProcId
);
}
/*************************************************************************
* SetAppStartingCursor [SHELL32.99]
*/
HRESULT
WINAPI
SetAppStartingCursor
(
HWND
u
,
DWORD
v
)
...
...
dlls/shlwapi/Makefile.in
View file @
48aec004
EXTRADEFS
=
-D_SHLWAPI_
MODULE
=
shlwapi.dll
IMPORTLIB
=
shlwapi
IMPORTS
=
uuid shcore user32 gdi32 advapi32 kernelbase
...
...
include/shlwapi.h
View file @
48aec004
This diff is collapsed.
Click to expand it.
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