Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
More fixes of DWORD_PTR for functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@qchikara
qchikara committed May 21, 2016
1 parent ab28ff5 commit cc9573d
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 44 deletions.
4 changes: 2 additions & 2 deletions src/core/sys/windows/commctrl.d
View file
Expand Up @@ -4938,8 +4938,8 @@ template HANDLE_WM_NOTIFY(R) {
}
}
private alias _prm_FORWARD_WM_NOTIFY = extern (Windows)
int function(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); // to inject linkage type
int FORWARD_WM_NOTIFY(HWND hwnd, int idFrom, NMHDR* pnmhdr, _prm_FORWARD_WM_NOTIFY fn) {
LRESULT function(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); // to inject linkage type
LRESULT FORWARD_WM_NOTIFY(HWND hwnd, int idFrom, NMHDR* pnmhdr, _prm_FORWARD_WM_NOTIFY fn) {
return fn(hwnd, WM_NOTIFY, idFrom, cast(LPARAM) pnmhdr);
}

Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/imagehlp.d
View file
Expand Up @@ -306,8 +306,8 @@ extern (Windows) {
BOOL UpdateDebugInfoFileEx(LPSTR, LPSTR, LPSTR, PIMAGE_NT_HEADERS, DWORD);
BOOL BindImage(LPSTR, LPSTR, LPSTR);
BOOL BindImageEx(DWORD, LPSTR, LPSTR, LPSTR, PIMAGEHLP_STATUS_ROUTINE);
BOOL ReBaseImage(LPSTR, LPSTR, BOOL, BOOL, BOOL, ULONG, ULONG*, ULONG*,
ULONG*, ULONG*, ULONG);
BOOL ReBaseImage(LPSTR, LPSTR, BOOL, BOOL, BOOL, ULONG, ULONG*, ULONG_PTR*,
ULONG*, ULONG_PTR*, ULONG);
PLOADED_IMAGE ImageLoad(LPSTR, LPSTR);
BOOL ImageUnload(PLOADED_IMAGE);
PIMAGE_NT_HEADERS ImageNtHeader(PVOID);
Expand Down
50 changes: 26 additions & 24 deletions src/core/sys/windows/mapi.d
View file
Expand Up @@ -74,8 +74,10 @@ enum MAPI_UNREAD = 0x0001;
enum MAPI_RECEIPT_REQUESTED = 0x0002;
enum MAPI_SENT = 0x0004;

alias uint FLAGS, LHANDLE;
alias uint* LPLHANDLE, LPULONG;
alias uint FLAGS;
alias uint* LPULONG;
alias ULONG_PTR LHANDLE;
alias ULONG_PTR* LPLHANDLE;

struct MapiRecipDesc {
ULONG ulReserved;
Expand Down Expand Up @@ -123,46 +125,46 @@ struct MapiMessage {
alias MapiMessage* lpMapiMessage;

extern (Pascal) {
ULONG MAPILogon(ULONG, LPSTR, LPSTR, FLAGS, ULONG, LPLHANDLE);
ULONG MAPISendMail(LHANDLE, ULONG, lpMapiMessage, FLAGS, ULONG);
ULONG MAPISendDocuments(ULONG, LPSTR, LPSTR, LPSTR, ULONG);
ULONG MAPIReadMail(LHANDLE, ULONG, LPSTR, FLAGS, ULONG, lpMapiMessage*);
ULONG MAPIFindNext(LHANDLE, ULONG, LPSTR, LPSTR, FLAGS, ULONG, LPSTR);
ULONG MAPIResolveName(LHANDLE, ULONG, LPSTR, FLAGS, ULONG,
ULONG MAPILogon(ULONG_PTR, LPSTR, LPSTR, FLAGS, ULONG, LPLHANDLE);
ULONG MAPISendMail(LHANDLE, ULONG_PTR, lpMapiMessage, FLAGS, ULONG);
ULONG MAPISendDocuments(ULONG_PTR, LPSTR, LPSTR, LPSTR, ULONG);
ULONG MAPIReadMail(LHANDLE, ULONG_PTR, LPSTR, FLAGS, ULONG, lpMapiMessage*);
ULONG MAPIFindNext(LHANDLE, ULONG_PTR, LPSTR, LPSTR, FLAGS, ULONG, LPSTR);
ULONG MAPIResolveName(LHANDLE, ULONG_PTR, LPSTR, FLAGS, ULONG,
lpMapiRecipDesc*);
ULONG MAPIAddress(LHANDLE, ULONG, LPSTR, ULONG, LPSTR, ULONG,
ULONG MAPIAddress(LHANDLE, ULONG_PTR, LPSTR, ULONG, LPSTR, ULONG,
lpMapiRecipDesc, FLAGS, ULONG, LPULONG, lpMapiRecipDesc*);
ULONG MAPIFreeBuffer(LPVOID);
ULONG MAPIDetails(LHANDLE, ULONG, lpMapiRecipDesc, FLAGS, ULONG);
ULONG MAPISaveMail(LHANDLE, ULONG, lpMapiMessage lpszMessage, FLAGS,
ULONG MAPIDetails(LHANDLE, ULONG_PTR, lpMapiRecipDesc, FLAGS, ULONG);
ULONG MAPISaveMail(LHANDLE, ULONG_PTR, lpMapiMessage lpszMessage, FLAGS,
ULONG, LPSTR);
ULONG MAPIDeleteMail(LHANDLE lpSession, ULONG, LPSTR, FLAGS, ULONG);
ULONG MAPILogoff(LHANDLE, ULONG, FLAGS, ULONG);
ULONG MAPIDeleteMail(LHANDLE, ULONG_PTR, LPSTR, FLAGS, ULONG);
ULONG MAPILogoff(LHANDLE, ULONG_PTR, FLAGS, ULONG);
// Netscape extensions
ULONG MAPIGetNetscapeVersion();
ULONG MAPI_NSCP_SynchronizeClient(LHANDLE, ULONG);

// Handles for use with GetProcAddress
alias ULONG function(ULONG, LPSTR, LPSTR, FLAGS, ULONG, LPLHANDLE)
alias ULONG function(ULONG_PTR, LPSTR, LPSTR, FLAGS, ULONG, LPLHANDLE)
LPMAPILOGON;
alias ULONG function(LHANDLE, ULONG, lpMapiMessage, FLAGS, ULONG)
alias ULONG function(LHANDLE, ULONG_PTR, lpMapiMessage, FLAGS, ULONG)
LPMAPISENDMAIL;
alias ULONG function(ULONG, LPSTR, LPSTR, LPSTR, ULONG)
alias ULONG function(ULONG_PTR, LPSTR, LPSTR, LPSTR, ULONG)
LPMAPISENDDOCUMENTS;
alias ULONG function(LHANDLE, ULONG, LPSTR, FLAGS, ULONG, lpMapiMessage*)
alias ULONG function(LHANDLE, ULONG_PTR, LPSTR, FLAGS, ULONG, lpMapiMessage*)
LPMAPIREADMAIL;
alias ULONG function(LHANDLE, ULONG, LPSTR, LPSTR, FLAGS, ULONG, LPSTR)
alias ULONG function(LHANDLE, ULONG_PTR, LPSTR, LPSTR, FLAGS, ULONG, LPSTR)
LPMAPIFINDNEXT;
alias ULONG function(LHANDLE, ULONG, LPSTR, FLAGS, ULONG,
alias ULONG function(LHANDLE, ULONG_PTR, LPSTR, FLAGS, ULONG,
lpMapiRecipDesc*) LPMAPIRESOLVENAME;
alias ULONG function(LHANDLE, ULONG, LPSTR, ULONG, LPSTR, ULONG,
alias ULONG function(LHANDLE, ULONG_PTR, LPSTR, ULONG, LPSTR, ULONG,
lpMapiRecipDesc, FLAGS, ULONG, LPULONG, lpMapiRecipDesc*) LPMAPIADDRESS;
alias ULONG function(LPVOID lpv) LPMAPIFREEBUFFER;
alias ULONG function(LHANDLE, ULONG, lpMapiRecipDesc, FLAGS, ULONG)
alias ULONG function(LHANDLE, ULONG_PTR, lpMapiRecipDesc, FLAGS, ULONG)
LPMAPIDETAILS;
alias ULONG function(LHANDLE, ULONG, lpMapiMessage, FLAGS, ULONG, LPSTR)
alias ULONG function(LHANDLE, ULONG_PTR, lpMapiMessage, FLAGS, ULONG, LPSTR)
LPMAPISAVEMAIL;
alias ULONG function(LHANDLE lpSession, ULONG, LPSTR, FLAGS, ULONG)
alias ULONG function(LHANDLE, ULONG_PTR, LPSTR, FLAGS, ULONG)
LPMAPIDELETEMAIL;
alias ULONG function(LHANDLE, ULONG, FLAGS, ULONG) LPMAPILOGOFF;
alias ULONG function(LHANDLE, ULONG_PTR, FLAGS, ULONG) LPMAPILOGOFF;
}
4 changes: 2 additions & 2 deletions src/core/sys/windows/ntsecpkg.d
View file
Expand Up @@ -180,8 +180,8 @@ alias void function(ULONG_PTR, ULONG_PTR, PSecBuffer,

/* misc typedefs used in the below prototypes */
alias PVOID* PLSA_CLIENT_REQUEST;
alias ULONG LSA_SEC_HANDLE;
alias ULONG* PLSA_SEC_HANDLE;
alias ULONG_PTR LSA_SEC_HANDLE;
alias LSA_SEC_HANDLE* PLSA_SEC_HANDLE;
alias LPTHREAD_START_ROUTINE SEC_THREAD_START;
alias PSECURITY_ATTRIBUTES SEC_ATTRS;

Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/ole.d
View file
Expand Up @@ -156,7 +156,7 @@ enum OLEOPT_UPDATE {
}

mixin DECLARE_HANDLE!("HOBJECT");
alias LONG LHSERVER, LHCLIENTDOC, LHSERVERDOC;
alias LONG_PTR LHSERVER, LHCLIENTDOC, LHSERVERDOC;

struct OLEOBJECTVTBL {
extern (Windows) {
Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/oleidl.d
View file
Expand Up @@ -230,11 +230,11 @@ interface IDropTarget : IUnknown {
alias IDropTarget LPDROPTARGET;

extern (Windows) {
alias BOOL function(DWORD) __IView_pfncont;
alias BOOL function(ULONG_PTR) __IView_pfncont;
}

interface IViewObject : IUnknown {
HRESULT Draw(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,HDC,LPCRECTL,LPCRECTL,__IView_pfncont pfnContinue,DWORD);
HRESULT Draw(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,HDC,LPCRECTL,LPCRECTL,__IView_pfncont pfnContinue,ULONG_PTR);
HRESULT GetColorSet(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,LPLOGPALETTE*);
HRESULT Freeze(DWORD,LONG,PVOID,PDWORD);
HRESULT Unfreeze(DWORD);
Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/prsht.d
View file
Expand Up @@ -335,8 +335,8 @@ extern (Windows) {
HPROPSHEETPAGE CreatePropertySheetPageA(LPCPROPSHEETPAGEA);
HPROPSHEETPAGE CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
BOOL DestroyPropertySheetPage(HPROPSHEETPAGE);
int PropertySheetA(LPCPROPSHEETHEADERA);
int PropertySheetW(LPCPROPSHEETHEADERW);
INT_PTR PropertySheetA(LPCPROPSHEETHEADERA);
INT_PTR PropertySheetW(LPCPROPSHEETHEADERW);
}

version (Unicode) {
Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/rasdlg.d
View file
Expand Up @@ -78,8 +78,8 @@ alias RASDIALDLG* LPRASDIALDLG;

// Application-defined callback functions
extern (Windows) {
alias VOID function(DWORD, DWORD, LPWSTR, LPVOID) RASPBDLGFUNCW;
alias VOID function(DWORD, DWORD, LPSTR, LPVOID) RASPBDLGFUNCA;
alias VOID function(ULONG_PTR, DWORD, LPWSTR, LPVOID) RASPBDLGFUNCW;
alias VOID function(ULONG_PTR, DWORD, LPSTR, LPVOID) RASPBDLGFUNCA;
}

struct RASPBDLGA {
Expand Down
6 changes: 3 additions & 3 deletions src/core/sys/windows/shellapi.d
View file
Expand Up @@ -357,7 +357,7 @@ extern (Windows) nothrow @nogc {
UINT ExtractIconExW(LPCWSTR, int, HICON*, HICON*, UINT);
HINSTANCE FindExecutableA(LPCSTR, LPCSTR, LPSTR);
HINSTANCE FindExecutableW(LPCWSTR, LPCWSTR, LPWSTR);
UINT SHAppBarMessage(DWORD, PAPPBARDATA);
UINT_PTR SHAppBarMessage(DWORD, PAPPBARDATA);
BOOL Shell_NotifyIconA(DWORD, PNOTIFYICONDATAA);
BOOL Shell_NotifyIconW(DWORD, PNOTIFYICONDATAW);
int ShellAboutA(HWND, LPCSTR, LPCSTR, HICON);
Expand All @@ -369,8 +369,8 @@ extern (Windows) nothrow @nogc {
int SHFileOperationA(LPSHFILEOPSTRUCTA);
int SHFileOperationW(LPSHFILEOPSTRUCTW);
void SHFreeNameMappings(HANDLE);
DWORD SHGetFileInfoA(LPCSTR, DWORD, SHFILEINFOA*, UINT, UINT);
DWORD SHGetFileInfoW(LPCWSTR, DWORD, SHFILEINFOW*, UINT, UINT);
DWORD_PTR SHGetFileInfoA(LPCSTR, DWORD, SHFILEINFOA*, UINT, UINT);
DWORD_PTR SHGetFileInfoW(LPCWSTR, DWORD, SHFILEINFOW*, UINT, UINT);
HRESULT SHQueryRecycleBinA(LPCSTR, LPSHQUERYRBINFO);
HRESULT SHQueryRecycleBinW(LPCWSTR, LPSHQUERYRBINFO);
HRESULT SHEmptyRecycleBinA(HWND, LPCSTR, DWORD);
Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/shlobj.d
View file
Expand Up @@ -683,7 +683,7 @@ interface IObjMgr : IUnknown {
interface IContextMenu : IUnknown {
HRESULT QueryContextMenu(HMENU, UINT, UINT, UINT, UINT);
HRESULT InvokeCommand(LPCMINVOKECOMMANDINFO);
HRESULT GetCommandString(UINT, UINT, PUINT, LPSTR, UINT);
HRESULT GetCommandString(UINT_PTR, UINT, PUINT, LPSTR, UINT);
}
alias IContextMenu LPCONTEXTMENU;

Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/winbase.d
View file
Expand Up @@ -1863,7 +1863,7 @@ WINBASEAPI DWORD WINAPI GetCurrentThreadId(void);
BOOL GetPrivateProfileStructA(LPCSTR, LPCSTR, LPVOID, UINT, LPCSTR);
BOOL GetPrivateProfileStructW(LPCWSTR, LPCWSTR, LPVOID, UINT, LPCWSTR);
FARPROC GetProcAddress(HMODULE, LPCSTR); // 1st param wrongly HINSTANCE in MinGW
BOOL GetProcessAffinityMask(HANDLE, PDWORD, PDWORD);
BOOL GetProcessAffinityMask(HANDLE, PDWORD_PTR, PDWORD_PTR);
DWORD GetProcessVersion(DWORD);
UINT GetProfileIntA(LPCSTR, LPCSTR, INT);
UINT GetProfileIntW(LPCWSTR, LPCWSTR, INT);
Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/wincrypt.d
View file
Expand Up @@ -501,7 +501,7 @@ enum {


alias UINT ALG_ID;
alias ULONG HCRYPTPROV, HCRYPTKEY, HCRYPTHASH;
alias ULONG_PTR HCRYPTPROV, HCRYPTKEY, HCRYPTHASH;
alias PVOID HCERTSTORE, HCRYPTMSG, HCERTCHAINENGINE;

struct VTableProvStruc {
Expand Down Expand Up @@ -844,7 +844,7 @@ const(void)*, PCCERT_CHAIN_CONTEXT);
BOOL CryptAcquireContextA(HCRYPTPROV*, LPCSTR, LPCSTR, DWORD, DWORD);
BOOL CryptAcquireContextW(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD);
BOOL CryptContextAddRef(HCRYPTPROV, DWORD*, DWORD);
BOOL CryptReleaseContext(HCRYPTPROV, DWORD);
BOOL CryptReleaseContext(HCRYPTPROV, ULONG_PTR);
BOOL CryptGenKey(HCRYPTPROV, ALG_ID, DWORD, HCRYPTKEY*);
BOOL CryptDeriveKey(HCRYPTPROV, ALG_ID, HCRYPTHASH, DWORD, HCRYPTKEY*);
BOOL CryptDestroyKey(HCRYPTKEY);
Expand Down

0 comments on commit cc9573d

Please sign in to comment.