Fixed warnings caused by conversion to -DSTRICT.

This commit is contained in:
Alexandre Julliard 2002-10-18 23:48:57 +00:00
parent 23bb3715f7
commit b34fb35b31
52 changed files with 93 additions and 92 deletions

View File

@ -30,7 +30,7 @@ HWND VFWAPI capCreateCaptureWindowW(LPCWSTR lpszWindowName, DWORD dwStyle, INT x
INT y, INT nWidth, INT nHeight, HWND hWnd, INT y, INT nWidth, INT nHeight, HWND hWnd,
INT nID) INT nID)
{ {
FIXME("%s, %08lx, %08x, %08x, %08x, %08x, %x, %08x\n", FIXME("%s, %08lx, %08x, %08x, %08x, %08x, %p, %08x\n",
debugstr_w(lpszWindowName), dwStyle, debugstr_w(lpszWindowName), dwStyle,
x, y, nWidth, nHeight, hWnd, nID); x, y, nWidth, nHeight, hWnd, nID);
return 0; return 0;

View File

@ -889,7 +889,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStream, BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStream,
PAVISTREAM *ppavi, LPAVICOMPRESSOPTIONS *ppOptions) PAVISTREAM *ppavi, LPAVICOMPRESSOPTIONS *ppOptions)
{ {
FIXME("(0x%X,0x%X,%d,%p,%p): stub\n", hWnd, uFlags, nStream, FIXME("(%p,0x%X,%d,%p,%p): stub\n", hWnd, uFlags, nStream,
ppavi, ppOptions); ppavi, ppOptions);
return FALSE; return FALSE;

View File

@ -152,7 +152,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck,
assert(hmmio != (HMMIO)NULL); assert(hmmio != (HMMIO)NULL);
assert(lpck != NULL); assert(lpck != NULL);
TRACE("({%p,%lu},%d,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck, TRACE("({%p,%lu},%p,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck,
lpckParent, flags); lpckParent, flags);
/* what chunk id and form/list type shoiuld we search? */ /* what chunk id and form/list type shoiuld we search? */

View File

@ -200,7 +200,7 @@ DWORD WINAPI AVIFILE_DllCanUnloadNow(void)
BOOL WINAPI AVIFILE_DllMain(HINSTANCE hInstDll, DWORD fdwReason, BOOL WINAPI AVIFILE_DllMain(HINSTANCE hInstDll, DWORD fdwReason,
LPVOID lpvReserved) LPVOID lpvReserved)
{ {
TRACE("(0x%X,%lu,%p)\n", hInstDll, fdwReason, lpvReserved); TRACE("(%p,%lu,%p)\n", hInstDll, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

View File

@ -66,7 +66,7 @@ static struct regsvr_entry regsvr_entries[6] = {
*/ */
BOOL WINAPI COMCAT_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) BOOL WINAPI COMCAT_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{ {
TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) { switch(fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

View File

@ -81,7 +81,7 @@ static void convert_struct_stat( struct crtdll_stat *dst, const struct _stat *sr
*/ */
BOOL WINAPI CRTDLL_Init(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) BOOL WINAPI CRTDLL_Init(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
{ {
TRACE("(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved); TRACE("(%p,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH) if (fdwReason == DLL_PROCESS_ATTACH)
{ {

View File

@ -389,7 +389,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDevice (LPDIRECT3D8 iface,
HWND whichHWND; HWND whichHWND;
ICOM_THIS(IDirect3D8Impl,iface); ICOM_THIS(IDirect3D8Impl,iface);
TRACE("(%p)->(Adptr:%d, DevType: %x, FocusHwnd: %x, BehFlags: %lx, PresParms: %p, RetDevInt: %p)\n", This, Adapter, DeviceType, TRACE("(%p)->(Adptr:%d, DevType: %x, FocusHwnd: %p, BehFlags: %lx, PresParms: %p, RetDevInt: %p)\n", This, Adapter, DeviceType,
hFocusWindow, BehaviourFlags, pPresentationParameters, ppReturnedDeviceInterface); hFocusWindow, BehaviourFlags, pPresentationParameters, ppReturnedDeviceInterface);
/* Allocate the storage for the device */ /* Allocate the storage for the device */
@ -457,7 +457,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDevice (LPDIRECT3D8 iface,
ERR("Error in context creation !\n"); ERR("Error in context creation !\n");
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} else { } else {
TRACE("Context created (HWND=%x, glContext=%p, Window=%ld, VisInfo=%p)\n", TRACE("Context created (HWND=%p, glContext=%p, Window=%ld, VisInfo=%p)\n",
whichHWND, object->glCtx, object->win, object->visInfo); whichHWND, object->glCtx, object->win, object->visInfo);
} }

View File

@ -251,7 +251,7 @@ is_OpenGL(
ReleaseDC((*device)->surface->ddraw_owner->window,device_context); ReleaseDC((*device)->surface->ddraw_owner->window,device_context);
ENTER_GL(); ENTER_GL();
template.visualid = GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" ); template.visualid = (VisualID)GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" );
vis = XGetVisualInfo(odev->gdi_display, VisualIDMask, &template, &num); vis = XGetVisualInfo(odev->gdi_display, VisualIDMask, &template, &num);
if (vis == NULL) if (vis == NULL)
ERR("No visual found !\n"); ERR("No visual found !\n");

View File

@ -906,7 +906,7 @@ Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface)
static void DDRAW_SubclassWindow(IDirectDrawImpl* This) static void DDRAW_SubclassWindow(IDirectDrawImpl* This)
{ {
/* Well we don't actually subclass the window yet. */ /* Well we don't actually subclass the window yet. */
SetPropA(This->window, ddProp, (LONG)This); SetPropA(This->window, ddProp, This);
} }
static void DDRAW_UnsubclassWindow(IDirectDrawImpl* This) static void DDRAW_UnsubclassWindow(IDirectDrawImpl* This)
@ -942,7 +942,7 @@ Main_DirectDraw_SetCooperativeLevel(LPDIRECTDRAW7 iface, HWND hwnd,
This->window = hwnd; This->window = hwnd;
This->cooperative_level = cooplevel; This->cooperative_level = cooplevel;
This->local.hWnd = hwnd; This->local.hWnd = (ULONG_PTR)hwnd;
This->local.dwLocalFlags |= DDRAWILCL_SETCOOPCALLED; This->local.dwLocalFlags |= DDRAWILCL_SETCOOPCALLED;
/* not entirely sure about these */ /* not entirely sure about these */
if (cooplevel & DDSCL_EXCLUSIVE) This->local.dwLocalFlags |= DDRAWILCL_HASEXCLUSIVEMODE; if (cooplevel & DDSCL_EXCLUSIVE) This->local.dwLocalFlags |= DDRAWILCL_HASEXCLUSIVEMODE;
@ -1039,7 +1039,7 @@ Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,
HANDLE h) HANDLE h)
{ {
ICOM_THIS(IDirectDrawImpl,iface); ICOM_THIS(IDirectDrawImpl,iface);
FIXME("(%p)->(flags=0x%08lx,handle=0x%08x)\n",This,dwFlags,h); FIXME("(%p)->(flags=0x%08lx,handle=%p)\n",This,dwFlags,h);
return DD_OK; return DD_OK;
} }

View File

@ -174,7 +174,7 @@ static HRESULT create_dib(IDirectDrawSurfaceImpl* This)
ERR("unexpected error creating DirectDrawSurface DIB section\n"); ERR("unexpected error creating DirectDrawSurface DIB section\n");
/* this seems like a good place to put the handle for HAL driver use */ /* this seems like a good place to put the handle for HAL driver use */
This->global_more.hKernelSurface = priv->dib.DIBsection; This->global_more.hKernelSurface = (ULONG_PTR)priv->dib.DIBsection;
return S_OK; return S_OK;
} }

View File

@ -735,7 +735,7 @@ Main_DirectDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC)
hr = This->get_dc(This, &This->hDC); hr = This->get_dc(This, &This->hDC);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
TRACE("returning %08x\n",This->hDC); TRACE("returning %p\n",This->hDC);
*phDC = This->hDC; *phDC = This->hDC;
This->dc_in_use = TRUE; This->dc_in_use = TRUE;
@ -985,7 +985,7 @@ Main_DirectDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC)
HRESULT hr; HRESULT hr;
ICOM_THIS(IDirectDrawSurfaceImpl, iface); ICOM_THIS(IDirectDrawSurfaceImpl, iface);
TRACE("(%p)->(%08x)\n",This,hDC); TRACE("(%p)->(%p)\n",This,hDC);
if (!This->dc_in_use || This->hDC != hDC) if (!This->dc_in_use || This->hDC != hDC)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;

View File

@ -483,7 +483,7 @@ static DWORD CALLBACK User_update_thread(LPVOID arg)
{ {
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)arg; IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)arg;
USER_PRIV_VAR(priv, This); USER_PRIV_VAR(priv, This);
volatile DWORD *pActive = (volatile DWORD *)&priv->user.update_event; volatile HANDLE *pActive = (volatile HANDLE *)&priv->user.update_event;
HANDLE event = *pActive; HANDLE event = *pActive;
#ifdef OWN_WINDOW #ifdef OWN_WINDOW

View File

@ -412,7 +412,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
HWND hwndOwner, HWND hwndOwner,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(this=%p,0x%08x,0x%08lx): stub!\n", FIXME("(this=%p,%p,0x%08lx): stub!\n",
iface, hwndOwner, dwFlags); iface, hwndOwner, dwFlags);
return DI_OK; return DI_OK;
@ -424,7 +424,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(
DWORD dwVersion, DWORD dwVersion,
REFGUID rguid) REFGUID rguid)
{ {
FIXME("(this=%p,%d,%ld,%s): stub!\n", FIXME("(this=%p,%p,%ld,%s): stub!\n",
iface, hinst, dwVersion, debugstr_guid(rguid)); iface, hinst, dwVersion, debugstr_guid(rguid));
return DI_OK; return DI_OK;
} }

View File

@ -87,7 +87,7 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len)
for (i = 0; i < dsb->nrofnotifies ; i++) { for (i = 0; i < dsb->nrofnotifies ; i++) {
event = dsb->notifies + i; event = dsb->notifies + i;
offset = event->dwOffset; offset = event->dwOffset;
TRACE("checking %d, position %ld, event = %d\n", TRACE("checking %d, position %ld, event = %p\n",
i, offset, event->hEventNotify); i, offset, event->hEventNotify);
/* DSBPN_OFFSETSTOP has to be the last element. So this is */ /* DSBPN_OFFSETSTOP has to be the last element. So this is */
/* OK. [Inside DirectX, p274] */ /* OK. [Inside DirectX, p274] */
@ -97,7 +97,7 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len)
if (offset == DSBPN_OFFSETSTOP) { if (offset == DSBPN_OFFSETSTOP) {
if (dsb->state == STATE_STOPPED) { if (dsb->state == STATE_STOPPED) {
SetEvent(event->hEventNotify); SetEvent(event->hEventNotify);
TRACE("signalled event %d (%d)\n", event->hEventNotify, i); TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
return; return;
} else } else
return; return;
@ -105,12 +105,12 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len)
if ((dsb->playpos + len) >= dsb->buflen) { if ((dsb->playpos + len) >= dsb->buflen) {
if ((offset < ((dsb->playpos + len) % dsb->buflen)) || if ((offset < ((dsb->playpos + len) % dsb->buflen)) ||
(offset >= dsb->playpos)) { (offset >= dsb->playpos)) {
TRACE("signalled event %d (%d)\n", event->hEventNotify, i); TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
SetEvent(event->hEventNotify); SetEvent(event->hEventNotify);
} }
} else { } else {
if ((offset >= dsb->playpos) && (offset < (dsb->playpos + len))) { if ((offset >= dsb->playpos) && (offset < (dsb->playpos + len))) {
TRACE("signalled event %d (%d)\n", event->hEventNotify, i); TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
SetEvent(event->hEventNotify); SetEvent(event->hEventNotify);
} }
} }

View File

@ -43,7 +43,7 @@ BOOL WINAPI AlphaBlend( HDC hdcDest, int xDest, int yDest, int widthDest, int he
HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc, HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc,
BLENDFUNCTION func ) BLENDFUNCTION func )
{ {
FIXME("stub: AlphaBlend from %x to %x\n", hdcSrc, hdcDest ); FIXME("stub: AlphaBlend from %p to %p\n", hdcSrc, hdcDest );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
@ -56,7 +56,7 @@ BOOL WINAPI TransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, in
HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc, HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc,
UINT crTransparent ) UINT crTransparent )
{ {
FIXME("stub: TransparentBlt from %x to %x\n", hdcSrc, hdcDest ); FIXME("stub: TransparentBlt from %p to %p\n", hdcSrc, hdcDest );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }

View File

@ -57,7 +57,7 @@ BOOL WINAPI MSISYS_DllMain(
DWORD fdwReason, DWORD fdwReason,
LPVOID lpvReserved ) LPVOID lpvReserved )
{ {
TRACE("(%08x,%08lx,%p)\n",hInstDLL,fdwReason,lpvReserved); TRACE("(%p,%08lx,%p)\n",hInstDLL,fdwReason,lpvReserved);
switch ( fdwReason ) switch ( fdwReason )
{ {

View File

@ -186,7 +186,7 @@ static UCHAR NETBIOS_Astat(PNCB ncb)
BOOL WINAPI BOOL WINAPI
NETAPI32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) NETAPI32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

View File

@ -172,7 +172,7 @@ BOOL WINAPI
MAIN_OdbcInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) MAIN_OdbcInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
int i; int i;
TRACE("Initializing or Finalizing proxy ODBC: %x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); TRACE("Initializing or Finalizing proxy ODBC: %p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH) if (fdwReason == DLL_PROCESS_ATTACH)
{ {

View File

@ -26,7 +26,7 @@
#include "ole.h" #include "ole.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wownt32.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
@ -193,7 +193,7 @@ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIP
*/ */
BOOL WINAPI OleIsDcMeta(HDC hdc) BOOL WINAPI OleIsDcMeta(HDC hdc)
{ {
TRACE("(%04x)\n",hdc); TRACE("(%p)\n",hdc);
return GetObjectType( hdc ) == OBJ_METADC; return GetObjectType( hdc ) == OBJ_METADC;
} }
@ -203,7 +203,7 @@ BOOL WINAPI OleIsDcMeta(HDC hdc)
*/ */
BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc) BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
{ {
return OleIsDcMeta( hdc ); return OleIsDcMeta( HDC_32(hdc) );
} }

View File

@ -35,7 +35,7 @@ BOOL WINAPI OleUIAddVerbMenuA(
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax, HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, HMENU *lphMenu) BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
{ {
FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n", FIXME("(%p, %s, %p, %d, %d, %d, %d, %d, %p): stub\n",
lpOleObj, debugstr_a(lpszShortType), lpOleObj, debugstr_a(lpszShortType),
hMenu, uPos, uIDVerbMin, uIDVerbMax, hMenu, uPos, uIDVerbMin, uIDVerbMax,
bAddConvert, idConvert, lphMenu bAddConvert, idConvert, lphMenu
@ -52,7 +52,7 @@ BOOL WINAPI OleUIAddVerbMenuW(
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax, HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, HMENU *lphMenu) BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
{ {
FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n", FIXME("(%p, %s, %p, %d, %d, %d, %d, %d, %p): stub\n",
lpOleObj, debugstr_w(lpszShortType), lpOleObj, debugstr_w(lpszShortType),
hMenu, uPos, uIDVerbMin, uIDVerbMax, hMenu, uPos, uIDVerbMin, uIDVerbMax,
bAddConvert, idConvert, lphMenu bAddConvert, idConvert, lphMenu
@ -203,7 +203,7 @@ BOOL WINAPI OleUIUpdateLinksA(
LPOLEUILINKCONTAINERA lpOleUILinkCntr, LPOLEUILINKCONTAINERA lpOleUILinkCntr,
HWND hwndParent, LPSTR lpszTitle, INT cLinks) HWND hwndParent, LPSTR lpszTitle, INT cLinks)
{ {
FIXME("(%p, 0x%08x, %s, %d): stub\n", FIXME("(%p, %p, %s, %d): stub\n",
lpOleUILinkCntr, hwndParent, debugstr_a(lpszTitle), cLinks lpOleUILinkCntr, hwndParent, debugstr_a(lpszTitle), cLinks
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -217,7 +217,7 @@ BOOL WINAPI OleUIUpdateLinksW(
LPOLEUILINKCONTAINERW lpOleUILinkCntr, LPOLEUILINKCONTAINERW lpOleUILinkCntr,
HWND hwndParent, LPWSTR lpszTitle, INT cLinks) HWND hwndParent, LPWSTR lpszTitle, INT cLinks)
{ {
FIXME("(%p, 0x%08x, %s, %d): stub\n", FIXME("(%p, %p, %s, %d): stub\n",
lpOleUILinkCntr, hwndParent, debugstr_w(lpszTitle), cLinks lpOleUILinkCntr, hwndParent, debugstr_w(lpszTitle), cLinks
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -230,7 +230,7 @@ BOOL WINAPI OleUIUpdateLinksW(
INT __cdecl OleUIPromptUserA( INT __cdecl OleUIPromptUserA(
INT nTemplate, HWND hwndParent, ...) INT nTemplate, HWND hwndParent, ...)
{ {
FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent); FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE; return OLEUI_FALSE;
} }
@ -241,7 +241,7 @@ INT __cdecl OleUIPromptUserA(
INT __cdecl OleUIPromptUserW( INT __cdecl OleUIPromptUserW(
INT nTemplate, HWND hwndParent, ...) INT nTemplate, HWND hwndParent, ...)
{ {
FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent); FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE; return OLEUI_FALSE;
} }

View File

@ -127,7 +127,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer)
* OleRegisterServer [OLESVR32.2] * OleRegisterServer [OLESVR32.2]
*/ */
OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) { OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) {
FIXME("(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu); FIXME("(%s,%p,%p,%p,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
*hRet=++OLE_current_handle; *hRet=++OLE_current_handle;
return OLE_OK; return OLE_OK;
} }

View File

@ -133,11 +133,11 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
XVisualInfo template; XVisualInfo template;
Display *display = get_display( hdc ); Display *display = get_display( hdc );
TRACE("(%08x)\n", hdc); TRACE("(%p)\n", hdc);
/* First, get the visual in use by the X11DRV */ /* First, get the visual in use by the X11DRV */
if (!display) return 0; if (!display) return 0;
template.visualid = GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" ); template.visualid = (VisualID)GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" );
vis = XGetVisualInfo(display, VisualIDMask, &template, &num); vis = XGetVisualInfo(display, VisualIDMask, &template, &num);
if (vis == NULL) { if (vis == NULL) {
@ -163,7 +163,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
*/ */
HGLRC WINAPI wglCreateLayerContext(HDC hdc, HGLRC WINAPI wglCreateLayerContext(HDC hdc,
int iLayerPlane) { int iLayerPlane) {
FIXME("(%08x,%d): stub !\n", hdc, iLayerPlane); FIXME("(%p,%d): stub !\n", hdc, iLayerPlane);
return NULL; return NULL;
} }
@ -216,7 +216,7 @@ BOOL WINAPI wglDescribeLayerPlane(HDC hdc,
int iLayerPlane, int iLayerPlane,
UINT nBytes, UINT nBytes,
LPLAYERPLANEDESCRIPTOR plpd) { LPLAYERPLANEDESCRIPTOR plpd) {
FIXME("(%08x,%d,%d,%d,%p)\n", hdc, iPixelFormat, iLayerPlane, nBytes, plpd); FIXME("(%p,%d,%d,%d,%p)\n", hdc, iPixelFormat, iLayerPlane, nBytes, plpd);
return FALSE; return FALSE;
} }
@ -255,7 +255,7 @@ HDC WINAPI wglGetCurrentDC(void) {
LEAVE_GL(); LEAVE_GL();
if (ret) { if (ret) {
TRACE(" returning %08x (GL context %p - Wine context %p)\n", ret->hdc, gl_ctx, ret); TRACE(" returning %p (GL context %p - Wine context %p)\n", ret->hdc, gl_ctx, ret);
return ret->hdc; return ret->hdc;
} else { } else {
TRACE(" no Wine context found for GLX context %p\n", gl_ctx); TRACE(" no Wine context found for GLX context %p\n", gl_ctx);
@ -357,7 +357,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc,
HGLRC hglrc) { HGLRC hglrc) {
BOOL ret; BOOL ret;
TRACE("(%08x,%p)\n", hdc, hglrc); TRACE("(%p,%p)\n", hdc, hglrc);
ENTER_GL(); ENTER_GL();
if (hglrc == NULL) { if (hglrc == NULL) {
@ -437,7 +437,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1,
*/ */
BOOL WINAPI wglSwapLayerBuffers(HDC hdc, BOOL WINAPI wglSwapLayerBuffers(HDC hdc,
UINT fuPlanes) { UINT fuPlanes) {
TRACE("(%08x, %08x)\n", hdc, fuPlanes); TRACE("(%p, %08x)\n", hdc, fuPlanes);
if (fuPlanes & WGL_SWAP_MAIN_PLANE) { if (fuPlanes & WGL_SWAP_MAIN_PLANE) {
if (!SwapBuffers(hdc)) return FALSE; if (!SwapBuffers(hdc)) return FALSE;
@ -461,7 +461,7 @@ BOOL WINAPI wglUseFontBitmapsA(HDC hdc,
{ {
Font fid = get_font( hdc ); Font fid = get_font( hdc );
TRACE("(%08x, %ld, %ld, %ld) using font %ld\n", hdc, first, count, listBase, fid); TRACE("(%p, %ld, %ld, %ld) using font %ld\n", hdc, first, count, listBase, fid);
if (fid == 0) { if (fid == 0) {
/* We are running using client-side rendering fonts... */ /* We are running using client-side rendering fonts... */

View File

@ -66,7 +66,7 @@ DWORD WINAPI RasGetEntryDialParamsA( LPCSTR lpszPhoneBook,
*/ */
DWORD WINAPI RasHangUpA( HRASCONN hrasconn) DWORD WINAPI RasHangUpA( HRASCONN hrasconn)
{ {
FIXME("(%x),stub!\n",hrasconn); FIXME("(%p),stub!\n",hrasconn);
return 0; return 0;
} }

View File

@ -47,7 +47,7 @@ HANDLE RICHED32_hHeap = (HANDLE)NULL;
#define DPRINTF_EDIT_MSG32(str) \ #define DPRINTF_EDIT_MSG32(str) \
TRACE(\ TRACE(\
"32 bit : " str ": hwnd=%08x, wParam=%08x, lParam=%08x\n"\ "32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\
, \ , \
hwnd, (UINT)wParam, (UINT)lParam) hwnd, (UINT)wParam, (UINT)lParam)
@ -112,9 +112,9 @@ static LRESULT WINAPI RICHED32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
int rtfBufferSize; int rtfBufferSize;
CHARRANGE *cr; CHARRANGE *cr;
TRACE("previous hwndEdit: 0x%x hwndParent 0x%x\n",hwndEdit,hwndParent); TRACE("previous hwndEdit: %p hwndParent %p\n",hwndEdit,hwndParent);
hwndEdit = GetWindow(hwnd,GW_CHILD); hwndEdit = GetWindow(hwnd,GW_CHILD);
TRACE("uMsg: 0x%x hwnd: 0x%x hwndEdit: 0x%x\n",uMsg,hwnd,hwndEdit); TRACE("uMsg: 0x%x hwnd: %p hwndEdit: %p\n",uMsg,hwnd,hwndEdit);
switch (uMsg) switch (uMsg)
{ {
@ -131,12 +131,12 @@ static LRESULT WINAPI RICHED32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
newstyle &= ~ES_AUTOHSCROLL; newstyle &= ~ES_AUTOHSCROLL;
newstyle &= ~ES_AUTOVSCROLL; newstyle &= ~ES_AUTOVSCROLL;
TRACE("previous hwndEdit: 0x%d\n",hwndEdit); TRACE("previous hwndEdit: %p\n",hwndEdit);
hwndEdit = CreateWindowA ("edit", ((LPCREATESTRUCTA) lParam)->lpszName, hwndEdit = CreateWindowA ("edit", ((LPCREATESTRUCTA) lParam)->lpszName,
style, 0, 0, 0, 0, style, 0, 0, 0, 0,
hwnd, (HMENU) ID_EDIT, hwnd, (HMENU) ID_EDIT,
((LPCREATESTRUCTA) lParam)->hInstance, NULL) ; ((LPCREATESTRUCTA) lParam)->hInstance, NULL) ;
TRACE("hwndEdit: 0x%x hwnd: 0x%x\n",hwndEdit,hwnd); TRACE("hwndEdit: %p hwnd: %p\n",hwndEdit,hwnd);
SetWindowLongA(hwnd,GWL_STYLE, newstyle); SetWindowLongA(hwnd,GWL_STYLE, newstyle);
return 0 ; return 0 ;
@ -715,7 +715,7 @@ static LRESULT WINAPI RICHED32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
} }
FIXME("Unknown message 0x%x Passed to default hwnd=%08x, wParam=%08x, lParam=%08x\n", FIXME("Unknown message 0x%x Passed to default hwnd=%p, wParam=%08x, lParam=%08x\n",
uMsg, hwnd, (UINT)wParam, (UINT)lParam); uMsg, hwnd, (UINT)wParam, (UINT)lParam);
return DefWindowProcA( hwnd,uMsg,wParam,lParam); return DefWindowProcA( hwnd,uMsg,wParam,lParam);

View File

@ -160,7 +160,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll,
char keyname[120], module[120]; char keyname[120], module[120];
HKEY key, subkey; HKEY key, subkey;
TRACE("(%x,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid)); TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid));
UuidToStringA((UUID*)pclsid, &clsid); UuidToStringA((UUID*)pclsid, &clsid);
/* register interfaces to point to clsid */ /* register interfaces to point to clsid */
@ -220,7 +220,7 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll,
LPSTR clsid; LPSTR clsid;
char keyname[120], module[120]; char keyname[120], module[120];
TRACE("(%x,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid)); TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid));
UuidToStringA((UUID*)pclsid, &clsid); UuidToStringA((UUID*)pclsid, &clsid);
/* unregister interfaces */ /* unregister interfaces */

View File

@ -249,7 +249,7 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg)
if (bind) RPCRT4_SpawnBinding(&cbind, bind); if (bind) RPCRT4_SpawnBinding(&cbind, bind);
LeaveCriticalSection(&server_cs); LeaveCriticalSection(&server_cs);
if (!bind) { if (!bind) {
ERR("failed to locate binding for handle %d\n", b_handle); ERR("failed to locate binding for handle %p\n", b_handle);
} }
if (cbind) RPCRT4_new_client(cbind); if (cbind) RPCRT4_new_client(cbind);
} }

View File

@ -62,7 +62,7 @@ HMODULE SERIALUI_hModule = 0;
BOOL WINAPI BOOL WINAPI
SERIALUI_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) SERIALUI_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

View File

@ -97,7 +97,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(
HWND parent, HWND parent,
DWORD flags) DWORD flags)
{ {
FIXME("%s %s %04x %08lx\n",debugstr_guid(class),enumstr,parent,flags); FIXME("%s %s %p %08lx\n",debugstr_guid(class),enumstr,parent,flags);
return (HDEVINFO) INVALID_HANDLE_VALUE; return (HDEVINFO) INVALID_HANDLE_VALUE;
} }
@ -111,7 +111,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(
HWND parent, HWND parent,
DWORD flags) DWORD flags)
{ {
FIXME("%s %s %04x %08lx\n",debugstr_guid(class),debugstr_w(enumstr),parent,flags); FIXME("%s %s %p %08lx\n",debugstr_guid(class),debugstr_w(enumstr),parent,flags);
return (HDEVINFO) INVALID_HANDLE_VALUE; return (HDEVINFO) INVALID_HANDLE_VALUE;
} }

View File

@ -393,10 +393,10 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg )
} }
else if (RegCreateKeyW( root_key, buffer, &hkey )) else if (RegCreateKeyW( root_key, buffer, &hkey ))
{ {
ERR( "could not create key %08x %s\n", root_key, debugstr_w(buffer) ); ERR( "could not create key %p %s\n", root_key, debugstr_w(buffer) );
continue; continue;
} }
TRACE( "key %08x %s\n", root_key, debugstr_w(buffer) ); TRACE( "key %p %s\n", root_key, debugstr_w(buffer) );
/* get value name */ /* get value name */
if (!SetupGetStringFieldW( &context, 3, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) if (!SetupGetStringFieldW( &context, 3, buffer, sizeof(buffer)/sizeof(WCHAR), NULL ))

View File

@ -76,7 +76,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
*/ */
DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, PHKEY retkey ) DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, PHKEY retkey )
{ {
FIXME("(%x,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey); FIXME("(%p,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey);
return RegOpenKeyA( hkey, lpszSubKey, retkey ); return RegOpenKeyA( hkey, lpszSubKey, retkey );
} }
@ -87,7 +87,7 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName,
LPDWORD lpdwReserved, LPDWORD lpdwType, LPDWORD lpdwReserved, LPDWORD lpdwType,
LPBYTE lpbData, LPDWORD lpcbData ) LPBYTE lpbData, LPDWORD lpcbData )
{ {
FIXME("(%x,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName), FIXME("(%p,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName),
lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0); lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0);
return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType, return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType,
lpbData, lpcbData ); lpbData, lpcbData );

View File

@ -34,7 +34,7 @@ BOOL WINAPI SNMPAPI_DllMain(
DWORD fdwReason, DWORD fdwReason,
LPVOID lpvReserved) LPVOID lpvReserved)
{ {
TRACE("(%08x,%08lx,%p)\n", hInstDLL, fdwReason, lpvReserved); TRACE("(%p,%08lx,%p)\n", hInstDLL, fdwReason, lpvReserved);
switch(fdwReason) { switch(fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

View File

@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain);
BOOL WINAPI BOOL WINAPI
TWAIN_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TWAIN_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) switch (fdwReason)
{ {

View File

@ -36,7 +36,7 @@ HINSTANCE URLMON_hInstance = 0;
BOOL WINAPI URLMON_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) BOOL WINAPI URLMON_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{ {
TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) { switch(fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

View File

@ -102,7 +102,7 @@ BOOL16 WINAPI IsPeFormat16( LPSTR fn, /* [in] filename to executeable */
HFILE hf; HFILE hf;
if (fn) hf = OpenFile(fn,&ofs,OF_READ); if (fn) hf = OpenFile(fn,&ofs,OF_READ);
else hf = DosFileHandleToWin32Handle( hf16 ); else hf = (HFILE)DosFileHandleToWin32Handle( hf16 );
if (hf == HFILE_ERROR) return FALSE; if (hf == HFILE_ERROR) return FALSE;
_llseek(hf,0,SEEK_SET); _llseek(hf,0,SEEK_SET);
if (sizeof(mzh)!=_lread(hf,&mzh,sizeof(mzh))) goto done; if (sizeof(mzh)!=_lread(hf,&mzh,sizeof(mzh))) goto done;

View File

@ -286,7 +286,7 @@ WNASPI32_DoPosting( SRB_ExecSCSICmd *lpPRB, DWORD status )
(*SRB_PostProc)(lpPRB); (*SRB_PostProc)(lpPRB);
} }
else if (SRB_Flags & SRB_EVENT_NOTIFY) { else if (SRB_Flags & SRB_EVENT_NOTIFY) {
TRACE("Setting event %04x\n", (HANDLE)SRB_PostProc); TRACE("Setting event %p\n", (HANDLE)SRB_PostProc);
SetEvent((HANDLE)SRB_PostProc); SetEvent((HANDLE)SRB_PostProc);
} }
} }

View File

@ -417,8 +417,8 @@ DWORD WINAPI DOSVM_Loop( HANDLE hThread )
DOS_SPC *spc = (DOS_SPC *)msg.lParam; DOS_SPC *spc = (DOS_SPC *)msg.lParam;
TRACE_(int)("calling %p with arg %08lx\n", spc->proc, spc->arg); TRACE_(int)("calling %p with arg %08lx\n", spc->proc, spc->arg);
(spc->proc)(spc->arg); (spc->proc)(spc->arg);
TRACE_(int)("done, signalling event %d\n", msg.wParam); TRACE_(int)("done, signalling event %x\n", msg.wParam);
SetEvent(msg.wParam); SetEvent( (HANDLE)msg.wParam );
} }
break; break;
} }
@ -692,7 +692,7 @@ void DOSVM_RealModeInterrupt( BYTE intnum, CONTEXT86 *context )
*/ */
BOOL WINAPI DOSVM_Init( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) BOOL WINAPI DOSVM_Init( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{ {
TRACE_(module)("(0x%08x,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved); TRACE_(module)("(%p,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH) if (fdwReason == DLL_PROCESS_ATTACH)
{ {

View File

@ -426,7 +426,7 @@ void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
spc.proc = proc; spc.proc = proc;
spc.arg = arg; spc.arg = arg;
event = CreateEventA(NULL, TRUE, FALSE, NULL); event = CreateEventA(NULL, TRUE, FALSE, NULL);
PostThreadMessageA(loop_tid, WM_USER, event, (LPARAM)&spc); PostThreadMessageA(loop_tid, WM_USER, (WPARAM)event, (LPARAM)&spc);
WaitForSingleObject(event, INFINITE); WaitForSingleObject(event, INFINITE);
CloseHandle(event); CloseHandle(event);
} else } else

View File

@ -173,7 +173,7 @@ INT PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT widthDs
INT line; INT line;
POINT pt[2]; POINT pt[2];
TRACE("%08x (%d,%d %dx%d) -> (%d,%d %dx%d)\n", physDev->hdc, TRACE("%p (%d,%d %dx%d) -> (%d,%d %dx%d)\n", physDev->hdc,
xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst); xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst);
if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE;

View File

@ -33,7 +33,7 @@ HBRUSH PSDRV_SelectBrush( PSDRV_PDEVICE *physDev, HBRUSH hbrush )
if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0; if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0;
TRACE("hbrush = %08x\n", hbrush); TRACE("hbrush = %p\n", hbrush);
switch(logbrush.lbStyle) { switch(logbrush.lbStyle) {
@ -207,11 +207,11 @@ BOOL PSDRV_Brush(PSDRV_PDEVICE *physDev, BOOL EO)
{ {
BITMAP bm; BITMAP bm;
BYTE *bits; BYTE *bits;
GetObjectA(logbrush.lbHatch, sizeof(BITMAP), &bm); GetObjectA( (HBITMAP)logbrush.lbHatch, sizeof(BITMAP), &bm);
TRACE("BS_PATTERN %dx%d %d bpp\n", bm.bmWidth, bm.bmHeight, TRACE("BS_PATTERN %dx%d %d bpp\n", bm.bmWidth, bm.bmHeight,
bm.bmBitsPixel); bm.bmBitsPixel);
bits = HeapAlloc(PSDRV_Heap, 0, bm.bmWidthBytes * bm.bmHeight); bits = HeapAlloc(PSDRV_Heap, 0, bm.bmWidthBytes * bm.bmHeight);
GetBitmapBits(logbrush.lbHatch, bm.bmWidthBytes * bm.bmHeight, bits); GetBitmapBits( (HBITMAP)logbrush.lbHatch, bm.bmWidthBytes * bm.bmHeight, bits);
if(physDev->pi->ppd->LanguageLevel > 1) { if(physDev->pi->ppd->LanguageLevel > 1) {
PSDRV_WriteGSave(physDev); PSDRV_WriteGSave(physDev);

View File

@ -35,7 +35,7 @@ VOID PSDRV_SetDeviceClipping( PSDRV_PDEVICE *physDev, HRGN ignored )
HRGN hrgn = CreateRectRgn(0,0,0,0); HRGN hrgn = CreateRectRgn(0,0,0,0);
BOOL empty; BOOL empty;
TRACE("hdc=%04x\n", physDev->hdc); TRACE("hdc=%p\n", physDev->hdc);
empty = !GetClipRgn(physDev->hdc, hrgn); empty = !GetClipRgn(physDev->hdc, hrgn);

View File

@ -20,6 +20,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wownt32.h"
#include "psdrv.h" #include "psdrv.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "winspool.h" #include "winspool.h"
@ -267,7 +268,7 @@ INT PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOA *doc )
physDev->job.output = HeapAlloc( PSDRV_Heap, 0, strlen(doc->lpszOutput)+1 ); physDev->job.output = HeapAlloc( PSDRV_Heap, 0, strlen(doc->lpszOutput)+1 );
strcpy( physDev->job.output, doc->lpszOutput ); strcpy( physDev->job.output, doc->lpszOutput );
} }
physDev->job.hJob = OpenJob16(physDev->job.output, doc->lpszDocName, physDev->hdc ); physDev->job.hJob = OpenJob16(physDev->job.output, doc->lpszDocName, HDC_16(physDev->hdc) );
if(!physDev->job.hJob) { if(!physDev->job.hJob) {
WARN("OpenJob failed\n"); WARN("OpenJob failed\n");
return 0; return 0;

View File

@ -36,7 +36,7 @@ HFONT PSDRV_SelectFont( PSDRV_PDEVICE *physDev, HFONT hfont )
BOOL subst = FALSE; BOOL subst = FALSE;
char FaceName[LF_FACESIZE]; char FaceName[LF_FACESIZE];
if (!GetObjectW( hfont, sizeof(lf), &lf )) return 0; if (!GetObjectW( hfont, sizeof(lf), &lf )) return HGDI_ERROR;
TRACE("FaceName = %s Height = %ld Italic = %d Weight = %ld\n", TRACE("FaceName = %s Height = %ld Italic = %d Weight = %ld\n",
debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic, debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic,
@ -107,11 +107,11 @@ HFONT PSDRV_SelectFont( PSDRV_PDEVICE *physDev, HFONT hfont )
if(physDev->dc->gdiFont && !subst) { if(physDev->dc->gdiFont && !subst) {
if(PSDRV_SelectDownloadFont(physDev)) if(PSDRV_SelectDownloadFont(physDev))
return FALSE; /* use gdi font */ return 0; /* use gdi font */
} }
PSDRV_SelectBuiltinFont(physDev, hfont, &lf, FaceName); PSDRV_SelectBuiltinFont(physDev, hfont, &lf, FaceName);
return TRUE; /* use device font */ return (HFONT)1; /* use device font */
} }
/*********************************************************************** /***********************************************************************

View File

@ -107,7 +107,7 @@ static LOGFONTA DefaultLogFont = {
*/ */
BOOL WINAPI PSDRV_Init( HINSTANCE hinst, DWORD reason, LPVOID reserved ) BOOL WINAPI PSDRV_Init( HINSTANCE hinst, DWORD reason, LPVOID reserved )
{ {
TRACE("(0x%4x, 0x%08lx, %p)\n", hinst, reason, reserved); TRACE("(%p, 0x%08lx, %p)\n", hinst, reason, reserved);
switch(reason) { switch(reason) {
@ -425,7 +425,7 @@ INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap )
case BTLALIGNMENT: case BTLALIGNMENT:
return 0; return 0;
default: default:
FIXME("(%04x): unsupported capability %d, will return 0\n", physDev->hdc, cap ); FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap );
return 0; return 0;
} }
} }

View File

@ -39,7 +39,7 @@ HPEN PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen )
if (!GetObjectA( hpen, sizeof(logpen), &logpen )) return 0; if (!GetObjectA( hpen, sizeof(logpen), &logpen )) return 0;
TRACE("hpen = %08x colour = %08lx\n", hpen, logpen.lopnColor); TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor);
physDev->pen.width = INTERNAL_XWSTODS(physDev->dc, logpen.lopnWidth.x); physDev->pen.width = INTERNAL_XWSTODS(physDev->dc, logpen.lopnWidth.x);
if(physDev->pen.width < 0) if(physDev->pen.width < 0)

View File

@ -109,7 +109,7 @@ LPWORKREQUEST lpWorkQueueTail;
BOOL WINAPI BOOL WINAPI
WININET_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) WININET_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

View File

@ -402,7 +402,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSA lpPar
break; break;
case MCI_DGV_STATUS_HWND: case MCI_DGV_STATUS_HWND:
lpParms->dwReturn = (DWORD)wma->hWnd; lpParms->dwReturn = (DWORD)wma->hWnd;
TRACE("MCI_DGV_STATUS_HWND => %u\n", wma->hWnd); TRACE("MCI_DGV_STATUS_HWND => %p\n", wma->hWnd);
break; break;
#if 0 #if 0
case MCI_DGV_STATUS_KEY_COLOR: case MCI_DGV_STATUS_KEY_COLOR:

View File

@ -936,7 +936,7 @@ static DWORD MCIAVI_mciRestore(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RESTORE_PAR
LONG CALLBACK MCIAVI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, LONG CALLBACK MCIAVI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
DWORD dwParam1, DWORD dwParam2) DWORD dwParam1, DWORD dwParam2)
{ {
TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", TRACE("(%08lX, %p, %08lX, %08lX, %08lX)\n",
dwDevID, hDriv, wMsg, dwParam1, dwParam2); dwDevID, hDriv, wMsg, dwParam1, dwParam2);
switch (wMsg) { switch (wMsg) {

View File

@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam); TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
if (!(WINE_MCIAVI*)GetWindowLongA(hWnd, 0) && uMsg != WM_CREATE) if (!(WINE_MCIAVI*)GetWindowLongA(hWnd, 0) && uMsg != WM_CREATE)
return DefWindowProcA(hWnd, uMsg, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);

View File

@ -744,7 +744,7 @@ static DWORD MIDI_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpParms)
wmm->hFile = 0; wmm->hFile = 0;
} }
} }
TRACE("hFile=%u\n", wmm->hFile); TRACE("hFile=%p\n", wmm->hFile);
/* FIXME: should I get a strdup() of it instead? */ /* FIXME: should I get a strdup() of it instead? */
wmm->lpstrElementName = HeapAlloc( GetProcessHeap(), 0, strlen(lpParms->lpstrElementName)+1 ); wmm->lpstrElementName = HeapAlloc( GetProcessHeap(), 0, strlen(lpParms->lpstrElementName)+1 );

View File

@ -461,7 +461,7 @@ static DWORD WAVE_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSA lpO
} }
} }
TRACE("hFile=%u\n", wmw->hFile); TRACE("hFile=%p\n", wmw->hFile);
memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMSA)); memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMSA));
@ -1586,7 +1586,7 @@ static DWORD WAVE_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
LONG CALLBACK MCIWAVE_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, LONG CALLBACK MCIWAVE_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
DWORD dwParam1, DWORD dwParam2) DWORD dwParam1, DWORD dwParam2)
{ {
TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", TRACE("(%08lX, %p, %08lX, %08lX, %08lX)\n",
dwDevID, hDriv, wMsg, dwParam1, dwParam2); dwDevID, hDriv, wMsg, dwParam1, dwParam2);
switch (wMsg) { switch (wMsg) {

View File

@ -584,7 +584,7 @@ static VOID WINAPI midTimeCallback(HWND hwnd, UINT msg, UINT id, DWORD dwTime)
unsigned char buffer[256]; unsigned char buffer[256];
int len, idx; int len, idx;
TRACE("(%04X, %d, %d, %lu)\n", hwnd, msg, id, dwTime); TRACE("(%p, %d, %d, %lu)\n", hwnd, msg, id, dwTime);
len = read(midiSeqFD, buffer, sizeof(buffer)); len = read(midiSeqFD, buffer, sizeof(buffer));

View File

@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win32);
*/ */
LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData )
{ {
FIXME("(hwnd 0x%04x ActionId %p ActionData %p): stub (nothing will be verified)\n", FIXME("(hwnd %p ActionId %p ActionData %p): stub (nothing will be verified)\n",
hwnd, ActionID, ActionData); hwnd, ActionID, ActionData);
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }