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
1172e66e
Commit
1172e66e
authored
Dec 05, 2022
by
Alex Henrie
Committed by
Alexandre Julliard
Dec 06, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Move prototypes not in Windows's setupapi.h to setupapi_private.h.
And delete the ones we don't need.
parent
a1ae33a3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
23 deletions
+12
-23
setupapi_private.h
dlls/setupapi/setupapi_private.h
+8
-0
stringtable.c
dlls/setupapi/stringtable.c
+1
-0
misc.c
dlls/setupapi/tests/misc.c
+3
-1
setupapi.h
include/setupapi.h
+0
-22
No files found.
dlls/setupapi/setupapi_private.h
View file @
1172e66e
...
...
@@ -87,6 +87,14 @@ static inline WCHAR *strdupAtoW( const char *str )
return
ret
;
}
/* exported functions not in public headers */
void
WINAPI
MyFree
(
void
*
mem
);
void
*
WINAPI
MyMalloc
(
DWORD
size
)
__WINE_ALLOC_SIZE
(
1
)
__WINE_DEALLOC
(
MyFree
)
__WINE_MALLOC
;
void
*
WINAPI
MyRealloc
(
void
*
src
,
DWORD
size
)
__WINE_ALLOC_SIZE
(
2
)
__WINE_DEALLOC
(
MyFree
);
WCHAR
*
WINAPI
MultiByteToUnicode
(
const
char
*
str
,
UINT
code_page
)
__WINE_DEALLOC
(
MyFree
)
__WINE_MALLOC
;
char
*
WINAPI
UnicodeToMultiByte
(
const
WCHAR
*
str
,
UINT
code_page
)
__WINE_DEALLOC
(
MyFree
)
__WINE_MALLOC
;
/* string substitutions */
struct
inf_file
;
...
...
dlls/setupapi/stringtable.c
View file @
1172e66e
...
...
@@ -27,6 +27,7 @@
#include "winreg.h"
#include "winnls.h"
#include "setupapi.h"
#include "setupapi_private.h"
#include "wine/debug.h"
...
...
dlls/setupapi/tests/misc.c
View file @
1172e66e
...
...
@@ -47,6 +47,7 @@ static CHAR CURR_DIR[MAX_PATH];
* - copy styles
*/
static
void
(
WINAPI
*
pMyFree
)(
void
*
);
static
BOOL
(
WINAPI
*
pSetupGetFileCompressionInfoExA
)(
PCSTR
,
PSTR
,
DWORD
,
PDWORD
,
PDWORD
,
PDWORD
,
PUINT
);
static
BOOL
(
WINAPI
*
pSetupQueryInfOriginalFileInformationA
)(
PSP_INF_INFORMATION
,
UINT
,
PSP_ALTPLATFORM_INFO
,
PSP_ORIGINAL_FILE_INFO_A
);
...
...
@@ -470,7 +471,7 @@ static void test_SetupGetFileCompressionInfo(void)
ok
(
target_size
==
sizeof
(
uncompressed
),
"got %ld
\n
"
,
target_size
);
ok
(
type
==
FILE_COMPRESSION_NONE
,
"got %d, expected FILE_COMPRESSION_NONE
\n
"
,
type
);
MyFree
(
name
);
p
MyFree
(
name
);
DeleteFileA
(
source
);
}
...
...
@@ -907,6 +908,7 @@ START_TEST(misc)
{
HMODULE
hsetupapi
=
GetModuleHandleA
(
"setupapi.dll"
);
pMyFree
=
(
void
*
)
GetProcAddress
(
hsetupapi
,
"MyFree"
);
pSetupGetFileCompressionInfoExA
=
(
void
*
)
GetProcAddress
(
hsetupapi
,
"SetupGetFileCompressionInfoExA"
);
pSetupQueryInfOriginalFileInformationA
=
(
void
*
)
GetProcAddress
(
hsetupapi
,
"SetupQueryInfOriginalFileInformationA"
);
...
...
include/setupapi.h
View file @
1172e66e
...
...
@@ -1417,26 +1417,9 @@ typedef enum {
/* SetupUninstallOEMInf Flags values */
#define SUOI_FORCEDELETE 0x00000001
LONG
WINAPI
AddTagToGroupOrderList
(
PCWSTR
lpGroupName
,
DWORD
dwUnknown2
,
DWORD
dwUnknown3
);
DWORD
WINAPI
CaptureAndConvertAnsiArg
(
PCSTR
lpSrc
,
PWSTR
*
lpDst
);
DWORD
WINAPI
CaptureStringArg
(
PCWSTR
lpSrc
,
PWSTR
*
lpDst
);
BOOL
WINAPI
DelayedMove
(
PCWSTR
lpExistingFileName
,
PCWSTR
lpNewFileName
);
BOOL
WINAPI
DoesUserHavePrivilege
(
PCWSTR
lpPrivilegeName
);
PWSTR
WINAPI
DuplicateString
(
PCWSTR
lpSrc
);
BOOL
WINAPI
EnablePrivilege
(
PCWSTR
lpPrivilegeName
,
BOOL
bEnable
);
BOOL
WINAPI
FileExists
(
PCWSTR
lpFileName
,
PWIN32_FIND_DATAW
lpFileFindData
);
void
WINAPI
InstallHinfSectionA
(
HWND
hwnd
,
HINSTANCE
handle
,
PCSTR
cmdline
,
INT
show
);
void
WINAPI
InstallHinfSectionW
(
HWND
hwnd
,
HINSTANCE
handle
,
PCWSTR
cmdline
,
INT
show
);
#define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection)
BOOL
WINAPI
IsUserAdmin
(
VOID
);
PWSTR
WINAPI
MultiByteToUnicode
(
PCSTR
lpMultiByteStr
,
UINT
uCodePage
);
VOID
WINAPI
MyFree
(
PVOID
lpMem
);
PVOID
WINAPI
MyMalloc
(
DWORD
dwSize
);
PVOID
WINAPI
MyRealloc
(
PVOID
lpSrc
,
DWORD
dwSize
);
DWORD
WINAPI
OpenAndMapForRead
(
PCWSTR
,
PDWORD
,
PHANDLE
,
PHANDLE
,
PVOID
*
);
LONG
WINAPI
QueryRegistryValue
(
HKEY
,
PCWSTR
,
PBYTE
*
,
PDWORD
,
PDWORD
);
/* RetreiveFileSecurity is not a typo, as per Microsoft's dlls */
DWORD
WINAPI
RetreiveFileSecurity
(
PCWSTR
,
PSECURITY_DESCRIPTOR
*
);
BOOL
WINAPI
SetupAddSectionToDiskSpaceListA
(
HDSKSPC
,
HINF
,
HINF
,
PCSTR
,
UINT
,
PVOID
,
UINT
);
BOOL
WINAPI
SetupAddSectionToDiskSpaceListW
(
HDSKSPC
,
HINF
,
HINF
,
PCWSTR
,
UINT
,
PVOID
,
UINT
);
#define SetupAddSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddSectionToDiskSpaceList)
...
...
@@ -1875,11 +1858,6 @@ BOOL WINAPI SetupUninstallNewlyCopiedInfs(HSPFILEQ, DWORD, PVOID);
BOOL
WINAPI
SetupVerifyInfFileA
(
PCSTR
,
PSP_ALTPLATFORM_INFO
,
PSP_INF_SIGNER_INFO_A
);
BOOL
WINAPI
SetupVerifyInfFileW
(
PCWSTR
,
PSP_ALTPLATFORM_INFO
,
PSP_INF_SIGNER_INFO_W
);
#define SetupVerifyInfFile WINELIB_NAME_AW(SetupVerifyInfFile)
DWORD
WINAPI
StampFileSecurity
(
PCWSTR
,
PSECURITY_DESCRIPTOR
);
DWORD
WINAPI
TakeOwnershipOfFile
(
PCWSTR
);
PSTR
WINAPI
UnicodeToMultiByte
(
PCWSTR
lpUnicodeStr
,
UINT
uCodePage
);
BOOL
WINAPI
UnmapAndCloseFile
(
HANDLE
,
HANDLE
,
PVOID
);
#ifdef __cplusplus
}
...
...
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