Skip to content

W
wine-winehq
Commit 5cf56a3a authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Removed LPxxx handle types that don't exist under Windows.

parent beb1fb16
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 43 deletions
dlls/advapi32/registry.c
View file @ 5cf56a3a
......@@ -160,7 +160,7 @@ inline static HKEY get_special_root_hkey( HKEY hkey )
*/
DWORD WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class,
DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
LPHKEY retkey, LPDWORD dispos )
PHKEY retkey, LPDWORD dispos )
{
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW, classW;
......@@ -190,7 +190,7 @@ DWORD WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR cl
*/
DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class,
DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
LPHKEY retkey, LPDWORD dispos )
PHKEY retkey, LPDWORD dispos )
{
OBJECT_ATTRIBUTES attr;
UNICODE_STRING classW;
......@@ -227,7 +227,7 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR clas
/******************************************************************************
* RegCreateKeyW [ADVAPI32.@]
*/
DWORD WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR name, LPHKEY retkey )
DWORD WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey )
{
/* FIXME: previous implementation converted ERROR_INVALID_HANDLE to ERROR_BADKEY, */
/* but at least my version of NT (4.0 SP5) doesn't do this. -- AJ */
......@@ -239,7 +239,7 @@ DWORD WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR name, LPHKEY retkey )
/******************************************************************************
* RegCreateKeyA [ADVAPI32.@]
*/
DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR name, PHKEY retkey )
{
return RegCreateKeyExA( hkey, name, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_ALL_ACCESS, NULL, retkey, NULL );
......@@ -268,7 +268,7 @@ DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
* NOTES
* in case of failing is retkey = 0
*/
DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM access, LPHKEY retkey )
DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM access, PHKEY retkey )
{
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
......@@ -289,7 +289,7 @@ DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM acce
/******************************************************************************
* RegOpenKeyExA [ADVAPI32.@]
*/
DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, LPHKEY retkey )
DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, PHKEY retkey )
{
OBJECT_ATTRIBUTES attr;
STRING nameA;
......@@ -331,7 +331,7 @@ DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acces
* NOTES
* in case of failing is retkey = 0
*/
DWORD WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, LPHKEY retkey )
DWORD WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey )
{
return RegOpenKeyExW( hkey, name, 0, KEY_ALL_ACCESS, retkey );
}
......@@ -340,7 +340,7 @@ DWORD WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, LPHKEY retkey )
/******************************************************************************
* RegOpenKeyA [ADVAPI32.@]
*/
DWORD WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
DWORD WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey )
{
return RegOpenKeyExA( hkey, name, 0, KEY_ALL_ACCESS, retkey );
}
......@@ -1793,7 +1793,7 @@ DWORD WINAPI RegFlushKey( HKEY hkey )
* phkResult [I] Address of buffer for remote registry handle
*/
LONG WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey,
LPHKEY phkResult )
PHKEY phkResult )
{
TRACE("(%s,%x,%p): stub\n",debugstr_w(lpMachineName),hKey,phkResult);
......@@ -1810,7 +1810,7 @@ LONG WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey,
/******************************************************************************
* RegConnectRegistryA [ADVAPI32.@]
*/
LONG WINAPI RegConnectRegistryA( LPCSTR machine, HKEY hkey, LPHKEY reskey )
LONG WINAPI RegConnectRegistryA( LPCSTR machine, HKEY hkey, PHKEY reskey )
{
LPWSTR machineW = HEAP_strdupAtoW( GetProcessHeap(), 0, machine );
DWORD ret = RegConnectRegistryW( machineW, hkey, reskey );
......
dlls/kernel/registry16.c
View file @ 5cf56a3a
......@@ -28,13 +28,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(reg);
DWORD (WINAPI *pRegCloseKey)(HKEY);
DWORD (WINAPI *pRegCreateKeyA)(HKEY,LPCSTR,LPHKEY);
DWORD (WINAPI *pRegCreateKeyA)(HKEY,LPCSTR,PHKEY);
DWORD (WINAPI *pRegDeleteKeyA)(HKEY,LPCSTR);
DWORD (WINAPI *pRegDeleteValueA)(HKEY,LPCSTR);
DWORD (WINAPI *pRegEnumKeyA)(HKEY,DWORD,LPSTR,DWORD);
DWORD (WINAPI *pRegEnumValueA)(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD (WINAPI *pRegFlushKey)(HKEY);
DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,LPHKEY);
DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,PHKEY);
DWORD (WINAPI *pRegQueryValueA)(HKEY,LPCSTR,LPSTR,LPLONG);
DWORD (WINAPI *pRegQueryValueExA)(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD (WINAPI *pRegSetValueA)(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
......@@ -88,7 +88,7 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
/******************************************************************************
* RegOpenKey [KERNEL.217]
*/
DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, PHKEY retkey )
{
if (!advapi32) init_func_ptrs();
fix_win16_hkey( &hkey );
......@@ -98,7 +98,7 @@ DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
/******************************************************************************
* RegCreateKey [KERNEL.218]
*/
DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, PHKEY retkey )
{
if (!advapi32) init_func_ptrs();
fix_win16_hkey( &hkey );
......
dlls/setupapi/setupx_main.c
View file @ 5cf56a3a
......@@ -74,7 +74,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
/***********************************************************************
* SURegOpenKey (SETUPX.47)
*/
DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, PHKEY retkey )
{
FIXME("(%x,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey);
return RegOpenKeyA( hkey, lpszSubKey, retkey );
......
dlls/shell32/shellreg.c
View file @ 5cf56a3a
......@@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
HRESULT WINAPI SHRegOpenKeyA(
HKEY hKey,
LPSTR lpSubKey,
LPHKEY phkResult)
PHKEY phkResult)
{
TRACE("(0x%08x, %s, %p)\n", hKey, debugstr_a(lpSubKey), phkResult);
return RegOpenKeyA(hKey, lpSubKey, phkResult);
......@@ -57,7 +57,7 @@ HRESULT WINAPI SHRegOpenKeyA(
HRESULT WINAPI SHRegOpenKeyW (
HKEY hkey,
LPCWSTR lpszSubKey,
LPHKEY retkey)
PHKEY retkey)
{
WARN("0x%04x %s %p\n",hkey,debugstr_w(lpszSubKey),retkey);
return RegOpenKeyW( hkey, lpszSubKey, retkey );
......@@ -162,7 +162,7 @@ static inline void fix_win16_hkey( HKEY *hkey )
/******************************************************************************
* RegOpenKey [SHELL.1]
*/
DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, PHKEY retkey )
{
fix_win16_hkey( &hkey );
return RegOpenKeyA( hkey, name, retkey );
......@@ -171,7 +171,7 @@ DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
/******************************************************************************
* RegCreateKey [SHELL.2]
*/
DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, PHKEY retkey )
{
fix_win16_hkey( &hkey );
return RegCreateKeyA( hkey, name, retkey );
......
dlls/shlwapi/ordinal.c
View file @ 5cf56a3a
......@@ -1129,7 +1129,7 @@ BOOL WINAPI SHLWAPI_171(LPVOID x, LPVOID y)
* IInternetSecurityMgrSite
* IShellView
*/
HRESULT WINAPI SHLWAPI_172(IUnknown *lpUnknown, LPHWND lphWnd)
HRESULT WINAPI SHLWAPI_172(IUnknown *lpUnknown, PHWND lphWnd)
{
/* FIXME: Wine has no header for this object */
static const GUID IID_IInternetSecurityMgrSite = { 0x79eac9ed,
......
include/mmsystem.h
View file @ 5cf56a3a
......@@ -43,6 +43,15 @@ DECLARE_HANDLE(HMIXER);
DECLARE_HANDLE(HMIXEROBJ);
DECLARE_HANDLE(HMMIO);
typedef HMIDI *LPHMIDI;
typedef HMIDIIN *LPHMIDIIN;
typedef HMIDIOUT *LPHMIDIOUT;
typedef HMIDISTRM *LPHMIDISTRM;
typedef HMIXER *LPHMIXER;
typedef HMIXEROBJ *LPHMIXEROBJ;
typedef HWAVEIN *LPHWAVEIN;
typedef HWAVEOUT *LPHWAVEOUT;
#include "pshpack1.h"
typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
......
include/wine/winbase16.h
View file @ 5cf56a3a
......@@ -336,12 +336,12 @@ HGLOBAL16 WINAPI LockSegment16(HGLOBAL16);
FARPROC16 WINAPI MakeProcInstance16(FARPROC16,HANDLE16);
HFILE16 WINAPI OpenFile16(LPCSTR,OFSTRUCT*,UINT16);
DWORD WINAPI RegCloseKey16(HKEY);
DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,LPHKEY);
DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegDeleteKey16(HKEY,LPCSTR);
DWORD WINAPI RegDeleteValue16(HKEY,LPSTR);
DWORD WINAPI RegEnumKey16(HKEY,DWORD,LPSTR,DWORD);
DWORD WINAPI RegEnumValue16(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD WINAPI RegOpenKey16(HKEY,LPCSTR,LPHKEY);
DWORD WINAPI RegOpenKey16(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegQueryValue16(HKEY,LPCSTR,LPSTR,LPDWORD);
DWORD WINAPI RegQueryValueEx16(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD WINAPI RegSetValue16(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
......
include/winnt.h
View file @ 5cf56a3a
......@@ -564,24 +564,23 @@ typedef DWORD EXECUTION_STATE;
typedef VOID* HANDLE;
#define DECLARE_OLD_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
typedef a *P##a, *LP##a
typedef a *P##a
#else
typedef UINT HANDLE;
#define DECLARE_OLD_HANDLE(a) \
typedef HANDLE a; \
typedef a *P##a, *LP##a
typedef HANDLE a; \
typedef a *P##a
#endif
typedef HANDLE *PHANDLE, *LPHANDLE;
#ifdef STRICT
#define DECLARE_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
typedef a *P##a, *LP##a
typedef a *P##a
#else /*STRICT*/
#define DECLARE_HANDLE(a) \
typedef HANDLE a; \
typedef a *P##a, *LP##a
typedef HANDLE a; \
typedef a *P##a
#endif /*STRICT*/
/* Defines */
......
include/winreg.h
View file @ 5cf56a3a
......@@ -56,16 +56,16 @@ typedef struct value_entW {
typedef ACCESS_MASK REGSAM;
DWORD WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,
LPSECURITY_ATTRIBUTES,LPHKEY,LPDWORD);
LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
DWORD WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,
LPSECURITY_ATTRIBUTES,LPHKEY,LPDWORD);
LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
#define RegCreateKeyEx WINELIB_NAME_AW(RegCreateKeyEx)
LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES);
LONG WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES);
#define RegSaveKey WINELIB_NAME_AW(RegSaveKey)
LONG WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,LPHKEY);
LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,LPHKEY);
LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY);
LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY);
#define RegConnectRegistry WINELIB_NAME_AW(RegConnectRegistry)
DWORD WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR,
LPDWORD,LPFILETIME);
......@@ -77,8 +77,8 @@ LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR);
LONG WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
#define RegLoadKey WINELIB_NAME_AW(RegLoadKey)
LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL);
DWORD WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,LPHKEY);
DWORD WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,LPHKEY);
DWORD WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY);
DWORD WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY);
#define RegOpenKeyEx WINELIB_NAME_AW(RegOpenKeyEx)
DWORD WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,
LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,
......@@ -105,8 +105,8 @@ LONG WINAPI RegUnLoadKeyW(HKEY,LPCWSTR);
DWORD WINAPI RegCloseKey(HKEY);
DWORD WINAPI RegFlushKey(HKEY);
DWORD WINAPI RegCreateKeyA(HKEY,LPCSTR,LPHKEY);
DWORD WINAPI RegCreateKeyW(HKEY,LPCWSTR,LPHKEY);
DWORD WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY);
#define RegCreateKey WINELIB_NAME_AW(RegCreateKey)
DWORD WINAPI RegDeleteKeyA(HKEY,LPCSTR);
DWORD WINAPI RegDeleteKeyW(HKEY,LPCWSTR);
......@@ -120,8 +120,8 @@ DWORD WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
DWORD WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
#define RegEnumValue WINELIB_NAME_AW(RegEnumValue)
DWORD WINAPI RegOpenKeyA(HKEY,LPCSTR,LPHKEY);
DWORD WINAPI RegOpenKeyW(HKEY,LPCWSTR,LPHKEY);
DWORD WINAPI RegOpenKeyA(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY);
#define RegOpenKey WINELIB_NAME_AW(RegOpenKey)
DWORD WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
DWORD WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
......
win32/device.c
View file @ 5cf56a3a
......@@ -662,7 +662,7 @@ inline static HKEY get_special_root_hkey( HKEY hkey )
/******************************************************************************
* VMM_RegCreateKeyA
*/
static DWORD VMM_RegCreateKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
static DWORD VMM_RegCreateKeyA( HKEY hkey, LPCSTR name, PHKEY retkey )
{
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
......@@ -692,7 +692,7 @@ static DWORD VMM_RegCreateKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
/******************************************************************************
* VMM_RegOpenKeyExA
*/
DWORD WINAPI VMM_RegOpenKeyExA(HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, LPHKEY retkey)
DWORD WINAPI VMM_RegOpenKeyExA(HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, PHKEY retkey)
{
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
......@@ -1125,7 +1125,7 @@ static DWORD VxDCall_VMM( DWORD service, CONTEXT86 *context )
{
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
LPHKEY retkey = (LPHKEY)stack32_pop( context );
PHKEY retkey = (PHKEY)stack32_pop( context );
return VMM_RegOpenKeyExA( hkey, lpszSubKey, 0, KEY_ALL_ACCESS, retkey );
}
......@@ -1133,7 +1133,7 @@ static DWORD VxDCall_VMM( DWORD service, CONTEXT86 *context )
{
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
LPHKEY retkey = (LPHKEY)stack32_pop( context );
PHKEY retkey = (PHKEY)stack32_pop( context );
return VMM_RegCreateKeyA( hkey, lpszSubKey, retkey );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment