ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some non-threatening fixes to some headers, as well as some casting 

changes that make winelib more win32 code compatible.
This commit is contained in:
Paul Quinn 1999-06-05 15:23:20 +00:00 committed by Alexandre Julliard
parent 18d3ad837c
commit aaa830698c
19 changed files with 98 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/commdlg/colordlg.c
View File

@ -873,7 +873,7 @@ static LONG CC_WMInitDialog(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
for (i=0x2bf;i<0x2c5;i++) for (i=0x2bf;i<0x2c5;i++)
SendMessage16(GetDlgItem(hDlg,i),EM_LIMITTEXT16,3,0); /* max 3 digits: xyz */ SendMessage16(GetDlgItem(hDlg,i),EM_LIMITTEXT16,3,0); /* max 3 digits: xyz */
if (CC_HookCallChk(lpp->lpcc)) if (CC_HookCallChk(lpp->lpcc))
res=CallWindowProc16(lpp->lpcc->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam); res=CallWindowProc16((WNDPROC16)lpp->lpcc->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
/* Set the initial values of the color chooser dialog */ /* Set the initial values of the color chooser dialog */
@ -1006,7 +1006,7 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
if (lpp->lpcc->hwndOwner) if (lpp->lpcc->hwndOwner)
SendMessage16(lpp->lpcc->hwndOwner,i,0,(LPARAM)lpp->lpcc); SendMessage16(lpp->lpcc->hwndOwner,i,0,(LPARAM)lpp->lpcc);
if (CC_HookCallChk(lpp->lpcc)) if (CC_HookCallChk(lpp->lpcc))
CallWindowProc16(lpp->lpcc->lpfnHook,hDlg, CallWindowProc16((WNDPROC16)lpp->lpcc->lpfnHook,hDlg,
WM_COMMAND,psh15,(LPARAM)lpp->lpcc); WM_COMMAND,psh15,(LPARAM)lpp->lpcc);
break; break;
@ -1121,7 +1121,7 @@ LRESULT WINAPI ColorDlgProc16(HWND16 hDlg, UINT16 message,
return FALSE; return FALSE;
res=0; res=0;
if (CC_HookCallChk(lpp->lpcc)) if (CC_HookCallChk(lpp->lpcc))
res=CallWindowProc16(lpp->lpcc->lpfnHook,hDlg,message,wParam,lParam); res=CallWindowProc16((WNDPROC16)lpp->lpcc->lpfnHook,hDlg,message,wParam,lParam);
if (res) if (res)
return res; return res;
} }
@ -1186,7 +1186,7 @@ BOOL WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol )
lpcc16->lpCustColors=(COLORREF*)SEGPTR_GET(ccref); lpcc16->lpCustColors=(COLORREF*)SEGPTR_GET(ccref);
lpcc16->Flags=lpChCol->Flags; lpcc16->Flags=lpChCol->Flags;
lpcc16->lCustData=lpChCol->lCustData; lpcc16->lCustData=lpChCol->lCustData;
lpcc16->lpfnHook=(WNDPROC16)lpChCol->lpfnHook; lpcc16->lpfnHook=(LPCCHOOKPROC16)lpChCol->lpfnHook;
if (lpChCol->lpTemplateName) if (lpChCol->lpTemplateName)
str = SEGPTR_STRDUP(lpChCol->lpTemplateName ); str = SEGPTR_STRDUP(lpChCol->lpTemplateName );
lpcc16->lpTemplateName=SEGPTR_GET(str); lpcc16->lpTemplateName=SEGPTR_GET(str);
@ -1224,7 +1224,7 @@ BOOL WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol )
lpcc16->lpCustColors=(COLORREF*)SEGPTR_GET(ccref); lpcc16->lpCustColors=(COLORREF*)SEGPTR_GET(ccref);
lpcc16->Flags=lpChCol->Flags; lpcc16->Flags=lpChCol->Flags;
lpcc16->lCustData=lpChCol->lCustData; lpcc16->lCustData=lpChCol->lCustData;
lpcc16->lpfnHook=(WNDPROC16)lpChCol->lpfnHook; lpcc16->lpfnHook=(LPCCHOOKPROC16)lpChCol->lpfnHook;
if (lpChCol->lpTemplateName) if (lpChCol->lpTemplateName)
str = SEGPTR_STRDUP_WtoA(lpChCol->lpTemplateName ); str = SEGPTR_STRDUP_WtoA(lpChCol->lpTemplateName );
lpcc16->lpTemplateName=SEGPTR_GET(str); lpcc16->lpTemplateName=SEGPTR_GET(str);

8
dlls/commdlg/filedlg.c
View File

@ -634,7 +634,7 @@ static BOOL FILEDLG_CallWindowProc(LPOPENFILENAME16 lpofn,HWND hwnd,
if (!(lpofn->Flags & OFN_WINE)) if (!(lpofn->Flags & OFN_WINE))
/* Call to 16-Bit Hooking function... No Problem at all. */ /* Call to 16-Bit Hooking function... No Problem at all. */
return (BOOL)CallWindowProc16( return (BOOL)CallWindowProc16(
lpofn->lpfnHook,hwnd,(UINT16)wMsg,(WPARAM16)wParam,lParam (WNDPROC16)lpofn->lpfnHook,hwnd,(UINT16)wMsg,(WPARAM16)wParam,lParam
); );
/* |OFN_WINE32 */ /* |OFN_WINE32 */
if (needstruct) if (needstruct)
@ -665,7 +665,7 @@ static BOOL FILEDLG_CallWindowProc(LPOPENFILENAME16 lpofn,HWND hwnd,
{ {
HWINDOWPROC hWindowProc=NULL; HWINDOWPROC hWindowProc=NULL;
if (WINPROC_SetProc(&hWindowProc, lpofn->lpfnHook, ProcType, WIN_PROC_WINDOW)) if (WINPROC_SetProc(&hWindowProc, (WNDPROC16)lpofn->lpfnHook, ProcType, WIN_PROC_WINDOW))
{ {
/* Call Window Procedure converting 16-Bit Type Parameters to 32-Bit Type Parameters */ /* Call Window Procedure converting 16-Bit Type Parameters to 32-Bit Type Parameters */
result = CallWindowProc16( (WNDPROC16)hWindowProc, result = CallWindowProc16( (WNDPROC16)hWindowProc,
@ -1127,7 +1127,7 @@ static BOOL Commdlg_GetFileNameA( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
if (ofn->lpstrDefExt) if (ofn->lpstrDefExt)
ofn16->lpstrDefExt = SEGPTR_GET(SEGPTR_STRDUP(ofn->lpstrDefExt)); ofn16->lpstrDefExt = SEGPTR_GET(SEGPTR_STRDUP(ofn->lpstrDefExt));
ofn16->lCustData = ofn->lCustData; ofn16->lCustData = ofn->lCustData;
ofn16->lpfnHook = (WNDPROC16)ofn->lpfnHook; ofn16->lpfnHook = (LPOFNHOOKPROC16)ofn->lpfnHook;
if (ofn->lpTemplateName) if (ofn->lpTemplateName)
ofn16->lpTemplateName = SEGPTR_GET(SEGPTR_STRDUP(ofn->lpTemplateName)); ofn16->lpTemplateName = SEGPTR_GET(SEGPTR_STRDUP(ofn->lpTemplateName));
@ -1236,7 +1236,7 @@ static BOOL Commdlg_GetFileNameW( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
if (ofn->lpstrDefExt) if (ofn->lpstrDefExt)
ofn16->lpstrDefExt = SEGPTR_GET(SEGPTR_STRDUP_WtoA(ofn->lpstrDefExt)); ofn16->lpstrDefExt = SEGPTR_GET(SEGPTR_STRDUP_WtoA(ofn->lpstrDefExt));
ofn16->lCustData = ofn->lCustData; ofn16->lCustData = ofn->lCustData;
ofn16->lpfnHook = (WNDPROC16)ofn->lpfnHook; ofn16->lpfnHook = (LPOFNHOOKPROC16)ofn->lpfnHook;
if (ofn->lpTemplateName) if (ofn->lpTemplateName)
ofn16->lpTemplateName = SEGPTR_GET(SEGPTR_STRDUP_WtoA(ofn->lpTemplateName)); ofn16->lpTemplateName = SEGPTR_GET(SEGPTR_STRDUP_WtoA(ofn->lpTemplateName));
ret = dofunction(SEGPTR_GET(ofn16)); ret = dofunction(SEGPTR_GET(ofn16));

12
dlls/commdlg/fontdlg.c
View File

@ -874,7 +874,7 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
if (!lpcf) if (!lpcf)
return FALSE; return FALSE;
if (CFn_HookCallChk(lpcf)) if (CFn_HookCallChk(lpcf))
res=CallWindowProc16(lpcf->lpfnHook,hDlg,message,wParam,lParam); res=CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg,message,wParam,lParam);
if (res) if (res)
return res; return res;
} }
@ -888,7 +888,7 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
return FALSE; return FALSE;
} }
if (CFn_HookCallChk(lpcf)) if (CFn_HookCallChk(lpcf))
return CallWindowProc16(lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam); return CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
} }
WINPROC_MapMsg16To32A(message, wParam, &uMsg32, &wParam32, &lParam); WINPROC_MapMsg16To32A(message, wParam, &uMsg32, &wParam32, &lParam);
lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName; lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName;
@ -933,7 +933,7 @@ LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
if (!lpcf) if (!lpcf)
return FALSE; return FALSE;
if (CFn_HookCallChk32(lpcf)) if (CFn_HookCallChk32(lpcf))
res=CallWindowProcA(lpcf->lpfnHook, hDlg, uMsg, wParam, lParam); res=CallWindowProcA((WNDPROC)lpcf->lpfnHook, hDlg, uMsg, wParam, lParam);
if (res) if (res)
return res; return res;
} }
@ -946,7 +946,7 @@ LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
return FALSE; return FALSE;
} }
if (CFn_HookCallChk32(lpcf)) if (CFn_HookCallChk32(lpcf))
return CallWindowProcA(lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam); return CallWindowProcA((WNDPROC)lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
} }
switch (uMsg) switch (uMsg)
{ {
@ -984,7 +984,7 @@ LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
if (!lpcf32w) if (!lpcf32w)
return FALSE; return FALSE;
if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w)) if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w))
res=CallWindowProcW(lpcf32w->lpfnHook, hDlg, uMsg, wParam, lParam); res=CallWindowProcW((WNDPROC)lpcf32w->lpfnHook, hDlg, uMsg, wParam, lParam);
if (res) if (res)
return res; return res;
} }
@ -998,7 +998,7 @@ LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
return FALSE; return FALSE;
} }
if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w)) if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w))
return CallWindowProcW(lpcf32w->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam); return CallWindowProcW((WNDPROC)lpcf32w->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
} }
lpcf32a=(LPCHOOSEFONTA)lpcf32w->lpTemplateName; lpcf32a=(LPCHOOSEFONTA)lpcf32w->lpTemplateName;
switch (uMsg) switch (uMsg)

54
include/commdlg.h
View File

@ -44,6 +44,9 @@ extern "C" {
#define OFN_SHARENOWARN 1 #define OFN_SHARENOWARN 1
#define OFN_SHAREWARN 0 #define OFN_SHAREWARN 0
typedef UINT16 (*LPOFNHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
typedef UINT (*LPOFNHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
typedef struct { typedef struct {
DWORD lStructSize; DWORD lStructSize;
HWND16 hwndOwner; HWND16 hwndOwner;
@ -63,7 +66,7 @@ typedef struct {
UINT16 nFileExtension; UINT16 nFileExtension;
SEGPTR lpstrDefExt; SEGPTR lpstrDefExt;
LPARAM lCustData; LPARAM lCustData;
WNDPROC16 lpfnHook; LPOFNHOOKPROC16 lpfnHook;
SEGPTR lpTemplateName; SEGPTR lpTemplateName;
} OPENFILENAME16,*LPOPENFILENAME16; } OPENFILENAME16,*LPOPENFILENAME16;
@ -86,7 +89,7 @@ typedef struct {
WORD nFileExtension; WORD nFileExtension;
LPCSTR lpstrDefExt; LPCSTR lpstrDefExt;
LPARAM lCustData; LPARAM lCustData;
WNDPROC lpfnHook; LPOFNHOOKPROC lpfnHook;
LPCSTR lpTemplateName; LPCSTR lpTemplateName;
} OPENFILENAMEA,*LPOPENFILENAMEA; } OPENFILENAMEA,*LPOPENFILENAMEA;
@ -109,7 +112,7 @@ typedef struct {
WORD nFileExtension; WORD nFileExtension;
LPCWSTR lpstrDefExt; LPCWSTR lpstrDefExt;
LPARAM lCustData; LPARAM lCustData;
WNDPROC lpfnHook; LPOFNHOOKPROC lpfnHook;
LPCWSTR lpTemplateName; LPCWSTR lpTemplateName;
} OPENFILENAMEW,*LPOPENFILENAMEW; } OPENFILENAMEW,*LPOPENFILENAMEW;
@ -133,6 +136,7 @@ typedef struct
DECL_WINELIB_TYPE_AW(OFNOTIFY) DECL_WINELIB_TYPE_AW(OFNOTIFY)
DECL_WINELIB_TYPE_AW(LPOFNOTIFY) DECL_WINELIB_TYPE_AW(LPOFNOTIFY)
typedef UINT16 (CALLBACK *LPCCHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
typedef struct { typedef struct {
@ -143,7 +147,7 @@ typedef struct {
COLORREF *lpCustColors; COLORREF *lpCustColors;
DWORD Flags; DWORD Flags;
LPARAM lCustData; LPARAM lCustData;
WNDPROC16 lpfnHook; LPCCHOOKPROC16 lpfnHook;
SEGPTR lpTemplateName; SEGPTR lpTemplateName;
} CHOOSECOLOR16; } CHOOSECOLOR16;
typedef CHOOSECOLOR16 *LPCHOOSECOLOR16; typedef CHOOSECOLOR16 *LPCHOOSECOLOR16;
@ -186,6 +190,9 @@ DECL_WINELIB_TYPE_AW(LPCHOOSECOLOR)
#define CC_ENABLETEMPLATE 0x00000020 #define CC_ENABLETEMPLATE 0x00000020
#define CC_ENABLETEMPLATEHANDLE 0x00000040 #define CC_ENABLETEMPLATEHANDLE 0x00000040
typedef UINT16 (*LPFRHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
typedef UINT (*LPFRHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
typedef struct { typedef struct {
DWORD lStructSize; /* size of this struct 0x20 */ DWORD lStructSize; /* size of this struct 0x20 */
HWND16 hwndOwner; /* handle to owner's window */ HWND16 hwndOwner; /* handle to owner's window */
@ -197,7 +204,7 @@ typedef struct {
UINT16 wFindWhatLen; /* size of find buffer */ UINT16 wFindWhatLen; /* size of find buffer */
UINT16 wReplaceWithLen; /* size of replace buffer */ UINT16 wReplaceWithLen; /* size of replace buffer */
LPARAM lCustData; /* data passed to hook fn. */ LPARAM lCustData; /* data passed to hook fn. */
WNDPROC16 lpfnHook; LPFRHOOKPROC16 lpfnHook;
SEGPTR lpTemplateName; /* custom template name */ SEGPTR lpTemplateName; /* custom template name */
} FINDREPLACE16, *LPFINDREPLACE16; } FINDREPLACE16, *LPFINDREPLACE16;
@ -212,7 +219,7 @@ typedef struct {
WORD wFindWhatLen; WORD wFindWhatLen;
WORD wReplaceWithLen; WORD wReplaceWithLen;
LPARAM lCustData; LPARAM lCustData;
WNDPROC lpfnHook; LPFRHOOKPROC lpfnHook;
LPCSTR lpTemplateName; LPCSTR lpTemplateName;
} FINDREPLACEA, *LPFINDREPLACEA; } FINDREPLACEA, *LPFINDREPLACEA;
@ -227,7 +234,7 @@ typedef struct {
WORD wFindWhatLen; WORD wFindWhatLen;
WORD wReplaceWithLen; WORD wReplaceWithLen;
LPARAM lCustData; LPARAM lCustData;
WNDPROC lpfnHook; LPFRHOOKPROC lpfnHook;
LPCWSTR lpTemplateName; LPCWSTR lpTemplateName;
} FINDREPLACEW, *LPFINDREPLACEW; } FINDREPLACEW, *LPFINDREPLACEW;
@ -252,6 +259,9 @@ DECL_WINELIB_TYPE_AW(LPFINDREPLACE)
#define FR_HIDEMATCHCASE 0x00008000 #define FR_HIDEMATCHCASE 0x00008000
#define FR_HIDEWHOLEWORD 0x00010000 #define FR_HIDEWHOLEWORD 0x00010000
typedef UINT16 (*LPCFHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
typedef UINT (*LPCFHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
typedef struct typedef struct
{ {
DWORD lStructSize; DWORD lStructSize;
@ -262,7 +272,7 @@ typedef struct
DWORD Flags; /* enum. type flags */ DWORD Flags; /* enum. type flags */
COLORREF rgbColors; /* returned text color */ COLORREF rgbColors; /* returned text color */
LPARAM lCustData; /* data passed to hook fn. */ LPARAM lCustData; /* data passed to hook fn. */
WNDPROC16 lpfnHook; LPCFHOOKPROC16 lpfnHook;
SEGPTR lpTemplateName; /* custom template name */ SEGPTR lpTemplateName; /* custom template name */
HINSTANCE16 hInstance; /* instance handle of.EXE that */ HINSTANCE16 hInstance; /* instance handle of.EXE that */
/* contains cust. dlg. template */ /* contains cust. dlg. template */
@ -287,7 +297,7 @@ typedef struct
DWORD Flags; DWORD Flags;
COLORREF rgbColors; COLORREF rgbColors;
LPARAM lCustData; LPARAM lCustData;
WNDPROC lpfnHook; LPCFHOOKPROC lpfnHook;
LPCSTR lpTemplateName; LPCSTR lpTemplateName;
HINSTANCE hInstance; HINSTANCE hInstance;
LPSTR lpszStyle; LPSTR lpszStyle;
@ -307,7 +317,7 @@ typedef struct
DWORD Flags; DWORD Flags;
COLORREF rgbColors; COLORREF rgbColors;
LPARAM lCustData; LPARAM lCustData;
WNDPROC lpfnHook; LPCFHOOKPROC lpfnHook;
LPCWSTR lpTemplateName; LPCWSTR lpTemplateName;
HINSTANCE hInstance; HINSTANCE hInstance;
LPWSTR lpszStyle; LPWSTR lpszStyle;
@ -395,6 +405,12 @@ DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
#define CDM_HIDECONTROL (CDM_FIRST + 0x0005) #define CDM_HIDECONTROL (CDM_FIRST + 0x0005)
#define CDM_SETDEFEXT (CDM_FIRST + 0x0006) #define CDM_SETDEFEXT (CDM_FIRST + 0x0006)
typedef UINT16 (CALLBACK *LPPRINTHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
typedef UINT (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
typedef UINT16 (CALLBACK *LPSETUPHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
typedef UINT (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
typedef struct typedef struct
{ {
DWORD lStructSize; DWORD lStructSize;
@ -410,17 +426,14 @@ typedef struct
WORD nCopies; WORD nCopies;
HINSTANCE16 hInstance; HINSTANCE16 hInstance;
LPARAM lCustData; LPARAM lCustData;
WNDPROC16 lpfnPrintHook; LPPRINTHOOKPROC16 lpfnPrintHook;
WNDPROC16 lpfnSetupHook; LPSETUPHOOKPROC16 lpfnSetupHook;
SEGPTR lpPrintTemplateName; SEGPTR lpPrintTemplateName;
SEGPTR lpSetupTemplateName; SEGPTR lpSetupTemplateName;
HGLOBAL16 hPrintTemplate; HGLOBAL16 hPrintTemplate;
HGLOBAL16 hSetupTemplate; HGLOBAL16 hSetupTemplate;
} PRINTDLG16, *LPPRINTDLG16; } PRINTDLG16, *LPPRINTDLG16;
typedef UINT (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
typedef UINT (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
typedef struct tagPDA typedef struct tagPDA
{ {
DWORD lStructSize; DWORD lStructSize;
@ -493,17 +506,6 @@ DECL_WINELIB_TYPE_AW(LPPRINTDLG)
#define PD_DISABLEPRINTTOFILE 0x00080000 #define PD_DISABLEPRINTTOFILE 0x00080000
#define PD_HIDEPRINTTOFILE 0x00100000 #define PD_HIDEPRINTTOFILE 0x00100000
typedef enum __MIDL_IPrint_0001
{
PRINTFLAG_MAYBOTHERUSER = 1,
PRINTFLAG_PROMPTUSER = 2,
PRINTFLAG_USERMAYCHANGEPRINTER = 4,
PRINTFLAG_RECOMPOSETODEVICE = 8,
PRINTFLAG_DONTACTUALLYPRINT = 16,
PRINTFLAG_FORCEPROPERTIES = 32,
PRINTFLAG_PRINTTOFILE = 64
} PRINTFLAG;
typedef struct { typedef struct {
UINT16 wDriverOffset; UINT16 wDriverOffset;
UINT16 wDeviceOffset; UINT16 wDeviceOffset;

2
include/initguid.h
View File

@ -20,4 +20,6 @@
const GUID name = \ const GUID name = \
{ l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
DEFINE_GUID(GUID_NULL, 0,0,0,0,0,0,0,0,0,0,0);
#endif #endif

4
include/objbase.h
View File

@ -1,6 +1,7 @@
#ifndef __WINE_OBJBASE_H #ifndef __WINE_OBJBASE_H
#define __WINE_OBJBASE_H #define __WINE_OBJBASE_H
#define _OBJBASE_H_
#include "wine/obj_base.h" #include "wine/obj_base.h"
@ -38,6 +39,9 @@ HRESULT WINAPI GetClassFile(LPOLESTR filePathName,CLSID *pclsid);
#define STDAPICALLTYPE __stdcall #define STDAPICALLTYPE __stdcall
#define STDAPIVCALLTYPE __cdecl #define STDAPIVCALLTYPE __cdecl
#define FARSTRUCT
#define HUGEP
#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE #define STDAPI_(type) EXTERN_C type STDAPICALLTYPE

2
include/ole2.h
View File

@ -36,7 +36,7 @@ HRESULT WINAPI OleSetMenuDescriptor(HOLEMENU hmenuDescriptor,HWND hwndFrame,HWN
HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid); HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid);
HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid); HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid);
HRESULT WINAPI ReadClassStm(IStream *pStm,REFCLSID pclsid); HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid);
HRESULT WINAPI OleSave(LPPERSISTSTORAGE pPS, LPSTORAGE pStg, BOOL fSameAsLoad); HRESULT WINAPI OleSave(LPPERSISTSTORAGE pPS, LPSTORAGE pStg, BOOL fSameAsLoad);

4
include/windef.h
View File

@ -149,7 +149,6 @@ typedef WORD *LPCATCHBUF;
typedef DWORD ACCESS_MASK; typedef DWORD ACCESS_MASK;
typedef ACCESS_MASK REGSAM; typedef ACCESS_MASK REGSAM;
typedef HANDLE HHOOK; typedef HANDLE HHOOK;
typedef HANDLE HKEY;
typedef HANDLE HMONITOR; typedef HANDLE HMONITOR;
typedef DWORD LCID; typedef DWORD LCID;
typedef WORD LANGID; typedef WORD LANGID;
@ -188,8 +187,6 @@ typedef INT *PINT;
typedef INT *LPINT; typedef INT *LPINT;
typedef UINT *PUINT; typedef UINT *PUINT;
typedef UINT *LPUINT; typedef UINT *LPUINT;
typedef HKEY *LPHKEY;
typedef HKEY *PHKEY;
typedef FLOAT *PFLOAT; typedef FLOAT *PFLOAT;
typedef FLOAT *LPFLOAT; typedef FLOAT *LPFLOAT;
typedef BOOL *PBOOL; typedef BOOL *PBOOL;
@ -245,6 +242,7 @@ DECLARE_HANDLE(HFILE);
DECLARE_HANDLE(HFONT); DECLARE_HANDLE(HFONT);
DECLARE_HANDLE(HICON); DECLARE_HANDLE(HICON);
DECLARE_HANDLE(HINSTANCE); DECLARE_HANDLE(HINSTANCE);
DECLARE_HANDLE(HKEY);
DECLARE_HANDLE(HMENU); DECLARE_HANDLE(HMENU);
DECLARE_HANDLE(HMETAFILE); DECLARE_HANDLE(HMETAFILE);
DECLARE_HANDLE(HMIDI); DECLARE_HANDLE(HMIDI);

10
include/wine/obj_dataobject.h
View File

@ -96,6 +96,16 @@ typedef enum tagTYMED
TYMED_NULL = 0 TYMED_NULL = 0
} TYMED; } TYMED;
typedef struct tagRemSTGMEDIUM
{
DWORD tymed;
DWORD dwHandleType;
unsigned long pData;
unsigned long pUnkForRelease;
unsigned long cbData;
byte data[1];
} RemSTGMEDIUM;
/* dataobject as answer to a request */ /* dataobject as answer to a request */
struct STGMEDIUM struct STGMEDIUM
{ {

9
include/wine/obj_inplace.h
View File

@ -93,6 +93,15 @@ typedef enum tagBINDSPEED
BINDSPEED_IMMEDIATE = 3 BINDSPEED_IMMEDIATE = 3
} BINDSPEED; } BINDSPEED;
typedef enum tagOLECONTF
{
OLECONTF_EMBEDDINGS = 1,
OLECONTF_LINKS = 2,
OLECONTF_OTHERS = 4,
OLECONTF_OLNYUSER = 8,
OLECONTF_ONLYIFRUNNING = 16
} OLECONTF;
typedef HGLOBAL HOLEMENU; typedef HGLOBAL HOLEMENU;
typedef LPRECT LPBORDERWIDTHS; typedef LPRECT LPBORDERWIDTHS;
typedef LPCRECT LPCBORDERWIDTHS; typedef LPCRECT LPCBORDERWIDTHS;

4
include/wine/obj_moniker.h
View File

@ -340,8 +340,8 @@ ICOM_DEFINE(IRunningObjectTable,IUnknown)
#define IRunningObjectTable_EnumRunning(p,a) ICOM_CALL1(EnumRunning,p,a) #define IRunningObjectTable_EnumRunning(p,a) ICOM_CALL1(EnumRunning,p,a)
#endif #endif
HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPVOID *pprot); HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPVOID *pprot); HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
/***************************************************************************** /*****************************************************************************
* Additional API * Additional API

8
include/wine/obj_oleaut.h
View File

@ -201,6 +201,11 @@ typedef DISPID MEMBERID;
#define MEMBERID_NIL DISPID_UNKNOWN #define MEMBERID_NIL DISPID_UNKNOWN
#define IMPLTYPEFLAG_FDEFAULT (0x1)
#define IMPLTYPEFLAG_FSOURCE (0x2)
#define IMPLTYPEFLAG_FRESTRICTED (0x4)
#define IMPLTYPEFLAG_FDEFAULTVTABLE (0x8)
typedef struct tagDISPPARAMS typedef struct tagDISPPARAMS
{ {
VARIANTARG* rgvarg; VARIANTARG* rgvarg;
@ -560,8 +565,7 @@ ICOM_DEFINE(IDispatch,IUnknown)
ICOM_METHOD2(HRESULT,GetFuncDesc, UINT,index, FUNCDESC**,ppFuncDesc) \ ICOM_METHOD2(HRESULT,GetFuncDesc, UINT,index, FUNCDESC**,ppFuncDesc) \
ICOM_METHOD2(HRESULT,GetVarDesc, UINT,index, VARDESC**,ppVarDesc) \ ICOM_METHOD2(HRESULT,GetVarDesc, UINT,index, VARDESC**,ppVarDesc) \
ICOM_METHOD4(HRESULT,GetNames, MEMBERID,memid, BSTR*,rgBstrNames, UINT,cMaxNames, UINT*,pcNames) \ ICOM_METHOD4(HRESULT,GetNames, MEMBERID,memid, BSTR*,rgBstrNames, UINT,cMaxNames, UINT*,pcNames) \
ICOM_METHOD2(HRESULT,GetRefTypeOfImplType, UINT,index, HREFTYPE*,\ ICOM_METHOD2(HRESULT,GetRefTypeOfImplType, UINT,index, HREFTYPE*, pRefType) \
pRefType) \
ICOM_METHOD2(HRESULT,GetImplTypeFlags, UINT,index, INT*,pImplTypeFlags)\ ICOM_METHOD2(HRESULT,GetImplTypeFlags, UINT,index, INT*,pImplTypeFlags)\
ICOM_METHOD3(HRESULT,GetIDsOfNames, LPOLESTR*,rgszNames, UINT,cNames, MEMBERID*,pMemId) \ ICOM_METHOD3(HRESULT,GetIDsOfNames, LPOLESTR*,rgszNames, UINT,cNames, MEMBERID*,pMemId) \
ICOM_METHOD7(HRESULT,Invoke, PVOID,pvInstance, MEMBERID,memid, WORD,wFlags, DISPPARAMS*,pDispParams, VARIANT*,pVarResult, EXCEPINFO*,pExcepInfo, UINT*,puArgErr) \ ICOM_METHOD7(HRESULT,Invoke, PVOID,pvInstance, MEMBERID,memid, WORD,wFlags, DISPPARAMS*,pDispParams, VARIANT*,pVarResult, EXCEPINFO*,pExcepInfo, UINT*,puArgErr) \

2
include/wine/obj_oleobj.h
View File

@ -39,7 +39,7 @@ typedef enum tagOLEMISC
OLEMISC_INSIDEOUT = 0x80, OLEMISC_INSIDEOUT = 0x80,
OLEMISC_ACTIVATEWHENVISIBLE = 0x100, OLEMISC_ACTIVATEWHENVISIBLE = 0x100,
OLEMISC_RENDERINGISDEVICEINDEPENDENT = 0x200, OLEMISC_RENDERINGISDEVICEINDEPENDENT = 0x200,
OLEMISC_INVISABLEATRUNTIME = 0x400, OLEMISC_INVISIBLEATRUNTIME = 0x400,
OLEMISC_ALWAYSRUN = 0x800, OLEMISC_ALWAYSRUN = 0x800,
OLEMISC_ACTSLIKEBUTTON = 0x1000, OLEMISC_ACTSLIKEBUTTON = 0x1000,
OLEMISC_ACTSLIKELABEL = 0x2000, OLEMISC_ACTSLIKELABEL = 0x2000,

6
include/winerror.h
View File

@ -332,6 +332,11 @@ extern int WIN32_LastError;
#define CO_E_ERRORINDLL 0x800401F9 #define CO_E_ERRORINDLL 0x800401F9
#define CO_E_OBJISREG 0x800401FB #define CO_E_OBJISREG 0x800401FB
#define OLE_E_FIRST 0x80040000L
#define OLE_E_LAST 0x800400FFL
#define OLE_S_FIRST 0x00040000L
#define OLE_S_LAST 0x000400FFL
#define OLE_E_ENUM_NOMORE 0x80040002 #define OLE_E_ENUM_NOMORE 0x80040002
#define OLE_E_ADVISENOTSUPPORTED 0x80040003 #define OLE_E_ADVISENOTSUPPORTED 0x80040003
#define OLE_E_NOCONNECTION 0x80040004 #define OLE_E_NOCONNECTION 0x80040004
@ -451,6 +456,7 @@ extern int WIN32_LastError;
#define OLEOBJ_E_NOVERBS 0x00040180L #define OLEOBJ_E_NOVERBS 0x00040180L
#define OLEOBJ_E_INVALIDVERB 0x00040181L
#define OLEOBJ_S_INVALIDVERB 0x00040180L #define OLEOBJ_S_INVALIDVERB 0x00040180L
#endif /* __WINE_WINERROR_H */ #endif /* __WINE_WINERROR_H */

2
include/wingdi.h
View File

@ -1343,7 +1343,7 @@ typedef struct
WORD palVersion; WORD palVersion;
WORD palNumEntries; WORD palNumEntries;
PALETTEENTRY palPalEntry[1]; PALETTEENTRY palPalEntry[1];
} LOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE; } LOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE, *NPLOGPALETTE;
/* Pens */ /* Pens */

1
include/winuser.h
View File

@ -1026,6 +1026,7 @@ typedef struct
#define CS_BYTEALIGNCLIENT 0x1000 #define CS_BYTEALIGNCLIENT 0x1000
#define CS_BYTEALIGNWINDOW 0x2000 #define CS_BYTEALIGNWINDOW 0x2000
#define CS_GLOBALCLASS 0x4000 #define CS_GLOBALCLASS 0x4000
#define CS_IME 0x00010000
#define PRF_CHECKVISIBLE 0x00000001L #define PRF_CHECKVISIBLE 0x00000001L
#define PRF_NONCLIENT 0x00000002L #define PRF_NONCLIENT 0x00000002L

9
include/wtypes.h
View File

@ -64,7 +64,9 @@ typedef GUID FMTID,*LPFMTID;
#endif /* !defined(__cplusplus) */ #endif /* !defined(__cplusplus) */
extern const IID GUID_NULL; extern const IID GUID_NULL;
#define IID_NULL GUID_NULL
#define CLSID_NULL GUID_NULL #define CLSID_NULL GUID_NULL
#define FMTID_NULL GUID_NULL
typedef enum tagDVASPECT typedef enum tagDVASPECT
{ {
@ -132,11 +134,16 @@ typedef unsigned short VARTYPE;
typedef ULONG PROPID; typedef ULONG PROPID;
#ifndef _tagBLOB_DEFINED
#define _tagBLOB_DEFINED
#define _BLOB_DEFINED
#define _LPBLOB_DEFINED
typedef struct tagBLOB typedef struct tagBLOB
{ {
ULONG cbSize; ULONG cbSize;
BYTE *pBlobData; BYTE *pBlobData;
} BLOB; } BLOB, *LPBLOB;
#endif
#ifndef _tagCY_DEFINED #ifndef _tagCY_DEFINED
#define _tagCY_DEFINED #define _tagCY_DEFINED

2
ole/bindctx.c
View File

@ -338,7 +338,7 @@ HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectT
if (pprot==NULL) if (pprot==NULL)
return E_POINTER; return E_POINTER;
res=GetRunningObjectTable(0,(LPVOID*)pprot); res=GetRunningObjectTable(0, pprot);
return res; return res;
} }

4
ole/moniker.c
View File

@ -447,7 +447,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObjectIndex(RunningObjectTableImpl* Thi
/****************************************************************************** /******************************************************************************
* GetRunningObjectTable16 [OLE2.30] * GetRunningObjectTable16 [OLE2.30]
*/ */
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPVOID *pprot) HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{ {
FIXME(ole,"(%ld,%p),stub!\n",reserved,pprot); FIXME(ole,"(%ld,%p),stub!\n",reserved,pprot);
return E_NOTIMPL; return E_NOTIMPL;
@ -456,7 +456,7 @@ HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPVOID *pprot)
/*********************************************************************** /***********************************************************************
* GetRunningObjectTable (OLE2.73) * GetRunningObjectTable (OLE2.73)
*/ */
HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPVOID *pprot) HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{ {
IID riid=IID_IRunningObjectTable; IID riid=IID_IRunningObjectTable;
HRESULT res; HRESULT res;