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

Converted to the new debug interface, using script written by Patrik 

Stridvall.
This commit is contained in:
Alexandre Julliard 1999-06-26 19:09:08 +00:00
parent 617955db88
commit 61fece0590
106 changed files with 2184 additions and 2184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/d3dcommon.c
View File

@ -8,7 +8,7 @@
#include "wine/obj_base.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
#include "debugtools.h"
#include "d3d_private.h"
@ -106,7 +106,7 @@ static void _dump_renderstate(D3DRENDERSTATETYPE type,
"D3DRENDERSTATE_STIPPLEPATTERN31"
};
DUMP(" %s = 0x%08lx\n", states[type], value);
DPRINTF(" %s = 0x%08lx\n", states[type], value);
}
@ -120,7 +120,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
/* First, all the stipple patterns */
if ((dwRenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00) &&
(dwRenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)) {
ERR(ddraw, "Unhandled stipple !\n");
ERR("Unhandled stipple !\n");
} else {
ENTER_GL();
@ -134,7 +134,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
} else {
TRACE(ddraw, "setting OpenGL texture handle : %d\n", tex->tex_name);
TRACE("setting OpenGL texture handle : %d\n", tex->tex_name);
glEnable(GL_TEXTURE_2D);
/* Default parameters */
glBindTexture(GL_TEXTURE_2D, tex->tex_name);
@ -165,7 +165,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled fill mode !\n");
ERR("Unhandled fill mode !\n");
}
break;
@ -180,7 +180,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled shade mode !\n");
ERR("Unhandled shade mode !\n");
}
break;
@ -202,7 +202,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled texture mag !\n");
ERR("Unhandled texture mag !\n");
}
break;
@ -217,7 +217,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled texture min !\n");
ERR("Unhandled texture min !\n");
}
break;
@ -228,7 +228,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled blend mode !\n");
ERR("Unhandled blend mode !\n");
}
glBlendFunc(rs->src, rs->dst);
@ -241,7 +241,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled blend mode !\n");
ERR("Unhandled blend mode !\n");
}
glBlendFunc(rs->src, rs->dst);
@ -255,7 +255,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled texture environment !\n");
ERR("Unhandled texture environment !\n");
}
break;
@ -276,7 +276,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled cull mode !\n");
ERR("Unhandled cull mode !\n");
}
break;
@ -308,7 +308,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unexpected value\n");
ERR("Unexpected value\n");
}
break;
@ -337,7 +337,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
break;
default:
ERR(ddraw, "Unhandled Render State\n");
ERR("Unhandled Render State\n");
break;
}

202
graphics/d3ddevices.c
View File

@ -12,7 +12,7 @@
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
#include "debugtools.h"
#include "d3d_private.h"
@ -59,7 +59,7 @@ static void set_context(IDirect3DDevice2Impl* This) {
if (glXMakeCurrent(display,
odev->common.surface->s.ddraw->d.drawable,
odev->ctx) == False) {
ERR(ddraw, "Error in setting current context (context %p drawable %ld)!\n",
ERR("Error in setting current context (context %p drawable %ld)!\n",
odev->ctx, odev->common.surface->s.ddraw->d.drawable);
}
#endif
@ -77,7 +77,7 @@ static void set_context_dx3(IDirect3DDeviceImpl* This) {
if (glXMakeCurrent(display,
odev->common.surface->s.ddraw->d.drawable,
odev->ctx) == False) {
ERR(ddraw, "Error in setting current context !\n");
ERR("Error in setting current context !\n");
}
#endif
}
@ -144,7 +144,7 @@ static void fill_opengl_caps(D3DDEVICEDESC *d1, D3DDEVICEDESC *d2)
int d3d_OpenGL(LPD3DENUMDEVICESCALLBACK cb, LPVOID context) {
D3DDEVICEDESC d1,d2;
TRACE(ddraw," Enumerating OpenGL D3D device.\n");
TRACE(" Enumerating OpenGL D3D device.\n");
fill_opengl_caps(&d1, &d2);
@ -184,7 +184,7 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I
(*device)->set_context = set_context;
TRACE(ddraw, "Creating OpenGL device for surface %p\n", surface);
TRACE("Creating OpenGL device for surface %p\n", surface);
/* Create the OpenGL context */
#ifdef USE_OSMESA
@ -193,7 +193,7 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I
surface->s.surface_desc.dwWidth * surface->s.surface_desc.dwHeight * 4);
#else
/* First get the correct visual */
TRACE(ddraw, "Backbuffer : %d\n", surface->s.backbuffer == NULL);
TRACE("Backbuffer : %d\n", surface->s.backbuffer == NULL);
/* if (surface->s.backbuffer == NULL)
attributeList[3] = None; */
ENTER_GL();
@ -201,18 +201,18 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I
DefaultScreen(display),
attributeList);
if (xvis == NULL)
ERR(ddraw, "No visual found !\n");
ERR("No visual found !\n");
else
TRACE(ddraw, "Visual found\n");
TRACE("Visual found\n");
/* Create the context */
odev->ctx = glXCreateContext(display,
xvis,
NULL,
GL_TRUE);
if (odev->ctx == NULL)
ERR(ddraw, "Error in context creation !\n");
ERR("Error in context creation !\n");
else
TRACE(ddraw, "Context created (%p)\n", odev->ctx);
TRACE("Context created (%p)\n", odev->ctx);
/* Now override the surface's Flip method (if in double buffering) */
surface->s.d3d_device = (void *) odev;
@ -230,14 +230,14 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I
memcpy(odev->proj_mat , id_mat, 16 * sizeof(float));
/* Initialisation */
TRACE(ddraw, "Setting current context\n");
TRACE("Setting current context\n");
(*device)->set_context(*device);
TRACE(ddraw, "Current context set\n");
TRACE("Current context set\n");
glClearColor(0.0, 0.0, 0.0, 0.0);
glColor3f(1.0, 1.0, 1.0);
LEAVE_GL();
TRACE(ddraw, "OpenGL device created \n");
TRACE("OpenGL device created \n");
return 1;
}
@ -258,7 +258,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_QueryInterface(LPDIRECT3DDEVICE2 ifac
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
return S_OK;
}
@ -268,7 +268,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_QueryInterface(LPDIRECT3DDEVICE2 ifac
static ULONG WINAPI IDirect3DDevice2Impl_AddRef(LPDIRECT3DDEVICE2 iface)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
return ++(This->ref);
}
@ -278,7 +278,7 @@ static ULONG WINAPI IDirect3DDevice2Impl_AddRef(LPDIRECT3DDEVICE2 iface)
static ULONG WINAPI IDirect3DDevice2Impl_Release(LPDIRECT3DDEVICE2 iface)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This;
@ -306,7 +306,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetCaps(LPDIRECT3DDEVICE2 iface,
LPD3DDEVICEDESC lpdeschard)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lpdescsoft, lpdeschard);
FIXME("(%p)->(%p,%p): stub\n", This, lpdescsoft, lpdeschard);
fill_opengl_caps(lpdescsoft, lpdeschard);
@ -320,7 +320,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SwapTextureHandles(LPDIRECT3DDEVICE2
LPDIRECT3DTEXTURE2 lptex2)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lptex1, lptex2);
FIXME("(%p)->(%p,%p): stub\n", This, lptex1, lptex2);
return DD_OK;
}
@ -331,7 +331,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetStats(LPDIRECT3DDEVICE2 iface,
LPD3DSTATS lpstats)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpstats);
FIXME("(%p)->(%p): stub\n", This, lpstats);
return DD_OK;
}
@ -343,7 +343,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_AddViewport(LPDIRECT3DDEVICE2 iface,
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp;
FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpvp);
FIXME("(%p)->(%p): stub\n", This, ilpvp);
/* Adds this viewport to the viewport list */
ilpvp->next = This->viewport_list;
@ -360,7 +360,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_DeleteViewport(LPDIRECT3DDEVICE2 ifac
ICOM_THIS(IDirect3DDevice2Impl,iface);
IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp;
IDirect3DViewport2Impl *cur, *prev;
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp);
FIXME("(%p)->(%p): stub\n", This, lpvp);
/* Finds this viewport in the list */
prev = NULL;
@ -391,7 +391,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_NextViewport(LPDIRECT3DDEVICE2 iface,
ICOM_THIS(IDirect3DDevice2Impl,iface);
IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp;
IDirect3DViewport2Impl** ilplpvp=(IDirect3DViewport2Impl**)lplpvp;
FIXME(ddraw, "(%p)->(%p,%p,%08lx): stub\n", This, lpvp, lpvp, dwFlags);
FIXME("(%p)->(%p,%p,%08lx): stub\n", This, lpvp, lpvp, dwFlags);
switch (dwFlags) {
case D3DNEXT_NEXT:
@ -430,7 +430,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
pformat->dwSize = sizeof(DDPIXELFORMAT);
pformat->dwFourCC = 0;
TRACE(ddraw, "Enumerating GL_RGBA unpacked (32)\n");
TRACE("Enumerating GL_RGBA unpacked (32)\n");
pformat->dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS;
pformat->x.dwRGBBitCount = 32;
pformat->y.dwRBitMask = 0xFF000000;
@ -440,7 +440,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
if (cb(&sdesc, context) == 0)
return DD_OK;
TRACE(ddraw, "Enumerating GL_RGB unpacked (24)\n");
TRACE("Enumerating GL_RGB unpacked (24)\n");
pformat->dwFlags = DDPF_RGB;
pformat->x.dwRGBBitCount = 24;
pformat->y.dwRBitMask = 0x00FF0000;
@ -453,7 +453,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
#ifndef HAVE_BUGGY_MESAGL
/* The packed texture format are buggy in Mesa. The bug was reported and corrected,
so that future version will work great. */
TRACE(ddraw, "Enumerating GL_RGB packed GL_UNSIGNED_SHORT_5_6_5 (16)\n");
TRACE("Enumerating GL_RGB packed GL_UNSIGNED_SHORT_5_6_5 (16)\n");
pformat->dwFlags = DDPF_RGB;
pformat->x.dwRGBBitCount = 16;
pformat->y.dwRBitMask = 0x0000F800;
@ -463,7 +463,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
if (cb(&sdesc, context) == 0)
return DD_OK;
TRACE(ddraw, "Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_5_5_5_1 (16)\n");
TRACE("Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_5_5_5_1 (16)\n");
pformat->dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS;
pformat->x.dwRGBBitCount = 16;
pformat->y.dwRBitMask = 0x0000F800;
@ -473,7 +473,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
if (cb(&sdesc, context) == 0)
return DD_OK;
TRACE(ddraw, "Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_4_4_4_4 (16)\n");
TRACE("Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_4_4_4_4 (16)\n");
pformat->dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS;
pformat->x.dwRGBBitCount = 16;
pformat->y.dwRBitMask = 0x0000F000;
@ -483,7 +483,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
if (cb(&sdesc, context) == 0)
return DD_OK;
TRACE(ddraw, "Enumerating GL_RGB packed GL_UNSIGNED_BYTE_3_3_2 (8)\n");
TRACE("Enumerating GL_RGB packed GL_UNSIGNED_BYTE_3_3_2 (8)\n");
pformat->dwFlags = DDPF_RGB;
pformat->x.dwRGBBitCount = 8;
pformat->y.dwRBitMask = 0x0000F800;
@ -494,7 +494,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
return DD_OK;
#endif
TRACE(ddraw, "Enumerating Paletted (8)\n");
TRACE("Enumerating Paletted (8)\n");
pformat->dwFlags = DDPF_PALETTEINDEXED8;
pformat->x.dwRGBBitCount = 8;
pformat->y.dwRBitMask = 0x00000000;
@ -504,7 +504,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb,
if (cb(&sdesc, context) == 0)
return DD_OK;
TRACE(ddraw, "End of enumeration\n");
TRACE("End of enumeration\n");
return DD_OK;
}
@ -514,7 +514,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_EnumTextureFormats(LPDIRECT3DDEVICE2
LPVOID context)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, cb, context);
FIXME("(%p)->(%p,%p): stub\n", This, cb, context);
return enum_texture_format_OpenGL(cb, context);
}
@ -526,7 +526,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_BeginScene(LPDIRECT3DDEVICE2 iface)
ICOM_THIS(IDirect3DDevice2Impl,iface);
/* OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This; */
FIXME(ddraw, "(%p)->(): stub\n", This);
FIXME("(%p)->(): stub\n", This);
/* Here, we should get the DDraw surface and 'copy it' to the
OpenGL surface.... */
@ -548,7 +548,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_EndScene(LPDIRECT3DDEVICE2 iface)
unsigned short *dest;
#endif
FIXME(ddraw, "(%p)->(): stub\n", This);
FIXME("(%p)->(): stub\n", This);
#ifdef USE_OSMESA
/* Here we copy back the OpenGL scene to the the DDraw surface */
@ -593,7 +593,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_EndScene(LPDIRECT3DDEVICE2 iface)
static HRESULT WINAPI IDirect3DDevice2Impl_GetDirect3D(LPDIRECT3DDEVICE2 iface, LPDIRECT3D2 *lpd3d2)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
TRACE(ddraw, "(%p)->(%p): stub\n", This, lpd3d2);
TRACE("(%p)->(%p): stub\n", This, lpd3d2);
*lpd3d2 = (LPDIRECT3D2)This->d3d;
@ -608,7 +608,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetCurrentViewport(LPDIRECT3DDEVICE2
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp;
FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpvp);
FIXME("(%p)->(%p): stub\n", This, ilpvp);
/* Should check if the viewport was added or not */
@ -628,7 +628,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetCurrentViewport(LPDIRECT3DDEVICE2
LPDIRECT3DVIEWPORT2 *lplpvp)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lplpvp);
FIXME("(%p)->(%p): stub\n", This, lplpvp);
/* Returns the current viewport */
*lplpvp = (LPDIRECT3DVIEWPORT2)This->current_viewport;
@ -643,7 +643,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetRenderTarget(LPDIRECT3DDEVICE2 ifa
DWORD dwFlags)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%08lx): stub\n", This, lpdds, dwFlags);
FIXME("(%p)->(%p,%08lx): stub\n", This, lpdds, dwFlags);
return DD_OK;
}
@ -654,7 +654,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetRenderTarget(LPDIRECT3DDEVICE2 ifa
LPDIRECTDRAWSURFACE *lplpdds)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lplpdds);
FIXME("(%p)->(%p): stub\n", This, lplpdds);
/* Returns the current rendering target (the surface on wich we render) */
*lplpdds = (LPDIRECTDRAWSURFACE)This->surface;
@ -670,7 +670,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_Begin(LPDIRECT3DDEVICE2 iface,
DWORD dwFlags)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d,%d,%08lx): stub\n", This, d3dp, d3dv, dwFlags);
FIXME("(%p)->(%d,%d,%08lx): stub\n", This, d3dp, d3dv, dwFlags);
return DD_OK;
}
@ -685,7 +685,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_BeginIndexed(LPDIRECT3DDEVICE2 iface,
DWORD dwFlags)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvert, numvert, dwFlags);
FIXME("(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvert, numvert, dwFlags);
return DD_OK;
}
@ -696,7 +696,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_Vertex(LPDIRECT3DDEVICE2 iface,
LPVOID lpvert)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvert);
FIXME("(%p)->(%p): stub\n", This, lpvert);
return DD_OK;
}
@ -707,7 +707,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_Index(LPDIRECT3DDEVICE2 iface,
WORD index)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d): stub\n", This, index);
FIXME("(%p)->(%d): stub\n", This, index);
return DD_OK;
}
@ -718,7 +718,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_End(LPDIRECT3DDEVICE2 iface,
DWORD dwFlags)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%08lx): stub\n", This, dwFlags);
FIXME("(%p)->(%08lx): stub\n", This, dwFlags);
return DD_OK;
}
@ -731,7 +731,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetRenderState(LPDIRECT3DDEVICE2 ifac
LPDWORD lprstate)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3drs, lprstate);
FIXME("(%p)->(%d,%p): stub\n", This, d3drs, lprstate);
return DD_OK;
}
@ -745,7 +745,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetRenderState(LPDIRECT3DDEVICE2 ifac
ICOM_THIS(IDirect3DDevice2Impl,iface);
OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This;
TRACE(ddraw, "(%p)->(%d,%ld)\n", This, dwRenderStateType, dwRenderState);
TRACE("(%p)->(%d,%ld)\n", This, dwRenderStateType, dwRenderState);
/* Call the render state functions */
set_render_state(dwRenderStateType, dwRenderState, &(odev->rs));
@ -760,7 +760,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetLightState(LPDIRECT3DDEVICE2 iface
LPDWORD lplstate)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dls, lplstate);
FIXME("(%p)->(%d,%p): stub\n", This, d3dls, lplstate);
return DD_OK;
}
@ -772,7 +772,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetLightState(LPDIRECT3DDEVICE2 iface
DWORD dwLightState)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d,%08lx): stub\n", This, dwLightStateType, dwLightState);
FIXME("(%p)->(%d,%08lx): stub\n", This, dwLightStateType, dwLightState);
switch (dwLightStateType) {
case D3DLIGHTSTATE_MATERIAL: { /* 1 */
@ -783,7 +783,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetLightState(LPDIRECT3DDEVICE2 iface
mat->activate(mat);
LEAVE_GL();
} else {
TRACE(ddraw, "Zoups !!!\n");
TRACE("Zoups !!!\n");
}
} break;
@ -815,7 +815,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetLightState(LPDIRECT3DDEVICE2 iface
break;
default:
TRACE(ddraw, "Unexpected Light State Type\n");
TRACE("Unexpected Light State Type\n");
return DDERR_INVALIDPARAMS;
}
@ -831,7 +831,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetTransform(LPDIRECT3DDEVICE2 iface,
ICOM_THIS(IDirect3DDevice2Impl,iface);
OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This;
FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix);
FIXME("(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix);
ENTER_GL();
@ -903,7 +903,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetTransform(LPDIRECT3DDEVICE2 iface,
LPD3DMATRIX lpmatrix)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix);
FIXME("(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix);
return DD_OK;
}
@ -915,7 +915,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
LPD3DMATRIX lpmatrix)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix);
FIXME("(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix);
return DD_OK;
}
@ -934,19 +934,19 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
\
switch (d3dv) { \
case D3DVT_VERTEX: \
TRACE(ddraw, "Standard Vertex\n"); \
TRACE("Standard Vertex\n"); \
glEnable(GL_LIGHTING); \
break; \
\
case D3DVT_LVERTEX: \
TRACE(ddraw, "Lighted Vertex\n"); \
TRACE("Lighted Vertex\n"); \
glDisable(GL_LIGHTING); \
break; \
\
case D3DVT_TLVERTEX: { \
GLdouble height, width, minZ, maxZ; \
\
TRACE(ddraw, "Transformed - Lighted Vertex\n"); \
TRACE("Transformed - Lighted Vertex\n"); \
/* First, disable lighting */ \
glDisable(GL_LIGHTING); \
\
@ -957,7 +957,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
glLoadIdentity(); \
\
if (This->current_viewport == NULL) { \
ERR(ddraw, "No current viewport !\n"); \
ERR("No current viewport !\n"); \
/* Using standard values */ \
height = 640.0; \
width = 480.0; \
@ -981,7 +981,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
} break; \
\
default: \
ERR(ddraw, "Unhandled vertex type\n"); \
ERR("Unhandled vertex type\n"); \
break; \
} \
\
@ -990,37 +990,37 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
\
switch (d3dp) { \
case D3DPT_POINTLIST: \
TRACE(ddraw, "Start POINTS\n"); \
TRACE("Start POINTS\n"); \
glBegin(GL_POINTS); \
break; \
\
case D3DPT_LINELIST: \
TRACE(ddraw, "Start LINES\n"); \
TRACE("Start LINES\n"); \
glBegin(GL_LINES); \
break; \
\
case D3DPT_LINESTRIP: \
TRACE(ddraw, "Start LINE_STRIP\n"); \
TRACE("Start LINE_STRIP\n"); \
glBegin(GL_LINE_STRIP); \
break; \
\
case D3DPT_TRIANGLELIST: \
TRACE(ddraw, "Start TRIANGLES\n"); \
TRACE("Start TRIANGLES\n"); \
glBegin(GL_TRIANGLES); \
break; \
\
case D3DPT_TRIANGLESTRIP: \
TRACE(ddraw, "Start TRIANGLE_STRIP\n"); \
TRACE("Start TRIANGLE_STRIP\n"); \
glBegin(GL_TRIANGLE_STRIP); \
break; \
\
case D3DPT_TRIANGLEFAN: \
TRACE(ddraw, "Start TRIANGLE_FAN\n"); \
TRACE("Start TRIANGLE_FAN\n"); \
glBegin(GL_TRIANGLE_FAN); \
break; \
\
default: \
TRACE(ddraw, "Unhandled primitive\n"); \
TRACE("Unhandled primitive\n"); \
break; \
} \
\
@ -1032,7 +1032,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
\
glNormal3f(vx->nx.nx, vx->ny.ny, vx->nz.nz); \
glVertex3f(vx->x.x, vx->y.y, vx->z.z); \
TRACE(ddraw, " V: %f %f %f\n", vx->x.x, vx->y.y, vx->z.z); \
TRACE(" V: %f %f %f\n", vx->x.x, vx->y.y, vx->z.z); \
} break; \
\
case D3DVT_LVERTEX: { \
@ -1043,7 +1043,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
((col >> 8) & 0xFF) / 255.0, \
((col >> 0) & 0xFF) / 255.0); \
glVertex3f(vx->x.x, vx->y.y, vx->z.z); \
TRACE(ddraw, " LV: %f %f %f (%02lx %02lx %02lx)\n", \
TRACE(" LV: %f %f %f (%02lx %02lx %02lx)\n", \
vx->x.x, vx->y.y, vx->z.z, \
((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF)); \
} break; \
@ -1065,20 +1065,20 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i
vx->y.sy / vx->r.rhw, \
vx->z.sz / vx->r.rhw, \
1.0 / vx->r.rhw); \
TRACE(ddraw, " TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \
TRACE(" TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \
vx->x.sx, vx->y.sy, vx->z.sz, \
((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF), \
vx->u.tu, vx->v.tv, vx->r.rhw); \
} break; \
\
default: \
TRACE(ddraw, "Unhandled vertex type\n"); \
TRACE("Unhandled vertex type\n"); \
break; \
} \
} \
\
glEnd(); \
TRACE(ddraw, "End\n");
TRACE("End\n");
static HRESULT WINAPI IDirect3DDevice2Impl_DrawPrimitive(LPDIRECT3DDEVICE2 iface,
@ -1092,7 +1092,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_DrawPrimitive(LPDIRECT3DDEVICE2 iface
OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This;
int vx_index;
TRACE(ddraw, "(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, dwFlags);
TRACE("(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, dwFlags);
ENTER_GL();
DRAW_PRIMITIVE(vertcount, vx_index);
@ -1116,7 +1116,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE
OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This;
int vx_index;
TRACE(ddraw, "(%p)->(%d,%d,%p,%ld,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, lpindexes, indexcount, dwFlags);
TRACE("(%p)->(%d,%d,%p,%ld,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, lpindexes, indexcount, dwFlags);
ENTER_GL();
DRAW_PRIMITIVE(indexcount, lpindexes[vx_index]);
@ -1131,7 +1131,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetClipStatus(LPDIRECT3DDEVICE2 iface
LPD3DCLIPSTATUS lpcs)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpcs);
FIXME("(%p)->(%p): stub\n", This, lpcs);
return DD_OK;
}
@ -1142,7 +1142,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetClipStatus(LPDIRECT3DDEVICE2 iface
LPD3DCLIPSTATUS lpcs)
{
ICOM_THIS(IDirect3DDevice2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpcs);
FIXME("(%p)->(%p): stub\n", This, lpcs);
return DD_OK;
}
@ -1209,7 +1209,7 @@ static ICOM_VTABLE(IDirect3DDevice2) OpenGL_vtable =
int d3d_OpenGL_dx3(LPD3DENUMDEVICESCALLBACK cb, LPVOID context) {
D3DDEVICEDESC d1,d2;
TRACE(ddraw," Enumerating OpenGL D3D device.\n");
TRACE(" Enumerating OpenGL D3D device.\n");
fill_opengl_caps(&d1, &d2);
@ -1244,7 +1244,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
(*device)->set_context = set_context_dx3;
TRACE(ddraw, "OpenGL device created \n");
TRACE("OpenGL device created \n");
/* Create the OpenGL context */
#ifdef USE_OSMESA
@ -1253,7 +1253,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
surface->s.surface_desc.dwWidth * surface->s.surface_desc.dwHeight * 4);
#else
/* First get the correct visual */
TRACE(ddraw, "Backbuffer : %d\n", surface->s.backbuffer == NULL);
TRACE("Backbuffer : %d\n", surface->s.backbuffer == NULL);
/* if (surface->s.backbuffer == NULL)
attributeList[3] = None; */
ENTER_GL();
@ -1261,15 +1261,15 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
DefaultScreen(display),
attributeList);
if (xvis == NULL)
ERR(ddraw, "No visual found !\n");
ERR("No visual found !\n");
else
TRACE(ddraw, "Visual found\n");
TRACE("Visual found\n");
/* Create the context */
odev->ctx = glXCreateContext(display,
xvis,
NULL,
GL_TRUE);
TRACE(ddraw, "Context created\n");
TRACE("Context created\n");
/* Now override the surface's Flip method (if in double buffering) */
surface->s.d3d_device = (void *) odev;
@ -1309,7 +1309,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_QueryInterface(LPDIRECT3DDEVICE iface,
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
return S_OK;
}
@ -1319,7 +1319,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_QueryInterface(LPDIRECT3DDEVICE iface,
static ULONG WINAPI IDirect3DDeviceImpl_AddRef(LPDIRECT3DDEVICE iface)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
return ++(This->ref);
}
@ -1329,7 +1329,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_AddRef(LPDIRECT3DDEVICE iface)
static ULONG WINAPI IDirect3DDeviceImpl_Release(LPDIRECT3DDEVICE iface)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
OpenGL_IDirect3DDevice *odev = (OpenGL_IDirect3DDevice *) This;
@ -1356,7 +1356,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_Initialize(LPDIRECT3DDEVICE iface,
LPD3DDEVICEDESC lpd3ddvdesc)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p,%p): stub\n", This, lpd3d,lpGUID, lpd3ddvdesc);
TRACE("(%p)->(%p,%p,%p): stub\n", This, lpd3d,lpGUID, lpd3ddvdesc);
return DDERR_ALREADYINITIALIZED;
}
@ -1367,7 +1367,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetCaps(LPDIRECT3DDEVICE iface,
LPD3DDEVICEDESC lpD3DSWDevDesc)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpD3DHWDevDesc, lpD3DSWDevDesc);
TRACE("(%p)->(%p,%p): stub\n", This, lpD3DHWDevDesc, lpD3DSWDevDesc);
fill_opengl_caps(lpD3DHWDevDesc, lpD3DSWDevDesc);
@ -1380,7 +1380,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_SwapTextureHandles(LPDIRECT3DDEVICE if
LPDIRECT3DTEXTURE lpD3DTex2)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpD3DTex1, lpD3DTex2);
TRACE("(%p)->(%p,%p): stub\n", This, lpD3DTex1, lpD3DTex2);
return DD_OK;
}
@ -1391,7 +1391,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_CreateExecuteBuffer(LPDIRECT3DDEVICE i
IUnknown *pUnkOuter)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p,%p)\n", This, lpDesc, lplpDirect3DExecuteBuffer, pUnkOuter);
TRACE("(%p)->(%p,%p,%p)\n", This, lpDesc, lplpDirect3DExecuteBuffer, pUnkOuter);
*lplpDirect3DExecuteBuffer = d3dexecutebuffer_create(This, lpDesc);
@ -1403,7 +1403,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetStats(LPDIRECT3DDEVICE iface,
LPD3DSTATS lpD3DStats)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p): stub\n", This, lpD3DStats);
TRACE("(%p)->(%p): stub\n", This, lpD3DStats);
return DD_OK;
}
@ -1415,7 +1415,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_Execute(LPDIRECT3DDEVICE iface,
DWORD dwFlags)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p,%08ld): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport, dwFlags);
TRACE("(%p)->(%p,%p,%08ld): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport, dwFlags);
/* Put this as the default context */
@ -1430,7 +1430,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_AddViewport(LPDIRECT3DDEVICE iface,
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp;
FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpvp);
FIXME("(%p)->(%p): stub\n", This, ilpvp);
/* Adds this viewport to the viewport list */
ilpvp->next = This->viewport_list;
@ -1447,7 +1447,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_DeleteViewport(LPDIRECT3DDEVICE iface,
ICOM_THIS(IDirect3DDeviceImpl,iface);
IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp;
IDirect3DViewport2Impl *cur, *prev;
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp);
FIXME("(%p)->(%p): stub\n", This, lpvp);
/* Finds this viewport in the list */
prev = NULL;
@ -1478,7 +1478,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_NextViewport(LPDIRECT3DDEVICE iface,
ICOM_THIS(IDirect3DDeviceImpl,iface);
IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp;
IDirect3DViewport2Impl** ilplpvp=(IDirect3DViewport2Impl**)lplpvp;
FIXME(ddraw, "(%p)->(%p,%p,%08lx): stub\n", This, ilpvp, ilplpvp, dwFlags);
FIXME("(%p)->(%p,%p,%08lx): stub\n", This, ilpvp, ilplpvp, dwFlags);
switch (dwFlags) {
case D3DNEXT_NEXT:
@ -1511,7 +1511,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_Pick(LPDIRECT3DDEVICE iface,
LPD3DRECT lpRect)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p,%08lx,%p): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport,
TRACE("(%p)->(%p,%p,%08lx,%p): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport,
dwFlags, lpRect);
return DD_OK;
@ -1523,7 +1523,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetPickRecords(LPDIRECT3DDEVICE iface,
LPD3DPICKRECORD lpD3DPickRec)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpCount, lpD3DPickRec);
TRACE("(%p)->(%p,%p): stub\n", This, lpCount, lpD3DPickRec);
return DD_OK;
}
@ -1534,7 +1534,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_EnumTextureFormats(LPDIRECT3DDEVICE if
LPVOID lpArg)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpd3dEnumTextureProc, lpArg);
TRACE("(%p)->(%p,%p): stub\n", This, lpd3dEnumTextureProc, lpArg);
return enum_texture_format_OpenGL(lpd3dEnumTextureProc, lpArg);
}
@ -1544,7 +1544,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_CreateMatrix(LPDIRECT3DDEVICE iface,
LPD3DMATRIXHANDLE lpD3DMatHandle)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpD3DMatHandle);
TRACE("(%p)->(%p)\n", This, lpD3DMatHandle);
*lpD3DMatHandle = (D3DMATRIXHANDLE) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(D3DMATRIX));
@ -1557,7 +1557,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_SetMatrix(LPDIRECT3DDEVICE iface,
const LPD3DMATRIX lpD3DMatrix)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%08lx,%p)\n", This, d3dMatHandle, lpD3DMatrix);
TRACE("(%p)->(%08lx,%p)\n", This, d3dMatHandle, lpD3DMatrix);
dump_mat(lpD3DMatrix);
@ -1572,7 +1572,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetMatrix(LPDIRECT3DDEVICE iface,
LPD3DMATRIX lpD3DMatrix)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%08lx,%p)\n", This, D3DMatHandle, lpD3DMatrix);
TRACE("(%p)->(%08lx,%p)\n", This, D3DMatHandle, lpD3DMatrix);
*lpD3DMatrix = *((D3DMATRIX *) D3DMatHandle);
@ -1584,7 +1584,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_DeleteMatrix(LPDIRECT3DDEVICE iface,
D3DMATRIXHANDLE d3dMatHandle)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%08lx)\n", This, d3dMatHandle);
TRACE("(%p)->(%08lx)\n", This, d3dMatHandle);
HeapFree(GetProcessHeap(),0, (void *) d3dMatHandle);
@ -1597,7 +1597,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_BeginScene(LPDIRECT3DDEVICE iface)
ICOM_THIS(IDirect3DDeviceImpl,iface);
/* OpenGL_IDirect3DDevice *odev = (OpenGL_IDirect3DDevice *) This; */
FIXME(ddraw, "(%p)->(): stub\n", This);
FIXME("(%p)->(): stub\n", This);
/* We get the pointer to the surface (should be done on flip) */
/* odev->zb->pbuf = This->surface->s.surface_desc.y.lpSurface; */
@ -1620,7 +1620,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_EndScene(LPDIRECT3DDEVICE iface)
unsigned short *dest;
#endif
FIXME(ddraw, "(%p)->(): stub\n", This);
FIXME("(%p)->(): stub\n", This);
#ifdef USE_OSMESA
/* Here we copy back the OpenGL scene to the the DDraw surface */
@ -1666,7 +1666,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetDirect3D(LPDIRECT3DDEVICE iface,
LPDIRECT3D *lpDirect3D)
{
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE(ddraw, "(%p)->(%p): stub\n", This, lpDirect3D);
TRACE("(%p)->(%p): stub\n", This, lpDirect3D);
return DD_OK;
}

160
graphics/d3dexecutebuffer.c
View File

@ -12,7 +12,7 @@
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
#include "debugtools.h"
#include "d3d_private.h"
@ -58,10 +58,10 @@ void _dump_d3dstatus(LPD3DSTATUS lpStatus) {
}
void _dump_executedata(LPD3DEXECUTEDATA lpData) {
DUMP("dwSize : %ld\n", lpData->dwSize);
DUMP("Vertex Offset : %ld Count : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount);
DUMP("Instruction Offset : %ld Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
DUMP("HVertex Offset : %ld\n", lpData->dwHVertexOffset);
DPRINTF("dwSize : %ld\n", lpData->dwSize);
DPRINTF("Vertex Offset : %ld Count : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount);
DPRINTF("Instruction Offset : %ld Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
DPRINTF("HVertex Offset : %ld\n", lpData->dwHVertexOffset);
_dump_d3dstatus(&(lpData->dsStatus));
}
@ -77,7 +77,7 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) {
vx[index].z, \
vx[index].w); \
\
TRACE(ddraw, " V: %f %f %f %f (%f %f %f) (%f %f)\n", \
TRACE(" V: %f %f %f %f (%f %f %f) (%f %f)\n", \
vx[index].x, vx[index].y, vx[index].z, vx[index].w, \
vx[index].nx, vx[index].ny, vx[index].nz, \
vx[index].u, vx[index].v); \
@ -97,7 +97,7 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) {
l_vx[index].z, \
l_vx[index].w); \
\
TRACE(ddraw, " LV: %f %f %f %f (%02lx %02lx %02lx) (%f %f)\n", \
TRACE(" LV: %f %f %f %f (%02lx %02lx %02lx) (%f %f)\n", \
l_vx[index].x, l_vx[index].y, l_vx[index].z, l_vx[index].w, \
((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF), \
l_vx[index].u, l_vx[index].v); \
@ -121,7 +121,7 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) {
vx->y.sy / vx->r.rhw, \
vx->z.sz / vx->r.rhw, \
1.0 / vx->r.rhw); \
TRACE(ddraw, " TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \
TRACE(" TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \
vx->x.sx, vx->y.sy, vx->z.sz, \
((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF), \
vx->u.tu, vx->v.tv, vx->r.rhw); \
@ -133,28 +133,28 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) {
for (i = 0; i < count; i++) { \
LPD3DTRIANGLE ci = (LPD3DTRIANGLE) instr; \
\
TRACE(ddraw, " v1: %d v2: %d v3: %d\n", \
TRACE(" v1: %d v2: %d v3: %d\n", \
ci->v1.v1, ci->v2.v2, ci->v3.v3); \
TRACE(ddraw, " Flags : "); \
TRACE(" Flags : "); \
if (TRACE_ON(ddraw)) { \
/* Wireframe */ \
if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1) \
DUMP("EDGEENABLE1 "); \
DPRINTF("EDGEENABLE1 "); \
if (ci->wFlags & D3DTRIFLAG_EDGEENABLE2) \
DUMP("EDGEENABLE2 "); \
DPRINTF("EDGEENABLE2 "); \
if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1) \
DUMP("EDGEENABLE3 "); \
DPRINTF("EDGEENABLE3 "); \
\
/* Strips / Fans */ \
if (ci->wFlags == D3DTRIFLAG_EVEN) \
DUMP("EVEN "); \
DPRINTF("EVEN "); \
if (ci->wFlags == D3DTRIFLAG_ODD) \
DUMP("ODD "); \
DPRINTF("ODD "); \
if (ci->wFlags == D3DTRIFLAG_START) \
DUMP("START "); \
DPRINTF("START "); \
if ((ci->wFlags > 0) && (ci->wFlags < 30)) \
DUMP("STARTFLAT(%d) ", ci->wFlags); \
DUMP("\n"); \
DPRINTF("STARTFLAT(%d) ", ci->wFlags); \
DPRINTF("\n"); \
} \
\
/* Draw the triangle */ \
@ -182,7 +182,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
void *instr = ilpBuff->desc.lpData + is;
OpenGL_IDirect3DDevice *odev = (OpenGL_IDirect3DDevice *) dev;
TRACE(ddraw, "ExecuteData : \n");
TRACE("ExecuteData : \n");
if (TRACE_ON(ddraw))
_dump_executedata(&(ilpBuff->data));
@ -199,13 +199,13 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
switch (current->bOpcode) {
case D3DOP_POINT: {
TRACE(ddraw, "POINT-s (%d)\n", count);
TRACE("POINT-s (%d)\n", count);
instr += count * size;
} break;
case D3DOP_LINE: {
TRACE(ddraw, "LINE-s (%d)\n", count);
TRACE("LINE-s (%d)\n", count);
instr += count * size;
} break;
@ -223,7 +223,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
OGL_LVertex *l_vx = (OGL_LVertex *) ilpBuff->vertex_data;
D3DTLVERTEX *tl_vx = (D3DTLVERTEX *) ilpBuff->vertex_data;
TRACE(ddraw, "TRIANGLE (%d)\n", count);
TRACE("TRIANGLE (%d)\n", count);
switch (ilpBuff->vertex_type) {
case D3DVT_VERTEX:
@ -235,9 +235,9 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
glLoadIdentity(); /* The model transformation was done during the
transformation phase */
glMatrixMode(GL_PROJECTION);
TRACE(ddraw, " Projection Matrix : (%p)\n", odev->proj_mat);
TRACE(" Projection Matrix : (%p)\n", odev->proj_mat);
dump_mat(odev->proj_mat);
TRACE(ddraw, " View Matrix : (%p)\n", odev->view_mat);
TRACE(" View Matrix : (%p)\n", odev->view_mat);
dump_mat(odev->view_mat);
glLoadMatrixf((float *) z_inv_matrix);
@ -255,9 +255,9 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
transformation phase */
glMatrixMode(GL_PROJECTION);
TRACE(ddraw, " Projection Matrix : (%p)\n", odev->proj_mat);
TRACE(" Projection Matrix : (%p)\n", odev->proj_mat);
dump_mat(odev->proj_mat);
TRACE(ddraw, " View Matrix : (%p)\n", odev->view_mat);
TRACE(" View Matrix : (%p)\n", odev->view_mat);
dump_mat(odev->view_mat);
glLoadMatrixf((float *) z_inv_matrix);
@ -278,7 +278,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
glLoadIdentity();
if (ivp == NULL) {
ERR(ddraw, "No current viewport !\n");
ERR("No current viewport !\n");
/* Using standard values */
height = 640.0;
width = 480.0;
@ -301,7 +301,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
} break;
default:
ERR(ddraw, "Unhandled vertex type !\n");
ERR("Unhandled vertex type !\n");
break;
}
@ -319,20 +319,20 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
break;
default:
ERR(ddraw, "Unhandled vertex type !\n");
ERR("Unhandled vertex type !\n");
}
} break;
case D3DOP_MATRIXLOAD: {
TRACE(ddraw, "MATRIXLOAD-s (%d)\n", count);
TRACE("MATRIXLOAD-s (%d)\n", count);
instr += count * size;
} break;
case D3DOP_MATRIXMULTIPLY: {
int i;
TRACE(ddraw, "MATRIXMULTIPLY (%d)\n", count);
TRACE("MATRIXMULTIPLY (%d)\n", count);
for (i = 0; i < count; i++) {
LPD3DMATRIXMULTIPLY ci = (LPD3DMATRIXMULTIPLY) instr;
@ -340,7 +340,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
LPD3DMATRIX b = (LPD3DMATRIX) ci->hSrcMatrix1;
LPD3DMATRIX c = (LPD3DMATRIX) ci->hSrcMatrix2;
TRACE(ddraw, " Dest : %08lx Src1 : %08lx Src2 : %08lx\n",
TRACE(" Dest : %08lx Src1 : %08lx Src2 : %08lx\n",
ci->hDestMatrix, ci->hSrcMatrix1, ci->hSrcMatrix2);
/* Do the multiplication..
@ -361,7 +361,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
case D3DOP_STATETRANSFORM: {
int i;
TRACE(ddraw, "STATETRANSFORM (%d)\n", count);
TRACE("STATETRANSFORM (%d)\n", count);
for (i = 0; i < count; i++) {
LPD3DSTATE ci = (LPD3DSTATE) instr;
@ -369,22 +369,22 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
/* Handle the state transform */
switch (ci->t.dtstTransformStateType) {
case D3DTRANSFORMSTATE_WORLD: {
TRACE(ddraw, " WORLD (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
TRACE(" WORLD (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
odev->world_mat = (D3DMATRIX*) ci->v.dwArg[0];
} break;
case D3DTRANSFORMSTATE_VIEW: {
TRACE(ddraw, " VIEW (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
TRACE(" VIEW (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
odev->view_mat = (D3DMATRIX*) ci->v.dwArg[0];
} break;
case D3DTRANSFORMSTATE_PROJECTION: {
TRACE(ddraw, " PROJECTION (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
TRACE(" PROJECTION (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
odev->proj_mat = (D3DMATRIX*) ci->v.dwArg[0];
} break;
default:
ERR(ddraw, " Unhandled state transformation !! (%d)\n", (int) ci->t.dtstTransformStateType);
ERR(" Unhandled state transformation !! (%d)\n", (int) ci->t.dtstTransformStateType);
break;
}
@ -395,7 +395,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
case D3DOP_STATELIGHT: {
int i;
TRACE(ddraw, "STATELIGHT (%d)\n", count);
TRACE("STATELIGHT (%d)\n", count);
for (i = 0; i < count; i++) {
LPD3DSTATE ci = (LPD3DSTATE) instr;
@ -404,19 +404,19 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
switch (ci->t.dlstLightStateType) {
case D3DLIGHTSTATE_MATERIAL: {
IDirect3DMaterial2Impl* mat = (IDirect3DMaterial2Impl*) ci->v.dwArg[0];
TRACE(ddraw, " MATERIAL\n");
TRACE(" MATERIAL\n");
if (mat != NULL) {
mat->activate(mat);
} else {
TRACE(ddraw, " bad Material Handle\n");
TRACE(" bad Material Handle\n");
}
} break ;
case D3DLIGHTSTATE_AMBIENT: {
float light[4];
DWORD dwLightState = ci->v.dwArg[0];
TRACE(ddraw, " AMBIENT\n");
TRACE(" AMBIENT\n");
light[0] = ((dwLightState >> 16) & 0xFF) / 255.0;
light[1] = ((dwLightState >> 8) & 0xFF) / 255.0;
@ -424,7 +424,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
light[3] = 1.0;
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, (float *) light);
TRACE(ddraw, " R:%02lx G:%02lx B:%02lx A:%02lx\n",
TRACE(" R:%02lx G:%02lx B:%02lx A:%02lx\n",
((dwLightState >> 16) & 0xFF),
((dwLightState >> 8) & 0xFF),
((dwLightState >> 0) & 0xFF),
@ -432,27 +432,27 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
} break ;
case D3DLIGHTSTATE_COLORMODEL: {
TRACE(ddraw, " COLORMODEL\n");
TRACE(" COLORMODEL\n");
} break ;
case D3DLIGHTSTATE_FOGMODE: {
TRACE(ddraw, " FOGMODE\n");
TRACE(" FOGMODE\n");
} break ;
case D3DLIGHTSTATE_FOGSTART: {
TRACE(ddraw, " FOGSTART\n");
TRACE(" FOGSTART\n");
} break ;
case D3DLIGHTSTATE_FOGEND: {
TRACE(ddraw, " FOGEND\n");
TRACE(" FOGEND\n");
} break ;
case D3DLIGHTSTATE_FOGDENSITY: {
TRACE(ddraw, " FOGDENSITY\n");
TRACE(" FOGDENSITY\n");
} break ;
default:
ERR(ddraw, " Unhandled light state !! (%d)\n", (int) ci->t.dlstLightStateType);
ERR(" Unhandled light state !! (%d)\n", (int) ci->t.dlstLightStateType);
break;
}
instr += size;
@ -461,7 +461,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
case D3DOP_STATERENDER: {
int i;
TRACE(ddraw, "STATERENDER (%d)\n", count);
TRACE("STATERENDER (%d)\n", count);
for (i = 0; i < count; i++) {
LPD3DSTATE ci = (LPD3DSTATE) instr;
@ -475,28 +475,28 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
case D3DOP_PROCESSVERTICES: {
int i;
TRACE(ddraw, "PROCESSVERTICES (%d)\n", count);
TRACE("PROCESSVERTICES (%d)\n", count);
for (i = 0; i < count; i++) {
LPD3DPROCESSVERTICES ci = (LPD3DPROCESSVERTICES) instr;
TRACE(ddraw, " Start : %d Dest : %d Count : %ld\n",
TRACE(" Start : %d Dest : %d Count : %ld\n",
ci->wStart, ci->wDest, ci->dwCount);
TRACE(ddraw, " Flags : ");
TRACE(" Flags : ");
if (TRACE_ON(ddraw)) {
if (ci->dwFlags & D3DPROCESSVERTICES_COPY)
DUMP("COPY ");
DPRINTF("COPY ");
if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
DUMP("NOCOLOR ");
DPRINTF("NOCOLOR ");
if (ci->dwFlags == D3DPROCESSVERTICES_OPMASK)
DUMP("OPMASK ");
DPRINTF("OPMASK ");
if (ci->dwFlags & D3DPROCESSVERTICES_TRANSFORM)
DUMP("TRANSFORM ");
DPRINTF("TRANSFORM ");
if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORMLIGHT)
DUMP("TRANSFORMLIGHT ");
DPRINTF("TRANSFORMLIGHT ");
if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
DUMP("UPDATEEXTENTS ");
DUMP("\n");
DPRINTF("UPDATEEXTENTS ");
DPRINTF("\n");
}
/* This is where doing Direct3D on top on OpenGL is quite difficult.
@ -532,7 +532,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
OGL_Vertex *dst = ((OGL_Vertex *) (ilpBuff->vertex_data)) + ci->wDest;
D3DMATRIX *mat = odev->world_mat;
TRACE(ddraw, " World Matrix : (%p)\n", mat);
TRACE(" World Matrix : (%p)\n", mat);
dump_mat(mat);
ilpBuff->vertex_type = D3DVT_VERTEX;
@ -561,7 +561,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
OGL_LVertex *dst = ((OGL_LVertex *) (ilpBuff->vertex_data)) + ci->wDest;
D3DMATRIX *mat = odev->world_mat;
TRACE(ddraw, " World Matrix : (%p)\n", mat);
TRACE(" World Matrix : (%p)\n", mat);
dump_mat(mat);
ilpBuff->vertex_type = D3DVT_LVERTEX;
@ -589,7 +589,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
memcpy(dst, src, ci->dwCount * sizeof(D3DTLVERTEX));
} else {
ERR(ddraw, "Unhandled vertex processing !\n");
ERR("Unhandled vertex processing !\n");
}
instr += size;
@ -597,13 +597,13 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
} break;
case D3DOP_TEXTURELOAD: {
TRACE(ddraw, "TEXTURELOAD-s (%d)\n", count);
TRACE("TEXTURELOAD-s (%d)\n", count);
instr += count * size;
} break;
case D3DOP_EXIT: {
TRACE(ddraw, "EXIT (%d)\n", count);
TRACE("EXIT (%d)\n", count);
/* We did this instruction */
instr += size;
/* Exit this loop */
@ -612,18 +612,18 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
case D3DOP_BRANCHFORWARD: {
int i;
TRACE(ddraw, "BRANCHFORWARD (%d)\n", count);
TRACE("BRANCHFORWARD (%d)\n", count);
for (i = 0; i < count; i++) {
LPD3DBRANCH ci = (LPD3DBRANCH) instr;
if ((ilpBuff->data.dsStatus.dwStatus & ci->dwMask) == ci->dwValue) {
if (!ci->bNegate) {
TRACE(ddraw," Should branch to %ld\n", ci->dwOffset);
TRACE(" Should branch to %ld\n", ci->dwOffset);
}
} else {
if (ci->bNegate) {
TRACE(ddraw," Should branch to %ld\n", ci->dwOffset);
TRACE(" Should branch to %ld\n", ci->dwOffset);
}
}
@ -632,14 +632,14 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
} break;
case D3DOP_SPAN: {
TRACE(ddraw, "SPAN-s (%d)\n", count);
TRACE("SPAN-s (%d)\n", count);
instr += count * size;
} break;
case D3DOP_SETSTATUS: {
int i;
TRACE(ddraw, "SETSTATUS (%d)\n", count);
TRACE("SETSTATUS (%d)\n", count);
for (i = 0; i < count; i++) {
LPD3DSTATUS ci = (LPD3DSTATUS) instr;
@ -651,7 +651,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
} break;
default:
ERR(ddraw, "Unhandled OpCode !!!\n");
ERR("Unhandled OpCode !!!\n");
/* Try to save ... */
instr += count * size;
break;
@ -715,7 +715,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_QueryInterface(LPDIRECT3DEXECUT
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
return S_OK;
}
@ -725,7 +725,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_QueryInterface(LPDIRECT3DEXECUT
static ULONG WINAPI IDirect3DExecuteBufferImpl_AddRef(LPDIRECT3DEXECUTEBUFFER iface)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
return ++(This->ref);
}
@ -735,7 +735,7 @@ static ULONG WINAPI IDirect3DExecuteBufferImpl_AddRef(LPDIRECT3DEXECUTEBUFFER if
static ULONG WINAPI IDirect3DExecuteBufferImpl_Release(LPDIRECT3DEXECUTEBUFFER iface)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
if ((This->desc.lpData != NULL) && This->need_free)
@ -756,7 +756,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Initialize(LPDIRECT3DEXECUTEBUF
LPD3DEXECUTEBUFFERDESC lpDesc)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lpDirect3DDevice, lpDesc);
FIXME("(%p)->(%p,%p): stub\n", This, lpDirect3DDevice, lpDesc);
return DD_OK;
}
@ -765,7 +765,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Lock(LPDIRECT3DEXECUTEBUFFER if
LPD3DEXECUTEBUFFERDESC lpDesc)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpDesc);
TRACE("(%p)->(%p)\n", This, lpDesc);
/* Copies the buffer description */
*lpDesc = This->desc;
@ -776,7 +776,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Lock(LPDIRECT3DEXECUTEBUFFER if
static HRESULT WINAPI IDirect3DExecuteBufferImpl_Unlock(LPDIRECT3DEXECUTEBUFFER iface)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
TRACE(ddraw, "(%p)->()\n", This);
TRACE("(%p)->()\n", This);
return DD_OK;
}
@ -787,7 +787,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_SetExecuteData(LPDIRECT3DEXECUT
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
DWORD nbvert;
TRACE(ddraw, "(%p)->(%p)\n", This, lpData);
TRACE("(%p)->(%p)\n", This, lpData);
This->data = *lpData;
@ -811,7 +811,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_GetExecuteData(LPDIRECT3DEXECUT
LPD3DEXECUTEDATA lpData)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
TRACE(ddraw, "(%p)->(%p): stub\n", This, lpData);
TRACE("(%p)->(%p): stub\n", This, lpData);
*lpData = This->data;
@ -825,7 +825,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Validate(LPDIRECT3DEXECUTEBUFFE
DWORD dwReserved)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
TRACE(ddraw, "(%p)->(%p,%p,%p,%lu)\n", This, lpdwOffset, lpFunc, lpUserArg, dwReserved);
TRACE("(%p)->(%p,%p,%p,%lu)\n", This, lpdwOffset, lpFunc, lpUserArg, dwReserved);
return DD_OK;
}
@ -834,7 +834,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Optimize(LPDIRECT3DEXECUTEBUFFE
DWORD dwReserved)
{
ICOM_THIS(IDirect3DExecuteBufferImpl,iface);
TRACE(ddraw, "(%p)->(%lu)\n", This, dwReserved);
TRACE("(%p)->(%lu)\n", This, dwReserved);
return DD_OK;
}

30
graphics/d3dlight.c
View File

@ -11,7 +11,7 @@
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
#include "debugtools.h"
#include "d3d_private.h"
@ -36,18 +36,18 @@ static const float zero_value[] = {
static void update(IDirect3DLightImpl* This) {
switch (This->light.dltType) {
case D3DLIGHT_POINT: /* 1 */
TRACE(ddraw, "Activating POINT\n");
TRACE("Activating POINT\n");
break;
case D3DLIGHT_SPOT: /* 2 */
TRACE(ddraw, "Activating SPOT\n");
TRACE("Activating SPOT\n");
break;
case D3DLIGHT_DIRECTIONAL: { /* 3 */
float direction[4];
TRACE(ddraw, "Activating DIRECTIONAL\n");
TRACE(ddraw, " direction : %f %f %f\n",
TRACE("Activating DIRECTIONAL\n");
TRACE(" direction : %f %f %f\n",
This->light.dvDirection.x.x,
This->light.dvDirection.y.y,
This->light.dvDirection.z.z);
@ -71,11 +71,11 @@ static void update(IDirect3DLightImpl* This) {
} break;
case D3DLIGHT_PARALLELPOINT: /* 4 */
TRACE(ddraw, "Activating PARRALLEL-POINT\n");
TRACE("Activating PARRALLEL-POINT\n");
break;
default:
TRACE(ddraw, "Not a know Light Type\n");
TRACE("Not a know Light Type\n");
break;
}
}
@ -147,7 +147,7 @@ static HRESULT WINAPI IDirect3DLightImpl_QueryInterface(LPDIRECT3DLIGHT iface,
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
return S_OK;
}
@ -157,7 +157,7 @@ static HRESULT WINAPI IDirect3DLightImpl_QueryInterface(LPDIRECT3DLIGHT iface,
static ULONG WINAPI IDirect3DLightImpl_AddRef(LPDIRECT3DLIGHT iface)
{
ICOM_THIS(IDirect3DLightImpl,iface);
TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
return ++(This->ref);
}
@ -167,7 +167,7 @@ static ULONG WINAPI IDirect3DLightImpl_AddRef(LPDIRECT3DLIGHT iface)
static ULONG WINAPI IDirect3DLightImpl_Release(LPDIRECT3DLIGHT iface)
{
ICOM_THIS(IDirect3DLightImpl,iface);
FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
HeapFree(GetProcessHeap(),0,This);
@ -187,7 +187,7 @@ static HRESULT WINAPI IDirect3DLightImpl_GetLight(LPDIRECT3DLIGHT iface,
LPD3DLIGHT lpLight)
{
ICOM_THIS(IDirect3DLightImpl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpLight);
TRACE("(%p)->(%p)\n", This, lpLight);
if (TRACE_ON(ddraw))
dump_light(lpLight);
@ -208,7 +208,7 @@ static HRESULT WINAPI IDirect3DLightImpl_SetLight(LPDIRECT3DLIGHT iface,
LPD3DLIGHT lpLight)
{
ICOM_THIS(IDirect3DLightImpl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpLight);
TRACE("(%p)->(%p)\n", This, lpLight);
if (TRACE_ON(ddraw))
dump_light(lpLight);
@ -235,7 +235,7 @@ static HRESULT WINAPI IDirect3DLightImpl_Initialize(LPDIRECT3DLIGHT iface,
{
ICOM_THIS(IDirect3DLightImpl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpDirect3D);
TRACE("(%p)->(%p)\n", This, lpDirect3D);
return DDERR_ALREADYINITIALIZED;
}
@ -261,12 +261,12 @@ static ICOM_VTABLE(IDirect3DLight) light_vtable =
/* These function should never be called if MesaGL is not present */
LPDIRECT3DLIGHT d3dlight_create_dx3(IDirect3DImpl* d3d1) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}
LPDIRECT3DLIGHT d3dlight_create(IDirect3D2Impl* d3d2) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}

32
graphics/d3dmaterial.c
View File

@ -10,7 +10,7 @@
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
#include "debugtools.h"
#include "d3d_private.h"
@ -25,7 +25,7 @@ static ICOM_VTABLE(IDirect3DMaterial) material_vtable;
* Matrial2 static functions
*/
static void activate(IDirect3DMaterial2Impl* This) {
TRACE(ddraw, "Activating material %p\n", This);
TRACE("Activating material %p\n", This);
ENTER_GL();
/* First, set the rendering context */
@ -52,10 +52,10 @@ static void activate(IDirect3DMaterial2Impl* This) {
GL_EMISSION,
(float *) &(This->mat.d.emissive));
TRACE(ddraw, "Size : %ld\n", This->mat.dwSize);
TRACE(ddraw, "Power : %f\n", This->mat.e.power);
TRACE("Size : %ld\n", This->mat.dwSize);
TRACE("Power : %f\n", This->mat.e.power);
TRACE(ddraw, "Texture handle : %08lx\n", (DWORD)This->mat.hTexture);
TRACE("Texture handle : %08lx\n", (DWORD)This->mat.hTexture);
LEAVE_GL();
return ;
@ -108,7 +108,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_QueryInterface(LPDIRECT3DMATERIAL2
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
return S_OK;
}
@ -118,7 +118,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_QueryInterface(LPDIRECT3DMATERIAL2
static ULONG WINAPI IDirect3DMaterial2Impl_AddRef(LPDIRECT3DMATERIAL2 iface)
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
return ++(This->ref);
}
@ -128,7 +128,7 @@ static ULONG WINAPI IDirect3DMaterial2Impl_AddRef(LPDIRECT3DMATERIAL2 iface)
static ULONG WINAPI IDirect3DMaterial2Impl_Release(LPDIRECT3DMATERIAL2 iface)
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
HeapFree(GetProcessHeap(),0,This);
@ -148,7 +148,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_GetMaterial(LPDIRECT3DMATERIAL2 ifa
LPD3DMATERIAL lpMat)
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpMat);
TRACE("(%p)->(%p)\n", This, lpMat);
if (TRACE_ON(ddraw))
dump_material(lpMat);
@ -162,7 +162,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_SetMaterial(LPDIRECT3DMATERIAL2 ifa
LPD3DMATERIAL lpMat)
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpMat);
TRACE("(%p)->(%p)\n", This, lpMat);
if (TRACE_ON(ddraw))
dump_material(lpMat);
@ -178,7 +178,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_GetHandle(LPDIRECT3DMATERIAL2 iface
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lpD3DDevice2, lpMatHandle);
FIXME("(%p)->(%p,%p): stub\n", This, lpD3DDevice2, lpMatHandle);
if (This->use_d3d2)
This->device.active_device2 = (IDirect3DDevice2Impl*)lpD3DDevice2;
@ -193,7 +193,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_GetHandle(LPDIRECT3DMATERIAL2 iface
static HRESULT WINAPI IDirect3DMaterialImpl_Reserve(LPDIRECT3DMATERIAL iface)
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
FIXME(ddraw, "(%p)->(): stub\n", This);
FIXME("(%p)->(): stub\n", This);
return DDERR_INVALIDPARAMS;
}
@ -201,7 +201,7 @@ static HRESULT WINAPI IDirect3DMaterialImpl_Reserve(LPDIRECT3DMATERIAL iface)
static HRESULT WINAPI IDirect3DMaterialImpl_Unreserve(LPDIRECT3DMATERIAL iface)
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
FIXME(ddraw, "(%p)->(): stub\n", This);
FIXME("(%p)->(): stub\n", This);
return DDERR_INVALIDPARAMS;
}
@ -211,7 +211,7 @@ static HRESULT WINAPI IDirect3DMaterialImpl_Initialize(LPDIRECT3DMATERIAL iface,
{
ICOM_THIS(IDirect3DMaterial2Impl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpDirect3D);
TRACE("(%p)->(%p)\n", This, lpDirect3D);
return DDERR_ALREADYINITIALIZED;
}
@ -256,12 +256,12 @@ static ICOM_VTABLE(IDirect3DMaterial2) material2_vtable =
#else /* HAVE_MESAGL */
LPDIRECT3DMATERIAL d3dmaterial_create(IDirect3DImpl* d3d1) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}
LPDIRECT3DMATERIAL2 d3dmaterial2_create(IDirect3D2Impl* d3d2) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}

62
graphics/d3dtexture.c
View File

@ -12,7 +12,7 @@
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
#include "debugtools.h"
#include "d3d_private.h"
@ -133,7 +133,7 @@ HRESULT WINAPI SetColorKey_cb(IDirect3DTexture2Impl *texture, DWORD dwFlags, LP
int bpp;
GLuint current_texture;
TRACE(ddraw, "(%p) : colorkey callback\n", texture);
TRACE("(%p) : colorkey callback\n", texture);
/* Get the texture description */
tex_d = &(texture->surface->s.surface_desc);
@ -147,17 +147,17 @@ HRESULT WINAPI SetColorKey_cb(IDirect3DTexture2Impl *texture, DWORD dwFlags, LP
/* If the GetHandle was not done yet, it's an error */
if (texture->tex_name == 0) {
ERR(ddraw, "Unloaded texture !\n");
ERR("Unloaded texture !\n");
LEAVE_GL();
return DD_OK;
}
glBindTexture(GL_TEXTURE_2D, texture->tex_name);
if (tex_d->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) {
FIXME(ddraw, "Todo Paletted\n");
FIXME("Todo Paletted\n");
} else if (tex_d->ddpfPixelFormat.dwFlags & DDPF_RGB) {
if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 8) {
FIXME(ddraw, "Todo 3_3_2_0\n");
FIXME("Todo 3_3_2_0\n");
} else if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 16) {
if (tex_d->ddpfPixelFormat.xy.dwRGBAlphaBitMask == 0x00000000) {
/* Now transform the 5_6_5 into a 5_5_5_1 surface to support color keying */
@ -192,21 +192,21 @@ HRESULT WINAPI SetColorKey_cb(IDirect3DTexture2Impl *texture, DWORD dwFlags, LP
/* Frees the temporary surface */
HeapFree(GetProcessHeap(),0,dest);
} else if (tex_d->ddpfPixelFormat.xy.dwRGBAlphaBitMask == 0x00000001) {
FIXME(ddraw, "Todo 5_5_5_1\n");
FIXME("Todo 5_5_5_1\n");
} else if (tex_d->ddpfPixelFormat.xy.dwRGBAlphaBitMask == 0x0000000F) {
FIXME(ddraw, "Todo 4_4_4_4\n");
FIXME("Todo 4_4_4_4\n");
} else {
ERR(ddraw, "Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
ERR("Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
}
} else if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 24) {
FIXME(ddraw, "Todo 8_8_8_0\n");
FIXME("Todo 8_8_8_0\n");
} else if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 32) {
FIXME(ddraw, "Todo 8_8_8_8\n");
FIXME("Todo 8_8_8_8\n");
} else {
ERR(ddraw, "Unhandled texture format (bad RGB count)\n");
ERR("Unhandled texture format (bad RGB count)\n");
}
} else {
ERR(ddraw, "Unhandled texture format (neither RGB nor INDEX)\n");
ERR("Unhandled texture format (neither RGB nor INDEX)\n");
}
LEAVE_GL();
@ -225,7 +225,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_QueryInterface(LPDIRECT3DTEXTURE2 if
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
return S_OK;
}
@ -235,7 +235,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_QueryInterface(LPDIRECT3DTEXTURE2 if
static ULONG WINAPI IDirect3DTexture2Impl_AddRef(LPDIRECT3DTEXTURE2 iface)
{
ICOM_THIS(IDirect3DTexture2Impl,iface);
TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
return ++(This->ref);
}
@ -245,7 +245,7 @@ static ULONG WINAPI IDirect3DTexture2Impl_AddRef(LPDIRECT3DTEXTURE2 iface)
static ULONG WINAPI IDirect3DTexture2Impl_Release(LPDIRECT3DTEXTURE2 iface)
{
ICOM_THIS(IDirect3DTexture2Impl,iface);
FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
/* Delete texture from OpenGL */
@ -270,7 +270,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_GetHandle(LPDIRECT3DTEXTURE iface,
{
ICOM_THIS(IDirect3DTexture2Impl,iface);
IDirect3DDeviceImpl* ilpD3DDevice=(IDirect3DDeviceImpl*)lpD3DDevice;
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, ilpD3DDevice, lpHandle);
FIXME("(%p)->(%p,%p): stub\n", This, ilpD3DDevice, lpHandle);
*lpHandle = (D3DTEXTUREHANDLE) This;
@ -282,7 +282,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_GetHandle(LPDIRECT3DTEXTURE iface,
glGenTextures(1, &(This->tex_name));
LEAVE_GL();
TRACE(ddraw, "OpenGL texture handle is : %d\n", This->tex_name);
TRACE("OpenGL texture handle is : %d\n", This->tex_name);
return D3D_OK;
}
@ -292,7 +292,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_Initialize(LPDIRECT3DTEXTURE iface,
LPDIRECTDRAWSURFACE lpSurface)
{
ICOM_THIS(IDirect3DTexture2Impl,iface);
TRACE(ddraw, "(%p)->(%p,%p)\n", This, lpD3DDevice, lpSurface);
TRACE("(%p)->(%p,%p)\n", This, lpD3DDevice, lpSurface);
return DDERR_ALREADYINITIALIZED;
}
@ -300,7 +300,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_Initialize(LPDIRECT3DTEXTURE iface,
static HRESULT WINAPI IDirect3DTextureImpl_Unload(LPDIRECT3DTEXTURE iface)
{
ICOM_THIS(IDirect3DTexture2Impl,iface);
FIXME(ddraw, "(%p)->(): stub\n", This);
FIXME("(%p)->(): stub\n", This);
return D3D_OK;
}
@ -312,7 +312,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_GetHandle(LPDIRECT3DTEXTURE2 iface,
{
ICOM_THIS(IDirect3DTexture2Impl,iface);
IDirect3DDevice2Impl* ilpD3DDevice2=(IDirect3DDevice2Impl*)lpD3DDevice2;
TRACE(ddraw, "(%p)->(%p,%p)\n", This, ilpD3DDevice2, lpHandle);
TRACE("(%p)->(%p,%p)\n", This, ilpD3DDevice2, lpHandle);
/* For 32 bits OSes, handles = pointers */
*lpHandle = (D3DTEXTUREHANDLE) This;
@ -325,7 +325,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_GetHandle(LPDIRECT3DTEXTURE2 iface,
glGenTextures(1, &(This->tex_name));
LEAVE_GL();
TRACE(ddraw, "OpenGL texture handle is : %d\n", This->tex_name);
TRACE("OpenGL texture handle is : %d\n", This->tex_name);
return D3D_OK;
}
@ -336,7 +336,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_PaletteChanged(LPDIRECT3DTEXTURE2 if
DWORD dwCount)
{
ICOM_THIS(IDirect3DTexture2Impl,iface);
FIXME(ddraw, "(%p)->(%8ld,%8ld): stub\n", This, dwStart, dwCount);
FIXME("(%p)->(%8ld,%8ld): stub\n", This, dwStart, dwCount);
return D3D_OK;
}
@ -349,9 +349,9 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
ICOM_THIS(IDirect3DTexture2Impl,iface);
IDirect3DTexture2Impl* ilpD3DTexture2=(IDirect3DTexture2Impl*)lpD3DTexture2;
DDSURFACEDESC *src_d, *dst_d;
TRACE(ddraw, "(%p)->(%p)\n", This, ilpD3DTexture2);
TRACE("(%p)->(%p)\n", This, ilpD3DTexture2);
TRACE(ddraw, "Copied surface %p to surface %p\n", ilpD3DTexture2->surface, This->surface);
TRACE("Copied surface %p to surface %p\n", ilpD3DTexture2->surface, This->surface);
/* Suppress the ALLOCONLOAD flag */
This->surface->s.surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;
@ -366,7 +366,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
if ((src_d->dwWidth != dst_d->dwWidth) || (src_d->dwHeight != dst_d->dwHeight)) {
/* Should also check for same pixel format, lPitch, ... */
ERR(ddraw, "Error in surface sizes\n");
ERR("Error in surface sizes\n");
return D3DERR_TEXTURE_LOAD_FAILED;
} else {
/* LPDIRECT3DDEVICE2 d3dd = (LPDIRECT3DDEVICE2) This->D3Ddevice; */
@ -400,7 +400,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
int i;
if (pal == NULL) {
ERR(ddraw, "Palettized texture Loading with a NULL palette !\n");
ERR("Palettized texture Loading with a NULL palette !\n");
LEAVE_GL();
return D3DERR_TEXTURE_LOAD_FAILED;
}
@ -489,7 +489,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
GL_UNSIGNED_SHORT_4_4_4_4,
src_d->y.lpSurface);
} else {
ERR(ddraw, "Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
ERR("Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
}
} else if (src_d->ddpfPixelFormat.x.dwRGBBitCount == 24) {
glTexImage2D(GL_TEXTURE_2D,
@ -510,10 +510,10 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
GL_UNSIGNED_BYTE,
src_d->y.lpSurface);
} else {
ERR(ddraw, "Unhandled texture format (bad RGB count)\n");
ERR("Unhandled texture format (bad RGB count)\n");
}
} else {
ERR(ddraw, "Unhandled texture format (neither RGB nor INDEX)\n");
ERR("Unhandled texture format (neither RGB nor INDEX)\n");
}
glBindTexture(GL_TEXTURE_2D, current_texture);
@ -563,12 +563,12 @@ static ICOM_VTABLE(IDirect3DTexture) texture_vtable =
/* These function should never be called if MesaGL is not present */
LPDIRECT3DTEXTURE2 d3dtexture2_create(IDirectDrawSurface4Impl* surf) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}
LPDIRECT3DTEXTURE d3dtexture_create(IDirectDrawSurface4Impl* surf) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}

62
graphics/d3dviewport.c
View File

@ -10,7 +10,7 @@
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
#include "debugtools.h"
#include "x11drv.h"
#include "d3d_private.h"
@ -91,7 +91,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_QueryInterface(LPDIRECT3DVIEWPORT2
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
return S_OK;
}
@ -101,7 +101,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_QueryInterface(LPDIRECT3DVIEWPORT2
static ULONG WINAPI IDirect3DViewport2Impl_AddRef(LPDIRECT3DVIEWPORT2 iface)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
return ++(This->ref);
}
@ -111,7 +111,7 @@ static ULONG WINAPI IDirect3DViewport2Impl_AddRef(LPDIRECT3DVIEWPORT2 iface)
static ULONG WINAPI IDirect3DViewport2Impl_Release(LPDIRECT3DVIEWPORT2 iface)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
HeapFree(GetProcessHeap(),0,This);
@ -126,7 +126,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_Initialize(LPDIRECT3DVIEWPORT2 ifac
LPDIRECT3D d3d)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, d3d);
FIXME("(%p)->(%p): stub\n", This, d3d);
return DD_OK;
}
@ -135,7 +135,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetViewport(LPDIRECT3DVIEWPORT2 ifa
LPD3DVIEWPORT lpvp)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp);
FIXME("(%p)->(%p): stub\n", This, lpvp);
if (This->use_vp2 != 0)
return DDERR_INVALIDPARAMS;
@ -149,20 +149,20 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetViewport(LPDIRECT3DVIEWPORT2 ifa
LPD3DVIEWPORT lpvp)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp);
FIXME("(%p)->(%p): stub\n", This, lpvp);
This->use_vp2 = 0;
This->viewport.vp1 = *lpvp;
TRACE(ddraw, "dwSize = %ld dwX = %ld dwY = %ld\n",
TRACE("dwSize = %ld dwX = %ld dwY = %ld\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY);
TRACE(ddraw, "dwWidth = %ld dwHeight = %ld\n",
TRACE("dwWidth = %ld dwHeight = %ld\n",
lpvp->dwWidth, lpvp->dwHeight);
TRACE(ddraw, "dvScaleX = %f dvScaleY = %f\n",
TRACE("dvScaleX = %f dvScaleY = %f\n",
lpvp->dvScaleX, lpvp->dvScaleY);
TRACE(ddraw, "dvMaxX = %f dvMaxY = %f\n",
TRACE("dvMaxX = %f dvMaxY = %f\n",
lpvp->dvMaxX, lpvp->dvMaxY);
TRACE(ddraw, "dvMinZ = %f dvMaxZ = %f\n",
TRACE("dvMinZ = %f dvMaxZ = %f\n",
lpvp->dvMinZ, lpvp->dvMaxZ);
@ -176,7 +176,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_TransformVertices(LPDIRECT3DVIEWPOR
LPDWORD lpOffScreen)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%8ld,%p,%08lx,%p): stub\n",
FIXME("(%p)->(%8ld,%p,%08lx,%p): stub\n",
This, dwVertexCount, lpData, dwFlags, lpOffScreen);
return DD_OK;
@ -187,7 +187,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_LightElements(LPDIRECT3DVIEWPORT2 i
LPD3DLIGHTDATA lpData)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%8ld,%p): stub\n", This, dwElementCount, lpData);
FIXME("(%p)->(%8ld,%p): stub\n", This, dwElementCount, lpData);
return DD_OK;
}
@ -196,7 +196,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetBackground(LPDIRECT3DVIEWPORT2 i
D3DMATERIALHANDLE hMat)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%08lx): stub\n", This, (DWORD) hMat);
FIXME("(%p)->(%08lx): stub\n", This, (DWORD) hMat);
return DD_OK;
}
@ -206,7 +206,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetBackground(LPDIRECT3DVIEWPORT2 i
LPBOOL lpValid)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lphMat, lpValid);
FIXME("(%p)->(%p,%p): stub\n", This, lphMat, lpValid);
return DD_OK;
}
@ -215,7 +215,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetBackgroundDepth(LPDIRECT3DVIEWPO
LPDIRECTDRAWSURFACE lpDDSurface)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpDDSurface);
FIXME("(%p)->(%p): stub\n", This, lpDDSurface);
return DD_OK;
}
@ -225,7 +225,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetBackgroundDepth(LPDIRECT3DVIEWPO
LPBOOL lpValid)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lplpDDSurface, lpValid);
FIXME("(%p)->(%p,%p): stub\n", This, lplpDDSurface, lpValid);
return DD_OK;
}
@ -237,7 +237,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_Clear(LPDIRECT3DVIEWPORT2 iface,
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
GLboolean ztest;
FIXME(ddraw, "(%p)->(%8ld,%p,%08lx): stub\n", This, dwCount, lpRects, dwFlags);
FIXME("(%p)->(%8ld,%p,%08lx): stub\n", This, dwCount, lpRects, dwFlags);
/* For the moment, ignore the rectangles */
if (This->device.active_device1 != NULL) {
@ -264,7 +264,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_AddLight(LPDIRECT3DVIEWPORT2 iface,
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
IDirect3DLightImpl* ilpLight=(IDirect3DLightImpl*)lpLight;
FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpLight);
FIXME("(%p)->(%p): stub\n", This, ilpLight);
/* Add the light in the 'linked' chain */
ilpLight->next = This->lights;
@ -290,7 +290,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_DeleteLight(LPDIRECT3DVIEWPORT2 ifa
LPDIRECT3DLIGHT lpLight)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p): stub\n", This, lpLight);
FIXME("(%p)->(%p): stub\n", This, lpLight);
return DD_OK;
}
@ -301,7 +301,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_NextLight(LPDIRECT3DVIEWPORT2 iface
DWORD dwFlags)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
FIXME(ddraw, "(%p)->(%p,%p,%08lx): stub\n", This, lpLight, lplpLight, dwFlags);
FIXME("(%p)->(%p,%p,%08lx): stub\n", This, lpLight, lplpLight, dwFlags);
return DD_OK;
}
@ -311,7 +311,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetViewport2(LPDIRECT3DVIEWPORT2 if
LPD3DVIEWPORT2 lpViewport2)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpViewport2);
TRACE("(%p)->(%p)\n", This, lpViewport2);
if (This->use_vp2 != 1)
return DDERR_INVALIDPARAMS;
@ -325,17 +325,17 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetViewport2(LPDIRECT3DVIEWPORT2 if
LPD3DVIEWPORT2 lpViewport2)
{
ICOM_THIS(IDirect3DViewport2Impl,iface);
TRACE(ddraw, "(%p)->(%p)\n", This, lpViewport2);
TRACE("(%p)->(%p)\n", This, lpViewport2);
TRACE(ddraw, "dwSize = %ld dwX = %ld dwY = %ld\n",
TRACE("dwSize = %ld dwX = %ld dwY = %ld\n",
lpViewport2->dwSize, lpViewport2->dwX, lpViewport2->dwY);
TRACE(ddraw, "dwWidth = %ld dwHeight = %ld\n",
TRACE("dwWidth = %ld dwHeight = %ld\n",
lpViewport2->dwWidth, lpViewport2->dwHeight);
TRACE(ddraw, "dvClipX = %f dvClipY = %f\n",
TRACE("dvClipX = %f dvClipY = %f\n",
lpViewport2->dvClipX, lpViewport2->dvClipY);
TRACE(ddraw, "dvClipWidth = %f dvClipHeight = %f\n",
TRACE("dvClipWidth = %f dvClipHeight = %f\n",
lpViewport2->dvClipWidth, lpViewport2->dvClipHeight);
TRACE(ddraw, "dvMinZ = %f dvMaxZ = %f\n",
TRACE("dvMinZ = %f dvMaxZ = %f\n",
lpViewport2->dvMinZ, lpViewport2->dvMaxZ);
This->viewport.vp2 = *lpViewport2;
@ -377,12 +377,12 @@ static ICOM_VTABLE(IDirect3DViewport2) viewport2_vtable =
#else /* HAVE_MESAGL */
LPDIRECT3DVIEWPORT d3dviewport_create(IDirect3DImpl* d3d1) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}
LPDIRECT3DVIEWPORT2 d3dviewport2_create(IDirect3D2Impl* d3d2) {
ERR(ddraw, "Should not be called...\n");
ERR("Should not be called...\n");
return NULL;
}

558
graphics/ddraw.c
View File

File diff suppressed because it is too large Load Diff

4
graphics/dispdib.c
View File

@ -9,7 +9,7 @@
#include "miscemu.h"
#include "dispdib.h"
#include "vga.h"
#include "debug.h"
#include "debugtools.h"
#include "wine/wingdi16.h"
DEFAULT_DEBUG_CHANNEL(ddraw)
@ -132,7 +132,7 @@ WORD WINAPI DisplayDib(
DISPDIB_Show(&(lpbi->bmiHeader),lpBits,wFlags);
}
if (!(wFlags&DISPLAYDIB_NOWAIT)) {
FIXME(ddraw,"wait not implemented\n");
FIXME("wait not implemented\n");
}
if (!dispdib_multi) DISPDIB_End();
return DISPLAYDIB_NOERROR;

6
graphics/enhmetafiledrv/graphics.c
View File

@ -9,7 +9,7 @@
#include "dc.h"
#include "enhmetafiledrv.h"
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(enhmetafile)
@ -212,7 +212,7 @@ EMFDRV_Ellipse( DC *dc, INT left, INT top, INT right, INT bottom )
EMRELLIPSE emr;
INT temp;
TRACE(enhmetafile, "%d,%d - %d,%d\n", left, top, right, bottom);
TRACE("%d,%d - %d,%d\n", left, top, right, bottom);
if(left == right || top == bottom) return FALSE;
@ -242,7 +242,7 @@ EMFDRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
EMRRECTANGLE emr;
INT temp;
TRACE(enhmetafile, "%d,%d - %d,%d\n", left, top, right, bottom);
TRACE("%d,%d - %d,%d\n", left, top, right, bottom);
if(left == right || top == bottom) return FALSE;

14
graphics/enhmetafiledrv/init.c
View File

@ -12,7 +12,7 @@
#include "enhmetafile.h"
#include "enhmetafiledrv.h"
#include "wine/winestring.h"
#include "debug.h"
#include "debugtools.h"
#include <string.h>
@ -129,7 +129,7 @@ BOOL EMFDRV_WriteRecord( DC *dc, EMR *emr )
physDev->emh->nRecords++;
if(physDev->hFile) {
TRACE(enhmetafile,"Writing record to disk\n");
TRACE("Writing record to disk\n");
if (!WriteFile(physDev->hFile, (char *)emr, emr->nSize, NULL, NULL))
return FALSE;
} else {
@ -230,7 +230,7 @@ HDC WINAPI CreateEnhMetaFileW(
HFILE hFile;
DWORD size = 0, length = 0;
TRACE(enhmetafile, "'%s'\n", debugstr_w(filename) );
TRACE("'%s'\n", debugstr_w(filename) );
if (!(dc = DC_AllocDC( &EMFDRV_Funcs ))) return 0;
dc->header.wMagic = ENHMETAFILE_DC_MAGIC;
@ -286,7 +286,7 @@ HDC WINAPI CreateEnhMetaFileW(
physDev->hFile = hFile;
}
TRACE(enhmetafile, "returning %04x\n", dc->hSelf);
TRACE("returning %04x\n", dc->hSelf);
return dc->hSelf;
}
@ -302,7 +302,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc /* metafile DC */ )
EMREOF emr;
HANDLE hMapping = 0;
TRACE(enhmetafile, "(%04x)\n", hdc );
TRACE("(%04x)\n", hdc );
if (!(dc = (DC *) GDI_GetObjPtr( hdc, ENHMETAFILE_DC_MAGIC ))) return 0;
physDev = (EMFDRV_PDEVICE *)dc->physDev;
@ -329,9 +329,9 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc /* metafile DC */ )
HeapFree( SystemHeap, 0, physDev->emh );
hMapping = CreateFileMappingA(physDev->hFile, NULL, PAGE_READONLY, 0,
0, NULL);
TRACE(enhmetafile, "hMapping = %08x\n", hMapping );
TRACE("hMapping = %08x\n", hMapping );
physDev->emh = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0);
TRACE(enhmetafile, "view = %p\n", physDev->emh );
TRACE("view = %p\n", physDev->emh );
}

8
graphics/enhmetafiledrv/objects.c
View File

@ -11,7 +11,7 @@
#include "font.h"
#include "enhmetafiledrv.h"
#include "pen.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(enhmetafile)
@ -82,11 +82,11 @@ DWORD EMFDRV_CreateBrushIndirect( DC *dc, HBRUSH hBrush )
break;
case BS_PATTERN:
FIXME(enhmetafile, "Unsupported style %x\n",
FIXME("Unsupported style %x\n",
brushObj->logbrush.lbStyle);
break;
default:
FIXME(enhmetafile, "Unknown style %x\n", brushObj->logbrush.lbStyle);
FIXME("Unknown style %x\n", brushObj->logbrush.lbStyle);
return FALSE;
}
GDI_HEAP_UNLOCK( hBrush );
@ -236,7 +236,7 @@ HGDIOBJ EMFDRV_SelectObject( DC *dc, HGDIOBJ handle )
HGDIOBJ ret = 0;
if (!ptr) return 0;
TRACE(enhmetafile, "hdc=%04x %04x\n", dc->hSelf, handle );
TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
switch(ptr->wMagic)
{

6
graphics/env.c
View File

@ -10,7 +10,7 @@
#include <string.h>
#include "config.h"
#include "gdi.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(gdi)
@ -82,7 +82,7 @@ INT16 WINAPI GetEnvironment16(LPCSTR lpPortName, LPDEVMODEA lpdev, UINT16 nMaxSi
ENVTABLE *env;
WORD size;
TRACE(gdi, "('%s', %p, %d)\n", lpPortName, lpdev, nMaxSize);
TRACE("('%s', %p, %d)\n", lpPortName, lpdev, nMaxSize);
if (!(atom = PortNameToAtom(lpPortName, FALSE)))
return 0;
@ -112,7 +112,7 @@ INT16 WINAPI SetEnvironment16(LPCSTR lpPortName, LPDEVMODEA lpdev, UINT16 nCount
ENVTABLE *env;
HGLOBAL16 handle;
TRACE(gdi, "('%s', %p, %d)\n", lpPortName, lpdev, nCount);
TRACE("('%s', %p, %d)\n", lpPortName, lpdev, nCount);
if ((atom = PortNameToAtom(lpPortName, FALSE))) {
if (atom == GDI_GetNullPortAtom()) {

16
graphics/fontengine.c
View File

@ -10,7 +10,7 @@
#include <stdlib.h>
#include "winbase.h"
#include "font.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(font)
@ -22,7 +22,7 @@ DEFAULT_DEBUG_CHANNEL(font)
WORD WINAPI
EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data )
{
FIXME(font,"(%s,%p,%lx),stub\n",fontname,proc,data);
FIXME("(%s,%p,%lx),stub\n",fontname,proc,data);
return 0;
}
@ -57,7 +57,7 @@ WORD WINAPI EngineDeleteFont16(LPFONTINFO16 lpFontInfo)
*/
WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform, LPFONTINFO16 lpfontInfo)
{
FIXME(font,"(%p,%p,%p),stub\n",lplogFont,lptextxform,lpfontInfo);
FIXME("(%p,%p,%p),stub\n",lplogFont,lptextxform,lpfontInfo);
return 0;
}
@ -70,7 +70,7 @@ WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE l
int i;
for (i = firstChar; i <= lastChar; i++)
FIXME(font, " returns font's average width for range %d to %d\n", firstChar, lastChar);
FIXME(" returns font's average width for range %d to %d\n", firstChar, lastChar);
*buffer++ = lpFontInfo->dfAvgWidth; /* insert some charwidth functionality here; use average width for now */
return 1;
}
@ -80,7 +80,7 @@ WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE l
*/
WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data)
{
FIXME(font, "stub?\n");
FIXME("stub?\n");
return 0;
}
@ -89,7 +89,7 @@ WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data)
*/
WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD w2, LPSTR string, DWORD dword, /*LPBITMAPMETRICS16*/ LPVOID metrics)
{
FIXME(font, "stub?\n");
FIXME("stub?\n");
return 0;
}
@ -98,7 +98,7 @@ WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD
*/
DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string)
{
FIXME(font, " stub! (always fails)\n");
FIXME(" stub! (always fails)\n");
return -1; /* error */
}
@ -109,6 +109,6 @@ DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string)
WORD WINAPI EngineExtTextOut()
{
FIXME(font, "stub!\n");
FIXME("stub!\n");
return 0;
}

4
graphics/mapping.c
View File

@ -5,7 +5,7 @@
*/
#include "dc.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(gdi)
@ -124,7 +124,7 @@ INT WINAPI SetMapMode( HDC hdc, INT mode )
if (!dc) return 0;
if (dc->funcs->pSetMapMode) return dc->funcs->pSetMapMode( dc, mode );
TRACE(gdi, "%04x %d\n", hdc, mode );
TRACE("%04x %d\n", hdc, mode );
prevMode = dc->w.MapMode;
switch(mode)

8
graphics/metafiledrv/bitblt.c
View File

@ -7,7 +7,7 @@
#include "gdi.h"
#include "metafiledrv.h"
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
#include "bitmap.h"
DEFAULT_DEBUG_CHANNEL(metafile)
@ -45,7 +45,7 @@ BOOL MFDRV_BitBlt( DC *dcDst, INT xDst, INT yDst, INT width, INT height,
*(mr->rdParm + 9) = BM.bmWidthBytes;
*(mr->rdParm +10) = BM.bmPlanes;
*(mr->rdParm +11) = BM.bmBitsPixel;
TRACE(metafile,"len = %ld rop=%lx \n",len,rop);
TRACE("len = %ld rop=%lx \n",len,rop);
if (GetBitmapBits(dcSrc->w.hBitmap,BM.bmWidthBytes * BM.bmHeight,
mr->rdParm +12))
{
@ -110,7 +110,7 @@ BOOL MFDRV_StretchBlt( DC *dcDst, INT xDst, INT yDst, INT widthDst,
lpBMI->biYPelsPerMeter = MulDiv(GetDeviceCaps(dcSrc->hSelf,LOGPIXELSY),3937,100);
lpBMI->biClrImportant = 0; /* 1 meter = 39.37 inch */
TRACE(metafile,"MF_StretchBltViaDIB->len = %ld rop=%lx PixYPM=%ld Caps=%d\n",
TRACE("MF_StretchBltViaDIB->len = %ld rop=%lx PixYPM=%ld Caps=%d\n",
len,rop,lpBMI->biYPelsPerMeter,GetDeviceCaps(hdcSrc,LOGPIXELSY));
if (GetDIBits(hdcSrc,dcSrc->w.hBitmap,0,(UINT)lpBMI->biHeight,
(LPSTR)lpBMI + DIB_BitmapInfoSize( (BITMAPINFO *)lpBMI,
@ -126,7 +126,7 @@ BOOL MFDRV_StretchBlt( DC *dcDst, INT xDst, INT yDst, INT widthDst,
*(mr->rdParm +12) = BM.bmWidthBytes;
*(mr->rdParm +13) = BM.bmPlanes;
*(mr->rdParm +14) = BM.bmBitsPixel;
TRACE(metafile,"len = %ld rop=%lx \n",len,rop);
TRACE("len = %ld rop=%lx \n",len,rop);
if (GetBitmapBits( dcSrc->w.hBitmap, BM.bmWidthBytes * BM.bmHeight,
mr->rdParm +15))
#endif

8
graphics/metafiledrv/graphics.c
View File

@ -11,7 +11,7 @@
#include "xmalloc.h"
#include "metafiledrv.h"
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(metafile)
@ -233,7 +233,7 @@ static INT16 MFDRV_CreateRegion(DC *dc, HRGN hrgn)
len = GetRegionData( hrgn, 0, NULL );
if( !(rgndata = HeapAlloc( SystemHeap, 0, len )) ) {
WARN(metafile, "Can't alloc rgndata buffer\n");
WARN("Can't alloc rgndata buffer\n");
return -1;
}
GetRegionData( hrgn, len, rgndata );
@ -243,7 +243,7 @@ static INT16 MFDRV_CreateRegion(DC *dc, HRGN hrgn)
*/
len = sizeof(METARECORD) + 20 + (rgndata->rdh.nCount * 12);
if( !(mr = HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, len )) ) {
WARN(metafile, "Can't alloc METARECORD buffer\n");
WARN("Can't alloc METARECORD buffer\n");
HeapFree( SystemHeap, 0, rgndata );
return -1;
}
@ -296,7 +296,7 @@ static INT16 MFDRV_CreateRegion(DC *dc, HRGN hrgn)
HeapFree( SystemHeap, 0, rgndata );
if(!ret)
{
WARN(metafile, "MFDRV_WriteRecord failed\n");
WARN("MFDRV_WriteRecord failed\n");
return -1;
}
return MFDRV_AddHandleDC( dc );

12
graphics/metafiledrv/init.c
View File

@ -11,7 +11,7 @@
#include "global.h"
#include "metafile.h"
#include "metafiledrv.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(metafile)
@ -170,7 +170,7 @@ HDC16 WINAPI CreateMetaFile16(
METAFILEDRV_PDEVICE *physDev;
HFILE hFile;
TRACE(metafile, "'%s'\n", filename );
TRACE("'%s'\n", filename );
if (!(dc = MFDRV_AllocMetaFile())) return 0;
physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
@ -196,7 +196,7 @@ HDC16 WINAPI CreateMetaFile16(
else /* memory based metafile */
physDev->mh->mtType = METAFILE_MEMORY;
TRACE(metafile, "returning %04x\n", dc->hSelf);
TRACE("returning %04x\n", dc->hSelf);
return dc->hSelf;
}
@ -236,7 +236,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
DC *dc;
METAFILEDRV_PDEVICE *physDev;
TRACE(metafile, "(%04x)\n", hdc );
TRACE("(%04x)\n", hdc );
if (!(dc = (DC *) GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ))) return 0;
physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
@ -343,12 +343,12 @@ BOOL MFDRV_WriteRecord( DC *dc, METARECORD *mr, DWORD rlen)
memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen);
break;
case METAFILE_DISK:
TRACE(metafile,"Writing record to disk\n");
TRACE("Writing record to disk\n");
if (!WriteFile(physDev->hFile, (char *)mr, rlen, NULL, NULL))
return FALSE;
break;
default:
ERR(metafile, "Unknown metafile type %d\n", physDev->mh->mtType );
ERR("Unknown metafile type %d\n", physDev->mh->mtType );
return FALSE;
}

4
graphics/metafiledrv/text.c
View File

@ -7,7 +7,7 @@
#include "windef.h"
#include "metafiledrv.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(metafile)
@ -25,7 +25,7 @@ static BOOL MFDRV_MetaExtTextOut(DC*dc, short x, short y, UINT16 flags,
METARECORD *mr;
if((!flags && rect) || (flags && !rect))
WARN(metafile, "Inconsistent flags and rect\n");
WARN("Inconsistent flags and rect\n");
len = sizeof(METARECORD) + (((count + 1) >> 1) * 2) + 2 * sizeof(short)
+ sizeof(UINT16);
if(rect)

22
graphics/painting.c
View File

@ -13,7 +13,7 @@
#include "cache.h"
#include "region.h"
#include "path.h"
#include "debug.h"
#include "debugtools.h"
#include "winerror.h"
#include "winuser.h"
#include "wine/winuser16.h"
@ -462,7 +462,7 @@ COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y )
*/
INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd )
{
FIXME(gdi, "(%d,%p): stub\n",hdc,ppfd);
FIXME("(%d,%p): stub\n",hdc,ppfd);
return 1;
}
@ -481,7 +481,7 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd )
BOOL WINAPI SetPixelFormat( HDC hdc, int iPixelFormat,
const PIXELFORMATDESCRIPTOR* ppfd)
{
FIXME(gdi, "(%d,%d,%p): stub\n",hdc,iPixelFormat,ppfd);
FIXME("(%d,%d,%p): stub\n",hdc,iPixelFormat,ppfd);
return TRUE;
}
@ -499,7 +499,7 @@ BOOL WINAPI SetPixelFormat( HDC hdc, int iPixelFormat,
*/
int WINAPI GetPixelFormat( HDC hdc )
{
FIXME(gdi, "(%d): stub\n",hdc);
FIXME("(%d): stub\n",hdc);
return 1;
}
@ -521,7 +521,7 @@ int WINAPI GetPixelFormat( HDC hdc )
int WINAPI DescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes,
LPPIXELFORMATDESCRIPTOR ppfd )
{
FIXME(gdi, "(%d,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
FIXME("(%d,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
ppfd->nSize = nBytes;
ppfd->nVersion = 1;
return 3;
@ -539,7 +539,7 @@ int WINAPI DescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes,
*/
BOOL WINAPI SwapBuffers( HDC hdc )
{
FIXME(gdi, "(%d): stub\n",hdc);
FIXME("(%d): stub\n",hdc);
return TRUE;
}
@ -908,7 +908,7 @@ BOOL WINAPI DrawAnimatedRects( HWND hwnd, int idAni,
const RECT* lprcFrom,
const RECT* lprcTo )
{
FIXME(gdi,"(0x%x,%d,%p,%p): stub\n",hwnd,idAni,lprcFrom,lprcTo);
FIXME("(0x%x,%d,%p,%p): stub\n",hwnd,idAni,lprcFrom,lprcTo);
return TRUE;
}
@ -1198,7 +1198,7 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints )
DC * dc = DC_GetDCPtr( hdc );
if(!dc) return FALSE;
if(dc && PATH_IsPathOpen(dc->w.path))
FIXME(gdi, "PATH_PolyBezier is not implemented!\n");
FIXME("PATH_PolyBezier is not implemented!\n");
/* if(!PATH_PolyBezier(hdc, x, y))
return FALSE; */
return dc->funcs->pPolyBezier&&
@ -1225,7 +1225,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints )
pt.x=dc->w.CursPosX;
pt.y=dc->w.CursPosY;
if(dc && PATH_IsPathOpen(dc->w.path))
FIXME(gdi, "PATH_PolyBezierTo is not implemented!\n");
FIXME("PATH_PolyBezierTo is not implemented!\n");
/* if(!PATH_PolyBezier(hdc, x, y))
return FALSE; */
ret= dc->funcs->pPolyBezier &&
@ -1242,7 +1242,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints )
BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius,
FLOAT eStartAngle, FLOAT eSweepAngle)
{
FIXME(gdi,"AngleArc, stub\n");
FIXME("AngleArc, stub\n");
return 0;
}
@ -1253,6 +1253,6 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius,
BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes,
DWORD cCount)
{
FIXME(gdi,"PolyDraw, stub\n");
FIXME("PolyDraw, stub\n");
return 0;
}

12
graphics/path.c
View File

@ -18,7 +18,7 @@
#include "winerror.h"
#include "dc.h"
#include "debug.h"
#include "debugtools.h"
#include "path.h"
DEFAULT_DEBUG_CHANNEL(gdi)
@ -247,7 +247,7 @@ BOOL WINAPI CloseFigure(HDC hdc)
INT16 WINAPI GetPath16(HDC16 hdc, LPPOINT16 pPoints, LPBYTE pTypes,
INT16 nSize)
{
FIXME(gdi, "(%d,%p,%p): stub\n",hdc,pPoints,pTypes);
FIXME("(%d,%p,%p): stub\n",hdc,pPoints,pTypes);
return 0;
}
@ -1132,7 +1132,7 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[],
*/
BOOL WINAPI FlattenPath(HDC hdc)
{
FIXME(gdi, "FlattenPath, stub\n");
FIXME("FlattenPath, stub\n");
return 0;
}
@ -1143,7 +1143,7 @@ BOOL WINAPI FlattenPath(HDC hdc)
*/
BOOL WINAPI StrokeAndFillPath(HDC hdc)
{
FIXME(gdi, "StrokeAndFillPath, stub\n");
FIXME("StrokeAndFillPath, stub\n");
return 0;
}
@ -1154,7 +1154,7 @@ BOOL WINAPI StrokeAndFillPath(HDC hdc)
*/
BOOL WINAPI StrokePath(HDC hdc)
{
FIXME(gdi, "StrokePath, stub\n");
FIXME("StrokePath, stub\n");
return 0;
}
@ -1165,7 +1165,7 @@ BOOL WINAPI StrokePath(HDC hdc)
*/
BOOL WINAPI WidenPath(HDC hdc)
{
FIXME(gdi, "WidenPath, stub\n");
FIXME("WidenPath, stub\n");
return 0;
}

18
graphics/psdrv/afm.c
View File

@ -10,7 +10,7 @@
#include "winnt.h" /* HEAP_ZERO_MEMORY */
#include "psdrv.h"
#include "options.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -39,7 +39,7 @@ static void PSDRV_AFMGetCharMetrics(AFM *afm, FILE *fp)
for(i = 0; i < afm->NumofMetrics; i++) {
if(!fgets(line, sizeof(line), fp)) {
ERR(psdrv, "Unexpected EOF\n");
ERR("Unexpected EOF\n");
return;
}
@ -102,7 +102,7 @@ static void PSDRV_AFMGetCharMetrics(AFM *afm, FILE *fp)
}
#if 0
TRACE(psdrv, "Metrics for '%s' WX = %f B = %f,%f - %f,%f\n",
TRACE("Metrics for '%s' WX = %f B = %f,%f - %f,%f\n",
metric->N, metric->WX, metric->B.llx, metric->B.lly,
metric->B.urx, metric->B.ury);
#endif
@ -129,10 +129,10 @@ static AFM *PSDRV_AFMParse(char const *file)
AFM *afm;
char *cp;
TRACE(psdrv, "parsing '%s'\n", file);
TRACE("parsing '%s'\n", file);
if((fp = fopen(file, "r")) == NULL) {
MSG("Can't open AFM file '%s'. Please check wine.conf .\n", file);
MESSAGE("Can't open AFM file '%s'. Please check wine.conf .\n", file);
return NULL;
}
@ -181,7 +181,7 @@ static AFM *PSDRV_AFMParse(char const *file)
else if(!strncmp("Light", value, 5))
afm->Weight = FW_LIGHT;
else {
FIXME(psdrv, "Unkown AFM Weight '%s'\n", value);
FIXME("Unkown AFM Weight '%s'\n", value);
afm->Weight = FW_NORMAL;
}
continue;
@ -373,7 +373,7 @@ static void PSDRV_ReencodeCharWidths(AFM *afm)
}
}
if(!metric) {
WARN(psdrv, "Couldn't find glyph '%s' in font '%s'\n",
WARN("Couldn't find glyph '%s' in font '%s'\n",
PSDRV_ANSIVector[i], afm->FontName);
afm->CharWidths[i] = 0.0;
}
@ -418,9 +418,9 @@ static void PSDRV_DumpFontList(void)
AFMLISTENTRY *afmle;
for(family = PSDRV_AFMFontList; family; family = family->next) {
TRACE(psdrv, "Family '%s'\n", family->FamilyName);
TRACE("Family '%s'\n", family->FamilyName);
for(afmle = family->afmlist; afmle; afmle = afmle->next) {
TRACE(psdrv, "\tFontName '%s'\n", afmle->afm->FontName);
TRACE("\tFontName '%s'\n", afmle->afm->FontName);
}
}
return;

16
graphics/psdrv/bitmap.c
View File

@ -7,7 +7,7 @@
#include "gdi.h"
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
#include "bitmap.h"
#include "winbase.h"
@ -77,7 +77,7 @@ static BOOL PSDRV_WriteImageHeader(DC *dc, const BITMAPINFO *info, INT xDst,
}
default:
FIXME(psdrv, "Not implemented yet\n");
FIXME("Not implemented yet\n");
return FALSE;
break;
}
@ -108,7 +108,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
const char *ptr;
INT line;
TRACE(psdrv, "%08x (%d,%d %dx%d) -> (%d,%d %dx%d)\n", dc->hSelf,
TRACE("%08x (%d,%d %dx%d) -> (%d,%d %dx%d)\n", dc->hSelf,
xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst);
DIB_GetBitmapInfo((const BITMAPINFOHEADER *)info, &fullSrcWidth,
@ -116,12 +116,12 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
widthbytes = DIB_GetDIBWidthBytes(fullSrcWidth, bpp);
TRACE(psdrv, "full size=%ldx%d bpp=%d compression=%d\n", fullSrcWidth,
TRACE("full size=%ldx%d bpp=%d compression=%d\n", fullSrcWidth,
fullSrcHeight, bpp, compression);
if(compression != BI_RGB) {
FIXME(psdrv, "Compression not supported\n");
FIXME("Compression not supported\n");
return FALSE;
}
@ -139,7 +139,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
ptr = bits;
ptr += (ySrc * widthbytes);
if(xSrc & 7 || widthSrc & 7)
FIXME(psdrv, "This won't work...\n");
FIXME("This won't work...\n");
for(line = 0; line < heightSrc; line++, ptr += widthbytes)
PSDRV_WriteBytes(dc, ptr + xSrc/8, widthSrc/8);
break;
@ -151,7 +151,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
ptr = bits;
ptr += (ySrc * widthbytes);
if(xSrc & 1 || widthSrc & 1)
FIXME(psdrv, "This won't work...\n");
FIXME("This won't work...\n");
for(line = 0; line < heightSrc; line++, ptr += widthbytes)
PSDRV_WriteBytes(dc, ptr + xSrc/2, widthSrc/2);
break;
@ -201,7 +201,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
break;
default:
FIXME(psdrv, "Unsupported depth\n");
FIXME("Unsupported depth\n");
return FALSE;
}

14
graphics/psdrv/brush.c
View File

@ -7,7 +7,7 @@
#include "psdrv.h"
#include "brush.h"
#include "debug.h"
#include "debugtools.h"
#include "gdi.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -20,7 +20,7 @@ HBRUSH PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
HBRUSH prevbrush = dc->w.hBrush;
PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
TRACE(psdrv, "hbrush = %08x\n", hbrush);
TRACE("hbrush = %08x\n", hbrush);
dc->w.hBrush = hbrush;
switch(brush->logbrush.lbStyle) {
@ -39,11 +39,11 @@ HBRUSH PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
break;
case BS_PATTERN:
FIXME(psdrv, "Unsupported brush style %d\n", brush->logbrush.lbStyle);
FIXME("Unsupported brush style %d\n", brush->logbrush.lbStyle);
break;
default:
FIXME(psdrv, "Unrecognized brush style %d\n", brush->logbrush.lbStyle);
FIXME("Unrecognized brush style %d\n", brush->logbrush.lbStyle);
break;
}
@ -63,7 +63,7 @@ static BOOL PSDRV_SetBrush(DC *dc)
BRUSHOBJ *brush = (BRUSHOBJ *)GDI_GetObjPtr( dc->w.hBrush, BRUSH_MAGIC );
if(!brush) {
ERR(psdrv, "Can't get BRUSHOBJ\n");
ERR("Can't get BRUSHOBJ\n");
return FALSE;
}
@ -123,7 +123,7 @@ BOOL PSDRV_Brush(DC *dc, BOOL EO)
BRUSHOBJ *brush = (BRUSHOBJ *)GDI_GetObjPtr( dc->w.hBrush, BRUSH_MAGIC );
if(!brush) {
ERR(psdrv, "Can't get BRUSHOBJ\n");
ERR("Can't get BRUSHOBJ\n");
return FALSE;
}
@ -182,7 +182,7 @@ BOOL PSDRV_Brush(DC *dc, BOOL EO)
break;
default:
ERR(psdrv, "Unknown hatch style\n");
ERR("Unknown hatch style\n");
return FALSE;
}
return TRUE;

8
graphics/psdrv/color.c
View File

@ -6,7 +6,7 @@
*/
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -32,7 +32,7 @@ BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2)
return TRUE;
break;
default:
ERR(psdrv, "Unknown colour type %d\n", col1->type);
ERR("Unknown colour type %d\n", col1->type);
}
return FALSE;
}
@ -58,7 +58,7 @@ BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2)
break;
default:
ERR(psdrv, "Unknown colour type %d\n", col1->type);
ERR("Unknown colour type %d\n", col1->type);
return FALSE;
}
@ -81,7 +81,7 @@ void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor,
float r, g, b;
if(ctype != 0)
FIXME(psdrv, "Colour is %08lx\n", wincolor);
FIXME("Colour is %08lx\n", wincolor);
r = (wincolor & 0xff) / 256.0;
g = ((wincolor >> 8) & 0xff) / 256.0;

60
graphics/psdrv/escape.c
View File

@ -5,7 +5,7 @@
*/
#include "wine/winuser16.h"
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
#include "winspool.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -24,20 +24,20 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
physDev->job.banding = TRUE;
SetRect16( r, 0, 0, dc->w.devCaps->horzRes,
dc->w.devCaps->vertRes );
TRACE(psdrv, "NEXTBAND returning %d,%d - %d,%d\n", r->left,
TRACE("NEXTBAND returning %d,%d - %d,%d\n", r->left,
r->top, r->right, r->bottom );
return 1;
}
SetRect16( r, 0, 0, 0, 0 );
TRACE(psdrv, "NEXTBAND rect to 0,0 - 0,0\n" );
TRACE("NEXTBAND rect to 0,0 - 0,0\n" );
physDev->job.banding = FALSE;
} /* Fall through */
case NEWFRAME:
TRACE(psdrv, "NEWFRAME\n");
TRACE("NEWFRAME\n");
if(!physDev->job.hJob) {
FIXME(psdrv, "hJob == 0. Now what?\n");
FIXME("hJob == 0. Now what?\n");
return 0;
}
@ -49,11 +49,11 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
case QUERYESCSUPPORT:
if(cbInput != 2) {
WARN(psdrv, "cbInput != 2 (=%d) for QUERYESCSUPPORT\n", cbInput);
WARN("cbInput != 2 (=%d) for QUERYESCSUPPORT\n", cbInput);
return 0;
} else {
UINT16 num = *(UINT16 *)PTR_SEG_TO_LIN(lpInData);
TRACE(psdrv, "QUERYESCSUPPORT for %d\n", num);
TRACE("QUERYESCSUPPORT for %d\n", num);
switch(num) {
case NEWFRAME:
@ -81,23 +81,23 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
}
case SETABORTPROC:
FIXME(psdrv, "SETABORTPROC: Ignoring\n");
FIXME("SETABORTPROC: Ignoring\n");
/* dc->w.lpfnPrint = (FARPROC16)lpInData;
*/
return 1;
case STARTDOC:
TRACE(psdrv, "STARTDOC\n");
TRACE("STARTDOC\n");
if(physDev->job.hJob) {
FIXME(psdrv, "hJob != 0. Now what?\n");
FIXME("hJob != 0. Now what?\n");
return 0;
}
physDev->job.hJob = OpenJob16(physDev->job.output,
PTR_SEG_TO_LIN(lpInData), dc->hSelf);
if(!physDev->job.hJob) {
WARN(psdrv, "OpenJob failed\n");
WARN("OpenJob failed\n");
return 0;
}
physDev->job.banding = FALSE;
@ -111,9 +111,9 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
return 1;
case ENDDOC:
TRACE(psdrv, "ENDDOC\n");
TRACE("ENDDOC\n");
if(!physDev->job.hJob) {
FIXME(psdrv, "hJob == 0. Now what?\n");
FIXME("hJob == 0. Now what?\n");
return 0;
}
@ -123,7 +123,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
return 0;
if( CloseJob16( physDev->job.hJob ) == SP_ERROR ) {
WARN(psdrv, "CloseJob error\n");
WARN("CloseJob error\n");
return 0;
}
physDev->job.hJob = 0;
@ -135,7 +135,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
p->x = dc->w.devCaps->horzRes;
p->y = dc->w.devCaps->vertRes;
TRACE(psdrv, "GETPHYSPAGESIZE: returning %dx%d\n", p->x, p->y);
TRACE("GETPHYSPAGESIZE: returning %dx%d\n", p->x, p->y);
return 1;
}
@ -144,7 +144,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
POINT16 *p = (POINT16 *)PTR_SEG_TO_LIN(lpOutData);
p->x = p->y = 0;
TRACE(psdrv, "GETPRINTINGOFFSET: returning %dx%d\n", p->x, p->y);
TRACE("GETPRINTINGOFFSET: returning %dx%d\n", p->x, p->y);
return 1;
}
@ -153,7 +153,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
POINT16 *p = (POINT16 *)PTR_SEG_TO_LIN(lpOutData);
p->x = p->y = 0;
TRACE(psdrv, "GETSCALINGFACTOR: returning %dx%d\n", p->x, p->y);
TRACE("GETSCALINGFACTOR: returning %dx%d\n", p->x, p->y);
return 1;
}
@ -162,10 +162,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
INT16 *NumCopies = (INT16 *)PTR_SEG_TO_LIN(lpInData);
INT16 *ActualCopies = (INT16 *)PTR_SEG_TO_LIN(lpOutData);
if(cbInput != 2) {
WARN(psdrv, "cbInput != 2 (=%d) for SETCOPYCOUNT\n", cbInput);
WARN("cbInput != 2 (=%d) for SETCOPYCOUNT\n", cbInput);
return 0;
}
TRACE(psdrv, "SETCOPYCOUNT %d\n", *NumCopies);
TRACE("SETCOPYCOUNT %d\n", *NumCopies);
*ActualCopies = 1;
return 1;
}
@ -182,10 +182,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
{
INT16 newCap = *(INT16 *)PTR_SEG_TO_LIN(lpInData);
if(cbInput != 2) {
WARN(psdrv, "cbInput != 2 (=%d) for SETLINECAP\n", cbInput);
WARN("cbInput != 2 (=%d) for SETLINECAP\n", cbInput);
return 0;
}
TRACE(psdrv, "SETLINECAP %d\n", newCap);
TRACE("SETLINECAP %d\n", newCap);
return 0;
}
@ -193,10 +193,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
{
INT16 newJoin = *(INT16 *)PTR_SEG_TO_LIN(lpInData);
if(cbInput != 2) {
WARN(psdrv, "cbInput != 2 (=%d) for SETLINEJOIN\n", cbInput);
WARN("cbInput != 2 (=%d) for SETLINEJOIN\n", cbInput);
return 0;
}
TRACE(psdrv, "SETLINEJOIN %d\n", newJoin);
TRACE("SETLINEJOIN %d\n", newJoin);
return 0;
}
@ -204,10 +204,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
{
INT16 newLimit = *(INT16 *)PTR_SEG_TO_LIN(lpInData);
if(cbInput != 2) {
WARN(psdrv, "cbInput != 2 (=%d) for SETMITERLIMIT\n", cbInput);
WARN("cbInput != 2 (=%d) for SETMITERLIMIT\n", cbInput);
return 0;
}
TRACE(psdrv, "SETMITERLIMIT %d\n", newLimit);
TRACE("SETMITERLIMIT %d\n", newLimit);
return 0;
}
@ -234,11 +234,11 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
{
UINT16 cap = *(UINT16 *)PTR_SEG_TO_LIN(lpInData);
if(cbInput != 2) {
WARN(psdrv, "cbInput != 2 (=%d) for EXT_DEVICE_CAPS\n",
WARN("cbInput != 2 (=%d) for EXT_DEVICE_CAPS\n",
cbInput);
return 0;
}
TRACE(psdrv, "EXT_DEVICE_CAPS %d\n", cap);
TRACE("EXT_DEVICE_CAPS %d\n", cap);
return 0;
}
@ -246,16 +246,16 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
{
RECT16 *r = (RECT16 *)PTR_SEG_TO_LIN(lpInData);
if(cbInput != 8) {
WARN(psdrv, "cbInput != 8 (=%d) for SET_BOUNDS\n", cbInput);
WARN("cbInput != 8 (=%d) for SET_BOUNDS\n", cbInput);
return 0;
}
TRACE(psdrv, "SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top,
TRACE("SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top,
r->right, r->bottom);
return 0;
}
default:
FIXME(psdrv, "Unimplemented code 0x%x\n", nEscape);
FIXME("Unimplemented code 0x%x\n", nEscape);
return 0;
}
}

26
graphics/psdrv/font.c
View File

@ -7,7 +7,7 @@
#include <string.h>
#include "winspool.h"
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -29,7 +29,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
char FaceName[LF_FACESIZE];
TRACE(psdrv, "FaceName = '%s' Height = %d Italic = %d Weight = %d\n",
TRACE("FaceName = '%s' Height = %d Italic = %d Weight = %d\n",
lf->lfFaceName, lf->lfHeight, lf->lfItalic, lf->lfWeight);
dc->w.hFont = hfont;
@ -71,7 +71,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
}
}
TRACE(psdrv, "Trying to find facename '%s'\n", FaceName);
TRACE("Trying to find facename '%s'\n", FaceName);
for(family = physDev->pi->Fonts; family; family = family->next) {
if(!strcmp(FaceName, family->FamilyName))
@ -80,7 +80,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
if(!family)
family = physDev->pi->Fonts;
TRACE(psdrv, "Got family '%s'\n", family->FamilyName);
TRACE("Got family '%s'\n", family->FamilyName);
for(afmle = family->afmlist; afmle; afmle = afmle->next) {
if( (bd == (afmle->afm->Weight == FW_BOLD)) &&
@ -97,7 +97,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
if(physDev->font.tm.tmHeight < 0) {
physDev->font.tm.tmHeight *= - (afm->FullAscender - afm->Descender) /
(afm->Ascender - afm->Descender);
TRACE(psdrv, "Fixed -ve height to %ld\n", physDev->font.tm.tmHeight);
TRACE("Fixed -ve height to %ld\n", physDev->font.tm.tmHeight);
}
physDev->font.size = physDev->font.tm.tmHeight * 1000.0 /
(afm->FullAscender - afm->Descender);
@ -131,10 +131,10 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
physDev->font.set = FALSE;
TRACE(psdrv, "Selected PS font '%s' size %d weight %ld.\n",
TRACE("Selected PS font '%s' size %d weight %ld.\n",
physDev->font.afm->FontName, physDev->font.size,
physDev->font.tm.tmWeight );
TRACE(psdrv, "H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n",
TRACE("H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n",
physDev->font.tm.tmHeight, physDev->font.tm.tmAscent,
physDev->font.tm.tmDescent, physDev->font.tm.tmInternalLeading,
physDev->font.tm.tmExternalLeading);
@ -172,7 +172,7 @@ BOOL PSDRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
/* TRACE(psdrv, "Width after %dth char '%c' = %f\n", i, str[i], width);*/
}
width *= physDev->font.scale;
TRACE(psdrv, "Width after scale (%f) is %f\n", physDev->font.scale, width);
TRACE("Width after scale (%f) is %f\n", physDev->font.scale, width);
size->cx = XDSTOLS(dc, width);
return TRUE;
@ -188,7 +188,7 @@ BOOL PSDRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
UINT i;
TRACE(psdrv, "first = %d last = %d\n", firstChar, lastChar);
TRACE("first = %d last = %d\n", firstChar, lastChar);
if(lastChar > 0xff) return FALSE;
for( i = firstChar; i <= lastChar; i++ )
@ -278,7 +278,7 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf,
PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
if( plf->lfFaceName[0] ) {
TRACE(psdrv, "lfFaceName = '%s'\n", plf->lfFaceName);
TRACE("lfFaceName = '%s'\n", plf->lfFaceName);
for(family = physDev->pi->Fonts; family; family = family->next) {
if(!strncmp(plf->lfFaceName, family->FamilyName,
strlen(family->FamilyName)))
@ -286,7 +286,7 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf,
}
if(family) {
for(afmle = family->afmlist; afmle; afmle = afmle->next) {
TRACE(psdrv, "Got '%s'\n", afmle->afm->FontName);
TRACE("Got '%s'\n", afmle->afm->FontName);
if( (b = (*proc)( (LPENUMLOGFONT16)&lf, &tm,
PSDRV_GetFontMetric( dc, afmle->afm, &tm, &lf, 200 ),
lp )) )
@ -296,10 +296,10 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf,
}
} else {
TRACE(psdrv, "lfFaceName = NULL\n");
TRACE("lfFaceName = NULL\n");
for(family = physDev->pi->Fonts; family; family = family->next) {
afmle = family->afmlist;
TRACE(psdrv, "Got '%s'\n", afmle->afm->FontName);
TRACE("Got '%s'\n", afmle->afm->FontName);
if( (b = (*proc)( (LPENUMLOGFONT16)&lf, &tm,
PSDRV_GetFontMetric( dc, afmle->afm, &tm, &lf, 200 ),
lp )) )

14
graphics/psdrv/graphics.c
View File

@ -14,7 +14,7 @@
#define PI M_PI
#endif
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
#include "winspool.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -24,7 +24,7 @@ DEFAULT_DEBUG_CHANNEL(psdrv)
*/
BOOL PSDRV_MoveToEx(DC *dc, INT x, INT y, LPPOINT pt)
{
TRACE(psdrv, "%d %d\n", x, y);
TRACE("%d %d\n", x, y);
if (pt)
{
pt->x = dc->w.CursPosX;
@ -42,7 +42,7 @@ BOOL PSDRV_MoveToEx(DC *dc, INT x, INT y, LPPOINT pt)
*/
BOOL PSDRV_LineTo(DC *dc, INT x, INT y)
{
TRACE(psdrv, "%d %d\n", x, y);
TRACE("%d %d\n", x, y);
PSDRV_SetPen(dc);
PSDRV_WriteMoveTo(dc, XLPTODP(dc, dc->w.CursPosX),
@ -66,7 +66,7 @@ BOOL PSDRV_Rectangle( DC *dc, INT left, INT top, INT right,
INT height = YLSTODS(dc, bottom - top);
TRACE(psdrv, "%d %d - %d %d\n", left, top, right, bottom);
TRACE("%d %d - %d %d\n", left, top, right, bottom);
PSDRV_WriteRectangle(dc, XLPTODP(dc, left), YLPTODP(dc, top),
width, height);
@ -202,7 +202,7 @@ BOOL PSDRV_Ellipse( DC *dc, INT left, INT top, INT right, INT bottom)
{
INT x, y, w, h;
TRACE(psdrv, "%d %d - %d %d\n", left, top, right, bottom);
TRACE("%d %d - %d %d\n", left, top, right, bottom);
x = XLPTODP(dc, (left + right)/2);
y = YLPTODP(dc, (top + bottom)/2);
@ -227,7 +227,7 @@ BOOL PSDRV_PolyPolyline( DC *dc, const POINT* pts, const DWORD* counts,
{
DWORD polyline, line;
const POINT* pt;
TRACE(psdrv, "\n");
TRACE("\n");
pt = pts;
for(polyline = 0; polyline < polylines; polyline++) {
@ -261,7 +261,7 @@ BOOL PSDRV_PolyPolygon( DC *dc, const POINT* pts, const INT* counts,
{
DWORD polygon, line;
const POINT* pt;
TRACE(psdrv, "\n");
TRACE("\n");
pt = pts;
for(polygon = 0; polygon < polygons; polygon++) {

16
graphics/psdrv/init.c
View File

@ -8,7 +8,7 @@
#include "gdi.h"
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
#include "winreg.h"
#include "winspool.h"
@ -202,7 +202,7 @@ static LOGFONTA DefaultLogFont = {
*/
BOOL PSDRV_Init(void)
{
TRACE(psdrv, "\n");
TRACE("\n");
PSDRV_Heap = HeapCreate(0, 0x10000, 0);
PSDRV_GetFontMetrics();
PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont);
@ -229,12 +229,12 @@ static BOOL PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
}
pi = PSDRV_FindPrinterInfo(device);
TRACE(psdrv, "(%s %s %s %p)\n", driver, device, output, initData);
TRACE("(%s %s %s %p)\n", driver, device, output, initData);
if(!pi) return FALSE;
if(!pi->Fonts) {
MSG("To use WINEPS you need to install some AFM files.\n");
MESSAGE("To use WINEPS you need to install some AFM files.\n");
return FALSE;
}
@ -312,7 +312,7 @@ static BOOL PSDRV_DeleteDC( DC *dc )
{
PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
TRACE(psdrv, "\n");
TRACE("\n");
HeapFree( PSDRV_Heap, 0, physDev->Devmode );
HeapFree( PSDRV_Heap, 0, physDev->job.output );
@ -337,7 +337,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
FONTNAME *font;
AFM *afm;
TRACE(psdrv, "'%s'\n", name);
TRACE("'%s'\n", name);
for( ; pi; last = &pi->next, pi = pi->next) {
if(!strcmp(pi->FriendlyName, name))
@ -368,7 +368,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
HeapFree(PSDRV_Heap, 0, pi->Devmode);
HeapFree(PSDRV_Heap, 0, pi);
*last = NULL;
MSG("Couldn't find PPD file '%s', expect a crash now!\n",
MESSAGE("Couldn't find PPD file '%s', expect a crash now!\n",
pi->Devmode->dmDrvPrivate.ppdFileName);
return NULL;
}
@ -379,7 +379,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
for(font = pi->ppd->InstalledFonts; font; font = font->next) {
afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name);
if(!afm) {
MSG(
MESSAGE(
"Couldn't find AFM file for installed printer font '%s' - ignoring\n",
font->Name);
} else {

8
graphics/psdrv/objects.c
View File

@ -10,7 +10,7 @@
#include "pen.h"
#include "brush.h"
#include "bitmap.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -20,7 +20,7 @@ DEFAULT_DEBUG_CHANNEL(psdrv)
static HBITMAP16 PSDRV_BITMAP_SelectObject( DC * dc, HBITMAP16 hbitmap,
BITMAPOBJ * bmp )
{
FIXME(psdrv, "stub\n");
FIXME("stub\n");
return 0;
}
@ -34,7 +34,7 @@ HGDIOBJ PSDRV_SelectObject( DC *dc, HGDIOBJ handle )
HGDIOBJ ret = 0;
if (!ptr) return 0;
TRACE(psdrv, "hdc=%04x %04x\n", dc->hSelf, handle );
TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
switch(ptr->wMagic)
{
@ -54,7 +54,7 @@ HGDIOBJ PSDRV_SelectObject( DC *dc, HGDIOBJ handle )
ret = (HGDIOBJ16)SelectClipRgn16( dc->hSelf, handle );
break;
default:
ERR(psdrv, "Unknown object magic %04x\n", ptr->wMagic);
ERR("Unknown object magic %04x\n", ptr->wMagic);
break;
}
GDI_HEAP_UNLOCK( handle );

4
graphics/psdrv/pen.c
View File

@ -7,7 +7,7 @@
#include "pen.h"
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -25,7 +25,7 @@ extern HPEN PSDRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
HPEN prevpen = dc->w.hPen;
PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
TRACE(psdrv, "hpen = %08x colour = %08lx\n", hpen, pen->logpen.lopnColor);
TRACE("hpen = %08x colour = %08lx\n", hpen, pen->logpen.lopnColor);
dc->w.hPen = hpen;
physDev->pen.width = XLSTODS(dc, pen->logpen.lopnWidth.x);

48
graphics/psdrv/ppd.c
View File

@ -9,7 +9,7 @@
#include <ctype.h>
#include "winnt.h" /* HEAP_ZERO_MEMORY */
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
#include "psdrv.h"
#include "winspool.h"
@ -88,7 +88,7 @@ static char *PSDRV_PPDDecodeHex(char *str)
else {
int i;
if(!isxdigit(*in) || !isxdigit(*(in + 1))) {
ERR(psdrv, "Invalid hex char in hex string\n");
ERR("Invalid hex char in hex string\n");
HeapFree(PSDRV_Heap, 0, buf);
return NULL;
}
@ -224,7 +224,7 @@ static BOOL PSDRV_PPDGetStringValue(char *str, PPDTuple *tuple)
*/
static BOOL PSDRV_PPDGetSymbolValue(char *pos, PPDTuple *tuple)
{
FIXME(psdrv, "Stub\n");
FIXME("Stub\n");
return FALSE;
}
@ -251,7 +251,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
} while(1);
if(line[strlen(line)-1] != '\n') {
ERR(psdrv, "Line too long.\n");
ERR("Line too long.\n");
return FALSE;
}
@ -276,7 +276,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
opt++;
cp = strpbrk(opt, ":/");
if(!cp) {
ERR(psdrv, "Error in line '%s'?\n", line);
ERR("Error in line '%s'?\n", line);
return FALSE;
}
tuple->option = HeapAlloc( PSDRV_Heap, 0, cp - opt + 1 );
@ -288,7 +288,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
trans = cp + 1;
cp = strchr(trans, ':');
if(!cp) {
ERR(psdrv, "Error in line '%s'?\n", line);
ERR("Error in line '%s'?\n", line);
return FALSE;
}
buf = HeapAlloc( PSDRV_Heap, 0, cp - trans + 1 );
@ -399,16 +399,16 @@ PPD *PSDRV_ParsePPD(char *fname)
PPD *ppd;
PPDTuple tuple;
TRACE(psdrv, "%s\n", fname);
TRACE("%s\n", fname);
if((fp = fopen(fname, "r")) == NULL) {
WARN(psdrv, "Couldn't open ppd file '%s'\n", fname);
WARN("Couldn't open ppd file '%s'\n", fname);
return NULL;
}
ppd = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*ppd));
if(!ppd) {
ERR(psdrv, "Unable to allocate memory for ppd\n");
ERR("Unable to allocate memory for ppd\n");
fclose(fp);
return NULL;
}
@ -419,24 +419,24 @@ PPD *PSDRV_ParsePPD(char *fname)
if(!strcmp("*NickName", tuple.key)) {
ppd->NickName = tuple.value;
tuple.value = NULL;
TRACE(psdrv, "NickName = '%s'\n", ppd->NickName);
TRACE("NickName = '%s'\n", ppd->NickName);
}
else if(!strcmp("*LanguageLevel", tuple.key)) {
sscanf(tuple.value, "%d", &(ppd->LanguageLevel));
TRACE(psdrv, "LanguageLevel = %d\n", ppd->LanguageLevel);
TRACE("LanguageLevel = %d\n", ppd->LanguageLevel);
}
else if(!strcmp("*ColorDevice", tuple.key)) {
if(!strcasecmp(tuple.value, "true"))
ppd->ColorDevice = TRUE;
TRACE(psdrv, "ColorDevice = %d\n", (int)ppd->ColorDevice);
TRACE("ColorDevice = %d\n", (int)ppd->ColorDevice);
}
else if((!strcmp("*DefaultResolution", tuple.key)) ||
(!strcmp("*DefaultJCLResolution", tuple.key))) {
sscanf(tuple.value, "%d", &(ppd->DefaultResolution));
TRACE(psdrv, "DefaultResolution = %d\n", ppd->DefaultResolution);
TRACE("DefaultResolution = %d\n", ppd->DefaultResolution);
}
else if(!strcmp("*Font", tuple.key)) {
@ -494,7 +494,7 @@ PPD *PSDRV_ParsePPD(char *fname)
}
}
if(!page->WinPage)
FIXME(psdrv, "Can't find Windows page type for '%s'\n",
FIXME("Can't find Windows page type for '%s'\n",
page->Name);
}
if(!page->FullName) {
@ -559,7 +559,7 @@ PPD *PSDRV_ParsePPD(char *fname)
/* anything else, namely 'any', leaves value at 0 */
TRACE(psdrv, "LandscapeOrientation = %d\n",
TRACE("LandscapeOrientation = %d\n",
ppd->LandscapeOrientation);
}
@ -610,7 +610,7 @@ PPD *PSDRV_ParsePPD(char *fname)
}
}
if(!slot->WinBin)
FIXME(psdrv, "Can't find Windows bin type for '%s'\n",
FIXME("Can't find Windows bin type for '%s'\n",
slot->Name);
}
@ -633,35 +633,35 @@ PPD *PSDRV_ParsePPD(char *fname)
OPTIONENTRY *optionEntry;
for(fn = ppd->InstalledFonts; fn; fn = fn->next)
TRACE(psdrv, "'%s'\n", fn->Name);
TRACE("'%s'\n", fn->Name);
for(page = ppd->PageSizes; page; page = page->next) {
TRACE(psdrv, "'%s' aka '%s' (%d) invoked by '%s'\n", page->Name,
TRACE("'%s' aka '%s' (%d) invoked by '%s'\n", page->Name,
page->FullName, page->WinPage, page->InvocationString);
if(page->ImageableArea)
TRACE(psdrv, "Area = %.2f,%.2f - %.2f, %.2f\n",
TRACE("Area = %.2f,%.2f - %.2f, %.2f\n",
page->ImageableArea->llx, page->ImageableArea->lly,
page->ImageableArea->urx, page->ImageableArea->ury);
if(page->PaperDimension)
TRACE(psdrv, "Dimension = %.2f x %.2f\n",
TRACE("Dimension = %.2f x %.2f\n",
page->PaperDimension->x, page->PaperDimension->y);
}
for(con = ppd->Constraints; con; con = con->next)
TRACE(psdrv, "CONSTRAINTS@ %s %s %s %s\n", con->Feature1,
TRACE("CONSTRAINTS@ %s %s %s %s\n", con->Feature1,
con->Value1, con->Feature2, con->Value2);
for(option = ppd->InstalledOptions; option; option = option->next) {
TRACE(psdrv, "OPTION: %s %s %s\n", option->OptionName,
TRACE("OPTION: %s %s %s\n", option->OptionName,
option->FullName, option->DefaultOption);
for(optionEntry = option->Options; optionEntry;
optionEntry = optionEntry->next)
TRACE(psdrv, "\tOPTIONENTRY: %s %s %s\n", optionEntry->Name,
TRACE("\tOPTIONENTRY: %s %s %s\n", optionEntry->Name,
optionEntry->FullName, optionEntry->InvocationString);
}
for(slot = ppd->InputSlots; slot; slot = slot->next)
TRACE(psdrv, "INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n",
TRACE("INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n",
slot->Name, slot->FullName, slot->WinBin,
slot->InvocationString);
}

28
graphics/psdrv/ps.c
View File

@ -9,7 +9,7 @@
#include <string.h>
#include "psdrv.h"
#include "winspool.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -280,7 +280,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len )
titlebuf = (char *)HeapAlloc( PSDRV_Heap, 0, len+1 );
if(!titlebuf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
return 0;
}
memcpy(titlebuf, title, len);
@ -288,7 +288,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len )
buf = (char *)HeapAlloc( PSDRV_Heap, 0, sizeof(psheader) + len + 30);
if(!buf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
HeapFree( PSDRV_Heap, 0, titlebuf );
return 0;
}
@ -311,7 +311,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len )
if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) !=
strlen(buf) ) {
WARN(psdrv, "WriteSpool error\n");
WARN("WriteSpool error\n");
HeapFree( PSDRV_Heap, 0, titlebuf );
HeapFree( PSDRV_Heap, 0, buf );
return 0;
@ -378,7 +378,7 @@ INT PSDRV_WriteFooter( DC *dc )
buf = (char *)HeapAlloc( PSDRV_Heap, 0, sizeof(psfooter) + 100 );
if(!buf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
return 0;
}
@ -386,7 +386,7 @@ INT PSDRV_WriteFooter( DC *dc )
if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) !=
strlen(buf) ) {
WARN(psdrv, "WriteSpool error\n");
WARN("WriteSpool error\n");
HeapFree( PSDRV_Heap, 0, buf );
return 0;
}
@ -402,7 +402,7 @@ INT PSDRV_WriteEndPage( DC *dc )
if( WriteSpool16( physDev->job.hJob, psendpage, sizeof(psendpage)-1 ) !=
sizeof(psendpage)-1 ) {
WARN(psdrv, "WriteSpool error\n");
WARN("WriteSpool error\n");
return 0;
}
return 1;
@ -422,7 +422,7 @@ INT PSDRV_WriteNewPage( DC *dc )
buf = (char *)HeapAlloc( PSDRV_Heap, 0, sizeof(psnewpage) + 200 );
if(!buf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
return 0;
}
@ -447,7 +447,7 @@ INT PSDRV_WriteNewPage( DC *dc )
if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) !=
strlen(buf) ) {
WARN(psdrv, "WriteSpool error\n");
WARN("WriteSpool error\n");
HeapFree( PSDRV_Heap, 0, buf );
return 0;
}
@ -520,7 +520,7 @@ BOOL PSDRV_WriteSetFont(DC *dc, BOOL UseANSI)
sizeof(pssetfont) + strlen(physDev->font.afm->FontName) + 40);
if(!buf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
return FALSE;
}
@ -528,7 +528,7 @@ BOOL PSDRV_WriteSetFont(DC *dc, BOOL UseANSI)
strlen(physDev->font.afm->FontName) + sizeof(encodingext));
if(!newbuf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
HeapFree(PSDRV_Heap, 0, buf);
return FALSE;
}
@ -567,7 +567,7 @@ BOOL PSDRV_WriteSetColor(DC *dc, PSCOLOR *color)
return PSDRV_WriteSpool(dc, buf, strlen(buf));
default:
ERR(psdrv, "Unkonwn colour type %d\n", color->type);
ERR("Unkonwn colour type %d\n", color->type);
break;
}
@ -600,7 +600,7 @@ BOOL PSDRV_WriteReencodeFont(DC *dc)
+ sizeof(encodingext));
if(!buf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
return FALSE;
}
@ -608,7 +608,7 @@ BOOL PSDRV_WriteReencodeFont(DC *dc)
strlen(physDev->font.afm->FontName) + sizeof(encodingext));
if(!newbuf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
HeapFree(PSDRV_Heap, 0, buf);
return FALSE;
}

8
graphics/psdrv/text.c
View File

@ -6,7 +6,7 @@
*/
#include <string.h>
#include "psdrv.h"
#include "debug.h"
#include "debugtools.h"
#include "winspool.h"
DEFAULT_DEBUG_CHANNEL(psdrv)
@ -22,12 +22,12 @@ BOOL PSDRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
char *strbuf;
SIZE sz;
TRACE(psdrv, "(x=%d, y=%d, flags=0x%08x, str='%.*s', count=%d)\n", x, y,
TRACE("(x=%d, y=%d, flags=0x%08x, str='%.*s', count=%d)\n", x, y,
flags, (int)count, str, count);
strbuf = (char *)HeapAlloc( PSDRV_Heap, 0, count + 1);
if(!strbuf) {
WARN(psdrv, "HeapAlloc failed\n");
WARN("HeapAlloc failed\n");
return FALSE;
}
@ -94,7 +94,7 @@ BOOL PSDRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
SIZE size;
INT escapement = physDev->font.escapement;
TRACE(psdrv, "Position = %f Thickness %f Escapement %d\n",
TRACE("Position = %f Thickness %f Escapement %d\n",
pos, thick, escapement);
/* Get the width of the text */

8
graphics/ttydrv/init.c
View File

@ -8,7 +8,7 @@
#include "bitmap.h"
#include "color.h"
#include "dc.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
#include "palette.h"
#include "ttydrv.h"
@ -181,7 +181,7 @@ void TTYDRV_GDI_Finalize(void)
BOOL TTYDRV_DC_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
LPCSTR output, const DEVMODEA *initData)
{
FIXME(ttydrv, "(%p, %s, %s, %s, %p): semistub\n",
FIXME("(%p, %s, %s, %s, %p): semistub\n",
dc, debugstr_a(driver), debugstr_a(device),
debugstr_a(output), initData
);
@ -190,7 +190,7 @@ BOOL TTYDRV_DC_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
sizeof(TTYDRV_PDEVICE) );
if(!dc->physDev) {
ERR(ttydrv, "Can't allocate physDev\n");
ERR("Can't allocate physDev\n");
return FALSE;
}
@ -205,7 +205,7 @@ BOOL TTYDRV_DC_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
*/
BOOL TTYDRV_DC_DeleteDC(DC *dc)
{
FIXME(ttydrv, "(%p): semistub\n", dc);
FIXME("(%p): semistub\n", dc);
HeapFree( GetProcessHeap(), 0, dc->physDev );
dc->physDev = NULL;

10
graphics/vga.c
View File

@ -12,7 +12,7 @@
#include "miscemu.h"
#include "vga.h"
#include "ddraw.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ddraw)
@ -30,11 +30,11 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth)
if (!lpddraw) {
DirectDrawCreate(NULL,&lpddraw,NULL);
if (!lpddraw) {
ERR(ddraw,"DirectDraw is not available\n");
ERR("DirectDraw is not available\n");
return 1;
}
if (IDirectDraw_SetDisplayMode(lpddraw,Xres,Yres,Depth)) {
ERR(ddraw,"DirectDraw does not support requested display mode\n");
ERR("DirectDraw does not support requested display mode\n");
IDirectDraw_Release(lpddraw);
lpddraw=NULL;
return 1;
@ -45,7 +45,7 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth)
sdesc.dwFlags = DDSD_CAPS;
sdesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
if (IDirectDraw_CreateSurface(lpddraw,&sdesc,&lpddsurf,NULL)||(!lpddsurf)) {
ERR(ddraw,"DirectDraw surface is not available\n");
ERR("DirectDraw surface is not available\n");
IDirectDraw_Release(lpddraw);
lpddraw=NULL;
return 1;
@ -109,7 +109,7 @@ LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth)
if (!lpddraw) return NULL;
if (!lpddsurf) return NULL;
if (IDirectDrawSurface_Lock(lpddsurf,NULL,&sdesc,0,0)) {
ERR(ddraw,"could not lock surface!\n");
ERR("could not lock surface!\n");
return NULL;
}
if (Pitch) *Pitch=sdesc.lPitch;

4
graphics/win16drv/brush.c
View File

@ -8,7 +8,7 @@
#include "brush.h"
#include "win16drv.h"
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win16drv)
@ -27,7 +27,7 @@ HBRUSH WIN16DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,
if ( physDev->BrushInfo )
{
TRACE(win16drv, "UnRealizing BrushInfo\n");
TRACE("UnRealizing BrushInfo\n");
nSize = PRTDRV_RealizeObject (physDev->segptrPDEVICE, -DRVOBJ_BRUSH,
physDev->BrushInfo,
physDev->BrushInfo, 0);

22
graphics/win16drv/font.c
View File

@ -11,7 +11,7 @@
#include "module.h"
#include "font.h"
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win16drv)
@ -25,7 +25,7 @@ BOOL WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
DWORD dwRet;
TRACE(win16drv, "%04x %s %d %p\n",
TRACE("%04x %s %d %p\n",
dc->hSelf, str, count, size);
dwRet = PRTDRV_ExtTextOut(physDev->segptrPDEVICE, 0, 0,
@ -35,7 +35,7 @@ BOOL WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
win16drv_SegPtr_TextXForm, NULL, NULL, 0);
size->cx = XDSTOLS(dc,LOWORD(dwRet));
size->cy = YDSTOLS(dc,HIWORD(dwRet));
TRACE(win16drv, "cx=0x%x, cy=0x%x\n",
TRACE("cx=0x%x, cy=0x%x\n",
size->cx, size->cy );
return TRUE;
}
@ -48,11 +48,11 @@ BOOL WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRICA *metrics )
{
WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
TRACE(win16drv, "%04x \n", dc->hSelf);
TRACE("%04x \n", dc->hSelf);
FONT_TextMetric16to32A( &physDev->tm, metrics );
TRACE(win16drv,
TRACE(
"H %ld, A %ld, D %ld, Int %ld, Ext %ld, AW %ld, MW %ld, W %ld\n",
metrics->tmHeight,
metrics->tmAscent,
@ -74,13 +74,13 @@ HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font)
dc->w.hFont = hfont;
TRACE(win16drv, "WIN16DRV_FONT_SelectObject '%s' h=%d\n",
TRACE("WIN16DRV_FONT_SelectObject '%s' h=%d\n",
font->logfont.lfFaceName, font->logfont.lfHeight);
if( physDev->FontInfo )
{
TRACE(win16drv, "UnRealizing FontInfo\n");
TRACE("UnRealizing FontInfo\n");
nSize = PRTDRV_RealizeObject (physDev->segptrPDEVICE, -DRVOBJ_FONT,
physDev->FontInfo,
physDev->FontInfo, 0);
@ -130,7 +130,7 @@ HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font)
physDev->tm.tmCharSet = fi->dfCharSet;
#undef fi
TRACE(win16drv, "H %d, A %d, D %d, Int %d, Ext %d, AW %d, MW %d, W %d\n",
TRACE("H %d, A %d, D %d, Int %d, Ext %d, AW %d, MW %d, W %d\n",
physDev->tm.tmHeight,
physDev->tm.tmAscent,
physDev->tm.tmDescent,
@ -154,7 +154,7 @@ BOOL WIN16DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
TRACE(win16drv, "%d - %d into %p\n",
TRACE("%d - %d into %p\n",
firstChar, lastChar, buffer );
wRet = PRTDRV_GetCharWidth( physDev->segptrPDEVICE, buffer, firstChar,
@ -163,7 +163,7 @@ BOOL WIN16DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
win16drv_SegPtr_TextXForm );
if( TRACE_ON(win16drv) ){
for(i = 0; i <= lastChar - firstChar; i++)
TRACE(win16drv, "Char %x: width %d\n", i + firstChar,
TRACE("Char %x: width %d\n", i + firstChar,
buffer[i]);
}
@ -208,7 +208,7 @@ WORD WINAPI WineEnumDFontCallback(LPENUMLOGFONT16 lpLogFont,
LPNEWTEXTMETRIC16 lpTextMetrics,
WORD wFontType, LONG lpClientData)
{
TRACE(win16drv, "In WineEnumDFontCallback plf=%p\n", lpLogFont);
TRACE("In WineEnumDFontCallback plf=%p\n", lpLogFont);
return (*(((WEPFC *)lpClientData)->proc))( lpLogFont, lpTextMetrics,
wFontType, ((WEPFC *)lpClientData)->lp );
}

10
graphics/win16drv/graphics.c
View File

@ -7,7 +7,7 @@
#include <stdio.h>
#include "heap.h"
#include "win16drv.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win16drv)
@ -62,9 +62,9 @@ WIN16DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
BOOL bRet = 0;
POINT16 points[2];
TRACE(win16drv, "In WIN16DRV_Rectangle, x %d y %d DCOrgX %d y %d\n",
TRACE("In WIN16DRV_Rectangle, x %d y %d DCOrgX %d y %d\n",
left, top, dc->w.DCOrgX, dc->w.DCOrgY);
TRACE(win16drv, "In WIN16DRV_Rectangle, VPortOrgX %d y %d\n",
TRACE("In WIN16DRV_Rectangle, VPortOrgX %d y %d\n",
dc->vportOrgX, dc->vportOrgY);
points[0].x = XLPTODP(dc, left);
points[0].y = YLPTODP(dc, top);
@ -154,9 +154,9 @@ WIN16DRV_Ellipse(DC *dc, INT left, INT top, INT right, INT bottom)
WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
BOOL bRet = 0;
POINT16 points[2];
TRACE(win16drv, "In WIN16DRV_Ellipse, x %d y %d DCOrgX %d y %d\n",
TRACE("In WIN16DRV_Ellipse, x %d y %d DCOrgX %d y %d\n",
left, top, dc->w.DCOrgX, dc->w.DCOrgY);
TRACE(win16drv, "In WIN16DRV_Ellipse, VPortOrgX %d y %d\n",
TRACE("In WIN16DRV_Ellipse, VPortOrgX %d y %d\n",
dc->vportOrgX, dc->vportOrgY);
points[0].x = XLPTODP(dc, left);
points[0].y = YLPTODP(dc, top);

22
graphics/win16drv/init.c
View File

@ -14,7 +14,7 @@
#include "font.h"
#include "options.h"
#include "xmalloc.h"
#include "debug.h"
#include "debugtools.h"
#include "dc.h"
DEFAULT_DEBUG_CHANNEL(win16drv)
@ -184,12 +184,12 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
printerEnabled, sizeof(printerEnabled) );
if (lstrcmpiA(printerEnabled,"on"))
{
MSG("Printing disabled in wine.conf or .winerc file\n");
MSG("Use \"printer=on\" in the \"[wine]\" section to enable it.\n");
MESSAGE("Printing disabled in wine.conf or .winerc file\n");
MESSAGE("Use \"printer=on\" in the \"[wine]\" section to enable it.\n");
return FALSE;
}
TRACE(win16drv, "In creatdc for (%s,%s,%s) initData 0x%p\n",
TRACE("In creatdc for (%s,%s,%s) initData 0x%p\n",
driver, device, output, initData);
physDev = (WIN16DRV_PDEVICE *)HeapAlloc( SystemHeap, 0, sizeof(*physDev) );
@ -199,11 +199,11 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
pLPD = LoadPrinterDriver(driver);
if (pLPD == NULL)
{
WARN(win16drv, "Failed to find printer driver\n");
WARN("Failed to find printer driver\n");
HeapFree( SystemHeap, 0, physDev );
return FALSE;
}
TRACE(win16drv, "windevCreateDC pLPD 0x%p\n", pLPD);
TRACE("windevCreateDC pLPD 0x%p\n", pLPD);
/* Now Get the device capabilities from the printer driver */
@ -218,7 +218,7 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
dc->w.hVisRgn = CreateRectRgn(0, 0, dc->w.devCaps->horzRes, dc->w.devCaps->vertRes);
dc->w.bitsPerPixel = dc->w.devCaps->bitsPixel;
TRACE(win16drv, "Got devcaps width %d height %d bits %d planes %d\n",
TRACE("Got devcaps width %d height %d bits %d planes %d\n",
dc->w.devCaps->horzRes, dc->w.devCaps->vertRes,
dc->w.devCaps->bitsPixel, dc->w.devCaps->planes);
@ -237,7 +237,7 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
pPDH = (PDEVICE_HEADER *)((BYTE*)PTR_SEG_TO_LIN(physDev->segptrPDEVICE) - sizeof(PDEVICE_HEADER));
pPDH->pLPD = pLPD;
TRACE(win16drv, "PDEVICE allocated %08lx\n",(DWORD)(physDev->segptrPDEVICE));
TRACE("PDEVICE allocated %08lx\n",(DWORD)(physDev->segptrPDEVICE));
/* Now get the printer driver to initialise this data */
wRet = PRTDRV_Enable((LPVOID)physDev->segptrPDEVICE, INITPDEVICE, device, driver, output, NULL);
@ -287,11 +287,11 @@ static INT WIN16DRV_Escape( DC *dc, INT nEscape, INT cbInput,
switch(nEscape)
{
case ENABLEPAIRKERNING:
FIXME(win16drv,"Escape: ENABLEPAIRKERNING ignored.\n");
FIXME("Escape: ENABLEPAIRKERNING ignored.\n");
nRet = 1;
break;
case GETPAIRKERNTABLE:
FIXME(win16drv,"Escape: GETPAIRKERNTABLE ignored.\n");
FIXME("Escape: GETPAIRKERNTABLE ignored.\n");
nRet = 0;
break;
case SETABORTPROC: {
@ -357,7 +357,7 @@ static INT WIN16DRV_Escape( DC *dc, INT nEscape, INT cbInput,
}
}
else
WARN(win16drv, "Escape(nEscape = %04x) - ???\n", nEscape);
WARN("Escape(nEscape = %04x) - ???\n", nEscape);
return nRet;
}

6
graphics/win16drv/objects.c
View File

@ -10,7 +10,7 @@
#include "brush.h"
#include "font.h"
#include "pen.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(gdi)
@ -33,7 +33,7 @@ HGDIOBJ WIN16DRV_SelectObject( DC *dc, HGDIOBJ handle )
HGDIOBJ ret = 0;
if (!ptr) return 0;
TRACE(gdi, "hdc=%04x %04x\n", dc->hSelf, handle );
TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
switch(ptr->wMagic)
{
@ -44,7 +44,7 @@ HGDIOBJ WIN16DRV_SelectObject( DC *dc, HGDIOBJ handle )
ret = WIN16DRV_BRUSH_SelectObject( dc, handle, (BRUSHOBJ *)ptr );
break;
case BITMAP_MAGIC:
FIXME(gdi, "WIN16DRV_SelectObject for BITMAP not implemented\n");
FIXME("WIN16DRV_SelectObject for BITMAP not implemented\n");
ret = 1;
break;
case FONT_MAGIC:

6
graphics/win16drv/pen.c
View File

@ -7,7 +7,7 @@
#include "pen.h"
#include "win16drv.h"
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win16drv)
@ -21,7 +21,7 @@ HPEN WIN16DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
int nSize;
LOGPEN16 lPen16;
dc->w.hPen = hpen;
TRACE(win16drv, "In WIN16DRV_PEN_SelectObject\n");
TRACE("In WIN16DRV_PEN_SelectObject\n");
lPen16.lopnStyle = pen->logpen.lopnStyle;
lPen16.lopnWidth.x = pen->logpen.lopnWidth.x;
lPen16.lopnWidth.y = pen->logpen.lopnWidth.y;
@ -29,7 +29,7 @@ HPEN WIN16DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
if ( physDev->PenInfo )
{
TRACE(win16drv, "UnRealizing PenInfo\n");
TRACE("UnRealizing PenInfo\n");
nSize = PRTDRV_RealizeObject (physDev->segptrPDEVICE, -DRVOBJ_PEN,
physDev->PenInfo,
physDev->PenInfo, 0);

110
graphics/win16drv/prtdrv.c
View File

@ -15,7 +15,7 @@
#include "heap.h"
#include "brush.h"
#include "callback.h"
#include "debug.h"
#include "debugtools.h"
#include "bitmap.h"
#include "pen.h"
@ -57,7 +57,7 @@ static void GetPrinterDriverFunctions(HINSTANCE16 hInst, LOADED_PRINTER_DRIVER *
LoadPrinterDrvFunc(ADVANCEDSETUPDIALOG);
LoadPrinterDrvFunc(DIALOGFN);
LoadPrinterDrvFunc(PSEUDOEDIT);
TRACE(win16drv,"got func CONTROL 0x%p enable 0x%p enumDfonts 0x%p realizeobject 0x%p extextout 0x%p\n",
TRACE("got func CONTROL 0x%p enable 0x%p enumDfonts 0x%p realizeobject 0x%p extextout 0x%p\n",
pLPD->fn[FUNC_CONTROL],
pLPD->fn[FUNC_ENABLE],
pLPD->fn[FUNC_ENUMDFONTS],
@ -80,7 +80,7 @@ static LOADED_PRINTER_DRIVER *FindPrinterDriverFromName(const char *pszDriver)
ptmpLPD = gapLoadedPrinterDrivers[nDriverSlot++];
if (ptmpLPD != NULL)
{
TRACE(win16drv, "Comparing %s,%s\n",ptmpLPD->szDriver,pszDriver);
TRACE("Comparing %s,%s\n",ptmpLPD->szDriver,pszDriver);
/* Found driver store info, exit loop */
if (lstrcmpiA(ptmpLPD->szDriver, pszDriver) == 0)
pLPD = ptmpLPD;
@ -135,7 +135,7 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver)
}
if (!bSlotFound)
{
WARN(win16drv,"Too many printers drivers loaded\n");
WARN("Too many printers drivers loaded\n");
return NULL;
}
@ -150,9 +150,9 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver)
if (hInst <= 32)
{
/* Failed to load driver */
WARN(win16drv, "Failed to load printer driver %s\n", pszDriver);
WARN("Failed to load printer driver %s\n", pszDriver);
} else {
TRACE(win16drv, "Loaded the library\n");
TRACE("Loaded the library\n");
/* Allocate some memory for printer driver info */
pLPD = malloc(sizeof(LOADED_PRINTER_DRIVER));
memset(pLPD, 0 , sizeof(LOADED_PRINTER_DRIVER));
@ -163,7 +163,7 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver)
/* Get DS for the printer module */
pLPD->ds_reg = hInst;
TRACE(win16drv, "DS for %s is %x\n", pszDriver, pLPD->ds_reg);
TRACE("DS for %s is %x\n", pszDriver, pLPD->ds_reg);
/* Get address of printer driver functions */
GetPrinterDriverFunctions(hInst, pLPD);
@ -190,20 +190,20 @@ INT16 PRTDRV_Control(LPPDEVICE lpDestDev, WORD wfunction, SEGPTR lpInData, SEGPT
WORD wRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "%08x 0x%x %08lx %08lx\n", (unsigned int)lpDestDev, wfunction, lpInData, lpOutData);
TRACE("%08x 0x%x %08lx %08lx\n", (unsigned int)lpDestDev, wfunction, lpInData, lpOutData);
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
{
if (pLPD->fn[FUNC_CONTROL] == NULL)
{
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
wRet = Callbacks->CallDrvControlProc( pLPD->fn[FUNC_CONTROL],
(SEGPTR)lpDestDev, wfunction,
lpInData, lpOutData );
}
TRACE(win16drv, "return %x\n", wRet);
TRACE("return %x\n", wRet);
return wRet;
}
@ -216,7 +216,7 @@ WORD PRTDRV_Enable(LPVOID lpDevInfo, WORD wStyle, LPCSTR lpDestDevType,
WORD wRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "%s %s\n",lpDestDevType, lpOutputFile);
TRACE("%s %s\n",lpDestDevType, lpOutputFile);
/* Get the printer driver info */
if (wStyle == INITPDEVICE)
@ -230,7 +230,7 @@ WORD PRTDRV_Enable(LPVOID lpDevInfo, WORD wStyle, LPCSTR lpDestDevType,
WORD wP2;
if (!pLPD->fn[FUNC_ENABLE]) {
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
@ -261,7 +261,7 @@ WORD PRTDRV_Enable(LPVOID lpDevInfo, WORD wStyle, LPCSTR lpDestDevType,
SEGPTR_FREE(lP1);
}
}
TRACE(win16drv, "return %x\n", wRet);
TRACE("return %x\n", wRet);
return wRet;
}
@ -275,7 +275,7 @@ WORD PRTDRV_EnumDFonts(LPPDEVICE lpDestDev, LPSTR lpFaceName,
WORD wRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "%08lx %s %p %p\n",
TRACE("%08lx %s %p %p\n",
lpDestDev, lpFaceName, lpCallbackFunc, lpClientData);
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
@ -284,7 +284,7 @@ WORD PRTDRV_EnumDFonts(LPPDEVICE lpDestDev, LPSTR lpFaceName,
LPBYTE lP2;
if (pLPD->fn[FUNC_ENUMDFONTS] == NULL) {
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
@ -299,9 +299,9 @@ WORD PRTDRV_EnumDFonts(LPPDEVICE lpDestDev, LPSTR lpFaceName,
if(lpFaceName)
SEGPTR_FREE(lP2);
} else
WARN(win16drv,"Failed to find device\n");
WARN("Failed to find device\n");
TRACE(win16drv, "return %x\n", wRet);
TRACE("return %x\n", wRet);
return wRet;
}
/*
@ -313,7 +313,7 @@ BOOL16 PRTDRV_EnumObj(LPPDEVICE lpDestDev, WORD iStyle,
WORD wRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "(some params - fixme)\n");
TRACE("(some params - fixme)\n");
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
{
@ -323,7 +323,7 @@ BOOL16 PRTDRV_EnumObj(LPPDEVICE lpDestDev, WORD iStyle,
if (pLPD->fn[FUNC_ENUMOBJ] == NULL)
{
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
@ -342,9 +342,9 @@ BOOL16 PRTDRV_EnumObj(LPPDEVICE lpDestDev, WORD iStyle,
lP1, wP2, lP3, lP4 );
}
else
WARN(win16drv,"Failed to find device\n");
WARN("Failed to find device\n");
TRACE(win16drv, "return %x\n", wRet);
TRACE("return %x\n", wRet);
return wRet;
}
@ -363,7 +363,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev,
WORD wRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "PRTDRV_OUTPUT %d\n", wStyle );
TRACE("PRTDRV_OUTPUT %d\n", wStyle );
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
{
@ -374,7 +374,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev,
int nSize;
if (pLPD->fn[FUNC_OUTPUT] == NULL)
{
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
@ -397,7 +397,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev,
clip = HeapAlloc( SystemHeap, 0, size );
if(!clip)
{
WARN(win16drv, "Can't alloc clip array in PRTDRV_Output\n");
WARN("Can't alloc clip array in PRTDRV_Output\n");
return FALSE;
}
GetRegionData( hClipRgn, size, clip );
@ -417,7 +417,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev,
{
CONV_RECT32TO16( pRect, lP8 );
TRACE(win16drv, "rect = %d,%d - %d,%d\n",
TRACE("rect = %d,%d - %d,%d\n",
lP8->left, lP8->top, lP8->right, lP8->bottom );
wRet = Callbacks->CallDrvOutputProc(pLPD->fn[FUNC_OUTPUT],
lP1, wP2, wP3, SEGPTR_GET(lP4),
@ -435,7 +435,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev,
}
SEGPTR_FREE(lP4);
}
TRACE(win16drv, "PRTDRV_Output return %d\n", wRet);
TRACE("PRTDRV_Output return %d\n", wRet);
return wRet;
}
@ -449,7 +449,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle,
WORD dwRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "%08lx %04x %p %p %08lx\n",
TRACE("%08lx %04x %p %p %08lx\n",
lpDestDev, wStyle, lpInObj, lpOutObj, lpTextXForm);
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
@ -461,7 +461,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle,
if (pLPD->fn[FUNC_REALIZEOBJECT] == NULL)
{
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
@ -488,7 +488,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle,
case DRVOBJ_PBITMAP:
default:
WARN(win16drv, "Object type %d not supported\n", wStyle);
WARN("Object type %d not supported\n", wStyle);
nSize = 0;
}
@ -505,7 +505,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle,
lP4 = SEGPTR_GET( lpOutObj );
lP5 = lpTextXForm;
TRACE(win16drv, "Calling Realize %08lx %04x %08lx %08lx %08lx\n",
TRACE("Calling Realize %08lx %04x %08lx %08lx %08lx\n",
lP1, wP2, lP3, lP4, lP5);
dwRet = Callbacks->CallDrvRealizeProc(pLPD->fn[FUNC_REALIZEOBJECT],
lP1, wP2, lP3, lP4, lP5);
@ -513,7 +513,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle,
SEGPTR_FREE(lpBuf);
}
TRACE(win16drv, "return %x\n", dwRet);
TRACE("return %x\n", dwRet);
return dwRet;
}
@ -534,7 +534,7 @@ DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev,
WORD wRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "(lots of params - fixme)\n");
TRACE("(lots of params - fixme)\n");
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
{
@ -544,7 +544,7 @@ DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev,
if (pLPD->fn[FUNC_STRETCHBLT] == NULL)
{
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
lP1 = lpDestDev;
@ -574,7 +574,7 @@ DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev,
lP11, lP12, lP13,
SEGPTR_GET(lP14));
SEGPTR_FREE(lP14);
TRACE(win16drv, "Called StretchBlt ret %d\n",wRet);
TRACE("Called StretchBlt ret %d\n",wRet);
}
return wRet;
}
@ -588,7 +588,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
DWORD dwRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "(lots of params - fixme)\n");
TRACE("(lots of params - fixme)\n");
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
{
@ -601,7 +601,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
if (pLPD->fn[FUNC_EXTTEXTOUT] == NULL)
{
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}
@ -611,7 +611,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
if (lpClipRect != NULL) {
lP4 = SEGPTR_NEW(RECT16);
TRACE(win16drv, "Adding lpClipRect\n");
TRACE("Adding lpClipRect\n");
memcpy(lP4,lpClipRect,sizeof(RECT16));
} else
lP4 = 0L;
@ -621,7 +621,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
if (nSize>abs(wCount))
nSize = abs(wCount);
lP5 = SEGPTR_ALLOC(nSize+1);
TRACE(win16drv, "Adding lpString (nSize is %d)\n",nSize);
TRACE("Adding lpString (nSize is %d)\n",nSize);
memcpy(lP5,lpString,nSize);
*((char *)lP5 + nSize) = '\0';
} else
@ -635,22 +635,22 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
lP9 = lpTextXForm;
if (lpCharWidths != NULL)
FIXME(win16drv, "Char widths not supported\n");
FIXME("Char widths not supported\n");
lP10 = 0;
if (lpOpaqueRect != NULL) {
lP11 = SEGPTR_NEW(RECT16);
TRACE(win16drv, "Adding lpOpaqueRect\n");
TRACE("Adding lpOpaqueRect\n");
memcpy(lP11,lpOpaqueRect,sizeof(RECT16));
} else
lP11 = 0L;
wP12 = wOptions;
TRACE(win16drv, "Calling ExtTextOut 0x%lx 0x%x 0x%x %p\n",
TRACE("Calling ExtTextOut 0x%lx 0x%x 0x%x %p\n",
lP1, wP2, wP3, lP4);
TRACE(win16drv, "%*s 0x%x 0x%lx 0x%lx\n",
TRACE("%*s 0x%x 0x%lx 0x%lx\n",
nSize,lP5, iP6, lP7, lP8);
TRACE(win16drv, "0x%lx 0x%lx %p 0x%x\n",
TRACE("0x%lx 0x%lx %p 0x%x\n",
lP9, lP10, lP11, wP12);
dwRet = Callbacks->CallDrvExtTextOutProc(pLPD->fn[FUNC_EXTTEXTOUT],
lP1, wP2, wP3,
@ -659,7 +659,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
lP8, lP9, lP10,
SEGPTR_GET(lP11), wP12);
}
TRACE(win16drv, "return %lx\n", dwRet);
TRACE("return %lx\n", dwRet);
return dwRet;
}
@ -671,27 +671,27 @@ int WINAPI dmEnumDFonts16(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCal
int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPSTR lpOutObj, SEGPTR lpTextXForm)
{
FIXME(win16drv, "(lpDestDev=%08x,wStyle=%04x,lpInObj=%08x,lpOutObj=%08x,lpTextXForm=%08x): stub\n",
FIXME("(lpDestDev=%08x,wStyle=%04x,lpInObj=%08x,lpOutObj=%08x,lpTextXForm=%08x): stub\n",
(UINT)lpDestDev, wStyle, (UINT)lpInObj, (UINT)lpOutObj, (UINT)lpTextXForm);
if (wStyle < 0) { /* Free extra memory of given object's structure */
switch ( -wStyle ) {
case DRVOBJ_PEN: {
/* LPLOGPEN16 DeletePen = (LPLOGPEN16)lpInObj; */
TRACE(win16drv, "DRVOBJ_PEN_delete\n");
TRACE("DRVOBJ_PEN_delete\n");
break;
}
case DRVOBJ_BRUSH: {
TRACE(win16drv, "DRVOBJ_BRUSH_delete\n");
TRACE("DRVOBJ_BRUSH_delete\n");
break;
}
case DRVOBJ_FONT: {
/* LPTEXTXFORM16 TextXForm
= (LPTEXTXFORM16)lpTextXForm; */
TRACE(win16drv, "DRVOBJ_FONT_delete\n");
TRACE("DRVOBJ_FONT_delete\n");
break;
}
case DRVOBJ_PBITMAP: TRACE(win16drv, "DRVOBJ_PBITMAP_delete\n");
case DRVOBJ_PBITMAP: TRACE("DRVOBJ_PBITMAP_delete\n");
break;
}
}
@ -701,7 +701,7 @@ int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, L
case DRVOBJ_PEN: {
LPLOGPEN16 InPen = (LPLOGPEN16)lpInObj;
TRACE(win16drv, "DRVOBJ_PEN\n");
TRACE("DRVOBJ_PEN\n");
if (lpOutObj) {
if (InPen->lopnStyle == PS_NULL) {
*(DWORD *)lpOutObj = 0;
@ -724,7 +724,7 @@ int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, L
LPLOGBRUSH16 OutBrush = (LPLOGBRUSH16)lpOutObj;
/* LPPOINT16 Point = (LPPOINT16)lpTextXForm; */
TRACE(win16drv, "DRVOBJ_BRUSH\n");
TRACE("DRVOBJ_BRUSH\n");
if (!lpOutObj) return sizeof(LOGBRUSH16);
else {
OutBrush->lbStyle = InBrush->lbStyle;
@ -738,10 +738,10 @@ int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, L
case DRVOBJ_FONT: {
/* LPTEXTXFORM16 TextXForm
= (LPTEXTXFORM16)lpTextXForm; */
TRACE(win16drv, "DRVOBJ_FONT\n");
TRACE("DRVOBJ_FONT\n");
return 0;/* DISPLAY.DRV doesn't realize fonts */
}
case DRVOBJ_PBITMAP: TRACE(win16drv, "DRVOBJ_PBITMAP\n");
case DRVOBJ_PBITMAP: TRACE("DRVOBJ_PBITMAP\n");
return 0; /* create memory bitmap */
}
}
@ -757,7 +757,7 @@ WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT lpBuffer,
WORD wRet = 0;
LOADED_PRINTER_DRIVER *pLPD = NULL;
TRACE(win16drv, "(lots of params - fixme)\n");
TRACE("(lots of params - fixme)\n");
if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL)
{
@ -767,7 +767,7 @@ WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT lpBuffer,
if (pLPD->fn[FUNC_GETCHARWIDTH] == NULL)
{
WARN(win16drv, "Not supported by driver\n");
WARN("Not supported by driver\n");
return 0;
}

6
graphics/win16drv/text.c
View File

@ -9,7 +9,7 @@
#include "win16drv.h"
#include "dc.h"
#include "gdi.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win16drv)
@ -32,7 +32,7 @@ BOOL WIN16DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
if (count == 0)
return FALSE;
TRACE(win16drv, "%04x %d %d %x %p %*s %p\n",
TRACE("%04x %d %d %x %p %*s %p\n",
dc->hSelf, x, y, flags, lprect, count > 0 ? count : 8, str, lpDx);
@ -55,7 +55,7 @@ BOOL WIN16DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
}
TRACE(win16drv, "textalign = %d\n", dc->w.textAlign);
TRACE("textalign = %d\n", dc->w.textAlign);
if (dc->w.textAlign & TA_UPDATECP)
{

26
graphics/wing.c
View File

@ -12,7 +12,7 @@
#include "wine/winuser16.h"
#include "bitmap.h"
#include "debug.h"
#include "debugtools.h"
#include "ldt.h"
#include "monitor.h"
#include "palette.h"
@ -45,7 +45,7 @@ typedef enum WING_DITHER_TYPE
*/
HDC16 WINAPI WinGCreateDC16(void)
{
TRACE(wing, "(void)\n");
TRACE("(void)\n");
return CreateCompatibleDC16(0);
}
@ -54,7 +54,7 @@ HDC16 WINAPI WinGCreateDC16(void)
*/
BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi)
{
TRACE(wing, "(%p)\n", bmpi);
TRACE("(%p)\n", bmpi);
if (!bmpi)
return FALSE;
@ -79,8 +79,8 @@ BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi)
HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi,
SEGPTR *bits)
{
TRACE(wing, "(%d,%p,%p)\n", hdc, bmpi, bits);
TRACE(wing, ": create %ldx%ldx%d bitmap\n", bmpi->bmiHeader.biWidth,
TRACE("(%d,%p,%p)\n", hdc, bmpi, bits);
TRACE(": create %ldx%ldx%d bitmap\n", bmpi->bmiHeader.biWidth,
bmpi->bmiHeader.biHeight, bmpi->bmiHeader.biPlanes);
return CreateDIBSection16(hdc, bmpi, 0, bits, 0, 0);
}
@ -92,11 +92,11 @@ SEGPTR WINAPI WinGGetDIBPointer16(HBITMAP16 hWinGBitmap, BITMAPINFO* bmpi)
{
BITMAPOBJ* bmp = (BITMAPOBJ *) GDI_GetObjPtr( hWinGBitmap, BITMAP_MAGIC );
TRACE(wing, "(%d,%p)\n", hWinGBitmap, bmpi);
TRACE("(%d,%p)\n", hWinGBitmap, bmpi);
if (!bmp) return (SEGPTR)NULL;
if (bmpi)
FIXME(wing, ": Todo - implement setting BITMAPINFO\n");
FIXME(": Todo - implement setting BITMAPINFO\n");
#ifndef X_DISPLAY_MISSING
return PTR_SEG_OFF_TO_SEGPTR(((X11DRV_DIBSECTION *) bmp->dib)->selector, 0);
@ -111,7 +111,7 @@ SEGPTR WINAPI WinGGetDIBPointer16(HBITMAP16 hWinGBitmap, BITMAPINFO* bmpi)
UINT16 WINAPI WinGSetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
RGBQUAD *colors)
{
TRACE(wing, "(%d,%d,%d,%p)\n", hdc, start, num, colors);
TRACE("(%d,%d,%d,%p)\n", hdc, start, num, colors);
return SetDIBColorTable16(hdc, start, num, colors);
}
@ -121,7 +121,7 @@ UINT16 WINAPI WinGSetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
UINT16 WINAPI WinGGetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
RGBQUAD *colors)
{
TRACE(wing, "(%d,%d,%d,%p)\n", hdc, start, num, colors);
TRACE("(%d,%d,%d,%p)\n", hdc, start, num, colors);
return GetDIBColorTable16(hdc, start, num, colors);
}
@ -130,7 +130,7 @@ UINT16 WINAPI WinGGetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
*/
HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
{
TRACE(wing, "(void)\n");
TRACE("(void)\n");
return CreateHalftonePalette16(GetDC16(0));
}
@ -140,7 +140,7 @@ HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
HBRUSH16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col,
WING_DITHER_TYPE type)
{
TRACE(wing, "(%d,%ld,%d)\n", winDC, col, type);
TRACE("(%d,%ld,%d)\n", winDC, col, type);
return CreateSolidBrush16(col);
}
@ -152,7 +152,7 @@ BOOL16 WINAPI WinGStretchBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
HDC16 srcDC, INT16 xSrc, INT16 ySrc,
INT16 widSrc, INT16 heiSrc)
{
TRACE(wing, "(%d,%d,...)\n", destDC, srcDC);
TRACE("(%d,%d,...)\n", destDC, srcDC);
return StretchBlt16(destDC, xDest, yDest, widDest, heiDest, srcDC,
xSrc, ySrc, widSrc, heiSrc, SRCCOPY);
}
@ -164,7 +164,7 @@ BOOL16 WINAPI WinGBitBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
INT16 widDest, INT16 heiDest, HDC16 srcDC,
INT16 xSrc, INT16 ySrc)
{
TRACE(wing, "(%d,%d,...)\n", destDC, srcDC);
TRACE("(%d,%d,...)\n", destDC, srcDC);
return BitBlt16(destDC, xDest, yDest, widDest, heiDest, srcDC,
xSrc, ySrc, SRCCOPY);
}

14
graphics/x11drv/bitblt.c
View File

@ -21,7 +21,7 @@
#include "metafile.h"
#include "options.h"
#include "x11drv.h"
#include "debug.h"
#include "debugtools.h"
#include "xmalloc.h" /* for XCREATEIMAGE macro */
DEFAULT_DEBUG_CHANNEL(bitblt)
@ -1143,12 +1143,12 @@ static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
widthDst = widthDst * dcDst->vportExtX / dcDst->wndExtX;
heightDst = heightDst * dcDst->vportExtY / dcDst->wndExtY;
TRACE(bitblt, " vportdst=%d,%d-%d,%d wnddst=%d,%d-%d,%d\n",
TRACE(" vportdst=%d,%d-%d,%d wnddst=%d,%d-%d,%d\n",
dcDst->vportOrgX, dcDst->vportOrgY,
dcDst->vportExtX, dcDst->vportExtY,
dcDst->wndOrgX, dcDst->wndOrgY,
dcDst->wndExtX, dcDst->wndExtY );
TRACE(bitblt, " rectdst=%d,%d-%d,%d orgdst=%d,%d\n",
TRACE(" rectdst=%d,%d-%d,%d orgdst=%d,%d\n",
xDst, yDst, widthDst, heightDst,
dcDst->w.DCOrgX, dcDst->w.DCOrgY );
@ -1159,19 +1159,19 @@ static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
widthSrc = widthSrc * dcSrc->vportExtX / dcSrc->wndExtX;
heightSrc = heightSrc * dcSrc->vportExtY / dcSrc->wndExtY;
fStretch = (widthSrc != widthDst) || (heightSrc != heightDst);
TRACE(bitblt," vportsrc=%d,%d-%d,%d wndsrc=%d,%d-%d,%d\n",
TRACE(" vportsrc=%d,%d-%d,%d wndsrc=%d,%d-%d,%d\n",
dcSrc->vportOrgX, dcSrc->vportOrgY,
dcSrc->vportExtX, dcSrc->vportExtY,
dcSrc->wndOrgX, dcSrc->wndOrgY,
dcSrc->wndExtX, dcSrc->wndExtY );
TRACE(bitblt, " rectsrc=%d,%d-%d,%d orgsrc=%d,%d\n",
TRACE(" rectsrc=%d,%d-%d,%d orgsrc=%d,%d\n",
xSrc, ySrc, widthSrc, heightSrc,
dcSrc->w.DCOrgX, dcSrc->w.DCOrgY );
if (!BITBLT_GetVisRectangles( dcDst, xDst, yDst, widthDst, heightDst,
dcSrc, xSrc, ySrc, widthSrc, heightSrc,
&visRectSrc, &visRectDst ))
return TRUE;
TRACE(bitblt, " vissrc=%d,%d-%d,%d visdst=%d,%d-%d,%d\n",
TRACE(" vissrc=%d,%d-%d,%d visdst=%d,%d-%d,%d\n",
visRectSrc.left, visRectSrc.top,
visRectSrc.right, visRectSrc.bottom,
visRectDst.left, visRectDst.top,
@ -1183,7 +1183,7 @@ static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
if (!BITBLT_GetVisRectangles( dcDst, xDst, yDst, widthDst, heightDst,
NULL, 0, 0, 0, 0, NULL, &visRectDst ))
return TRUE;
TRACE(bitblt, " vissrc=none visdst=%d,%d-%d,%d\n",
TRACE(" vissrc=none visdst=%d,%d-%d,%d\n",
visRectDst.left, visRectDst.top,
visRectDst.right, visRectDst.bottom );
}

28
graphics/x11drv/bitmap.c
View File

@ -19,7 +19,7 @@
#include "bitmap.h"
#include "heap.h"
#include "monitor.h"
#include "debug.h"
#include "debugtools.h"
#include "xmalloc.h"
#include "local.h"
#include "x11drv.h"
@ -84,7 +84,7 @@ HBITMAP X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP hbitmap,
return 0;
if(bmp->DDBitmap->funcs != dc->funcs) {
WARN(x11drv, "Trying to select non-X11 DDB into an X11 dc\n");
WARN("Trying to select non-X11 DDB into an X11 dc\n");
return 0;
}
@ -158,12 +158,12 @@ X11DRV_PHYSBITMAP *X11DRV_AllocBitmap( BITMAPOBJ *bmp )
X11DRV_PHYSBITMAP *pbitmap;
if(!(bmp->DDBitmap = HeapAlloc(GetProcessHeap(), 0, sizeof(DDBITMAP)))) {
WARN(x11drv, "Can't alloc DDBITMAP\n");
WARN("Can't alloc DDBITMAP\n");
return NULL;
}
if(!(pbitmap = HeapAlloc(GetProcessHeap(), 0,sizeof(X11DRV_PHYSBITMAP)))) {
WARN(x11drv, "Can't alloc X11DRV_PHYSBITMAP\n");
WARN("Can't alloc X11DRV_PHYSBITMAP\n");
HeapFree(GetProcessHeap(), 0, bmp->DDBitmap);
return NULL;
}
@ -190,7 +190,7 @@ BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
if(!bmp) {
WARN(x11drv, "Bad bitmap handle %08x\n", hbitmap);
WARN("Bad bitmap handle %08x\n", hbitmap);
return FALSE;
}
@ -198,13 +198,13 @@ BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
if (bmp->bitmap.bmPlanes != 1) return 0;
if ((bmp->bitmap.bmBitsPixel != 1) &&
(bmp->bitmap.bmBitsPixel != MONITOR_GetDepth(&MONITOR_PrimaryMonitor))) {
ERR(x11drv, "Trying to make bitmap with planes=%d, bpp=%d\n",
ERR("Trying to make bitmap with planes=%d, bpp=%d\n",
bmp->bitmap.bmPlanes, bmp->bitmap.bmBitsPixel);
GDI_HEAP_UNLOCK( hbitmap );
return FALSE;
}
TRACE(x11drv, "(%08x) %dx%d %d bpp\n", hbitmap, bmp->bitmap.bmWidth,
TRACE("(%08x) %dx%d %d bpp\n", hbitmap, bmp->bitmap.bmWidth,
bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel);
pbitmap = X11DRV_AllocBitmap( bmp );
@ -214,7 +214,7 @@ BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
pbitmap->pixmap = TSXCreatePixmap(display, X11DRV_GetXRootWindow(), bmp->bitmap.bmWidth,
bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel);
if (!pbitmap->pixmap) {
WARN(x11drv, "Can't create Pixmap\n");
WARN("Can't create Pixmap\n");
HeapFree(GetProcessHeap(), 0, bmp->DDBitmap->physBitmap);
HeapFree(GetProcessHeap(), 0, bmp->DDBitmap);
GDI_HEAP_UNLOCK( hbitmap );
@ -259,7 +259,7 @@ static LONG X11DRV_GetBitmapBits(BITMAPOBJ *bmp, void *buffer, LONG count)
LPBYTE tbuf, startline;
int h, w;
TRACE(x11drv, "(bmp=%p, buffer=%p, count=0x%lx)\n", bmp, buffer, count);
TRACE("(bmp=%p, buffer=%p, count=0x%lx)\n", bmp, buffer, count);
EnterCriticalSection( &X11DRV_CritSection );
@ -362,7 +362,7 @@ static LONG X11DRV_GetBitmapBits(BITMAPOBJ *bmp, void *buffer, LONG count)
}
break;
default:
FIXME(x11drv, "Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
FIXME("Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
}
XDestroyImage( image );
LeaveCriticalSection( &X11DRV_CritSection );
@ -387,7 +387,7 @@ static LONG X11DRV_SetBitmapBits(BITMAPOBJ *bmp, void *bits, LONG count)
LPBYTE sbuf, startline;
int w, h;
TRACE(x11drv, "(bmp=%p, bits=%p, count=0x%lx)\n", bmp, bits, count);
TRACE("(bmp=%p, bits=%p, count=0x%lx)\n", bmp, bits, count);
height = count / bmp->bitmap.bmWidthBytes;
@ -475,7 +475,7 @@ static LONG X11DRV_SetBitmapBits(BITMAPOBJ *bmp, void *bits, LONG count)
}
break;
default:
FIXME(x11drv, "Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
FIXME("Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
}
@ -499,7 +499,7 @@ LONG X11DRV_BitmapBits(HBITMAP hbitmap, void *bits, LONG count, WORD flags)
BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
LONG ret;
if(!bmp) {
WARN(x11drv, "Bad bitmap handle %08x\n", hbitmap);
WARN("Bad bitmap handle %08x\n", hbitmap);
return FALSE;
}
@ -508,7 +508,7 @@ LONG X11DRV_BitmapBits(HBITMAP hbitmap, void *bits, LONG count, WORD flags)
else if(flags == DDB_SET)
ret = X11DRV_SetBitmapBits(bmp, bits, count);
else {
ERR(x11drv, "Unknown flags value %d\n", flags);
ERR("Unknown flags value %d\n", flags);
ret = 0;
}

16
graphics/x11drv/brush.c
View File

@ -15,7 +15,7 @@
#include "bitmap.h"
#include "color.h"
#include "x11drv.h"
#include "debug.h"
#include "debugtools.h"
#include "xmalloc.h" /* for XCREATEIMAGE macro */
#include "monitor.h"
#include "local.h"
@ -186,7 +186,7 @@ static BOOL BRUSH_SelectPatternBrush( DC * dc, HBITMAP hbitmap )
return 0;
if(bmp->DDBitmap->funcs != dc->funcs) {
WARN(gdi, "Trying to select non-X11 DDB into an X11 dc\n");
WARN("Trying to select non-X11 DDB into an X11 dc\n");
return 0;
}
@ -235,7 +235,7 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
HBRUSH16 prevHandle = dc->w.hBrush;
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
TRACE(gdi, "hdc=%04x hbrush=%04x\n",
TRACE("hdc=%04x hbrush=%04x\n",
dc->hSelf,hbrush);
dc->w.hBrush = hbrush;
@ -250,16 +250,16 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
switch(brush->logbrush.lbStyle)
{
case BS_NULL:
TRACE(gdi,"BS_NULL\n" );
TRACE("BS_NULL\n" );
break;
case BS_SOLID:
TRACE(gdi,"BS_SOLID\n" );
TRACE("BS_SOLID\n" );
BRUSH_SelectSolidBrush( dc, brush->logbrush.lbColor );
break;
case BS_HATCHED:
TRACE(gdi, "BS_HATCHED\n" );
TRACE("BS_HATCHED\n" );
physDev->brush.pixel = X11DRV_PALETTE_ToPhysical( dc, brush->logbrush.lbColor );
physDev->brush.pixmap = TSXCreateBitmapFromData( display, X11DRV_GetXRootWindow(),
HatchBrushes[brush->logbrush.lbHatch], 8, 8 );
@ -267,12 +267,12 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
break;
case BS_PATTERN:
TRACE(gdi, "BS_PATTERN\n");
TRACE("BS_PATTERN\n");
BRUSH_SelectPatternBrush( dc, (HBRUSH16)brush->logbrush.lbHatch );
break;
case BS_DIBPATTERN:
TRACE(gdi, "BS_DIBPATTERN\n");
TRACE("BS_DIBPATTERN\n");
if ((bmpInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)brush->logbrush.lbHatch )))
{
int size = DIB_BitmapInfoSize( bmpInfo, brush->logbrush.lbColor );

14
graphics/x11drv/graphics.c
View File

@ -40,7 +40,7 @@
#include "color.h"
#include "region.h"
#include "struct32.h"
#include "debug.h"
#include "debugtools.h"
#include "xmalloc.h"
DEFAULT_DEBUG_CHANNEL(graphics)
@ -295,7 +295,7 @@ BOOL X11DRV_SetupGCForText( DC * dc )
GCFont, &val );
return TRUE;
}
WARN(graphics, "Physical font failure\n" );
WARN("Physical font failure\n" );
return FALSE;
}
@ -577,7 +577,7 @@ X11DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
INT width, oldwidth, oldjoinstyle;
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
TRACE(graphics, "(%d %d %d %d)\n",
TRACE("(%d %d %d %d)\n",
left, top, right, bottom);
left = XLPTODP( dc, left );
@ -637,7 +637,7 @@ X11DRV_RoundRect( DC *dc, INT left, INT top, INT right,
INT width, oldwidth, oldendcap;
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
TRACE(graphics, "(%d %d %d %d %d %d\n",
TRACE("(%d %d %d %d %d %d\n",
left, top, right, bottom, ell_width, ell_height);
left = XLPTODP( dc, left );
@ -1192,7 +1192,7 @@ X11DRV_ExtFloodFill( DC *dc, INT x, INT y, COLORREF color,
BOOL result;
struct FloodFill_params params;
TRACE(graphics, "X11DRV_ExtFloodFill %d,%d %06lx %d\n",
TRACE("X11DRV_ExtFloodFill %d,%d %06lx %d\n",
x, y, color, fillType );
params.dc = dc;
@ -1384,14 +1384,14 @@ X11DRV_PolyBezier(DC *dc, POINT start, const POINT* BezierPoints, DWORD count)
XPoint* xpoints;
X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
TRACE(graphics, "dc=%p count=%ld %ld,%ld - %ld,%ld - %ld,%ld - %ld,%ld\n",
TRACE("dc=%p count=%ld %ld,%ld - %ld,%ld - %ld,%ld - %ld,%ld\n",
dc, count,
start.x, start.y,
(Points+0)->x, (Points+0)->y,
(Points+1)->x, (Points+1)->y,
(Points+2)->x, (Points+2)->y);
if(!count || count % 3){/* paranoid */
WARN(graphics," bad value for count : %ld\n", count);
WARN(" bad value for count : %ld\n", count);
return FALSE;
}
xpoints=(XPoint*) xmalloc( sizeof(XPoint)*BEZMAXPOINTS);

6
graphics/x11drv/init.c
View File

@ -14,7 +14,7 @@
#include "bitmap.h"
#include "color.h"
#include "debug.h"
#include "debugtools.h"
#include "ldt.h"
#include "local.h"
#include "monitor.h"
@ -171,7 +171,7 @@ BOOL X11DRV_GDI_Initialize(void)
/* Finish up device caps */
#if 0
TRACE(x11drv, "Height = %-4i pxl, %-4i mm, Width = %-4i pxl, %-4i mm\n",
TRACE("Height = %-4i pxl, %-4i mm, Width = %-4i pxl, %-4i mm\n",
HeightOfScreen(X11DRV_GetXScreen()), HeightMMOfScreen(X11DRV_GetXScreen()),
WidthOfScreen(X11DRV_GetXScreen()), WidthMMOfScreen(X11DRV_GetXScreen()) );
#endif
@ -222,7 +222,7 @@ static BOOL X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
dc->physDev = physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(*physDev) );
if(!physDev) {
ERR(x11drv, "Can't allocate physDev\n");
ERR("Can't allocate physDev\n");
return FALSE;
}

6
graphics/x11drv/objects.c
View File

@ -15,7 +15,7 @@
#include "font.h"
#include "pen.h"
#include "local.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(gdi)
@ -39,7 +39,7 @@ HGDIOBJ X11DRV_SelectObject( DC *dc, HGDIOBJ handle )
HGDIOBJ ret = 0;
if (!ptr) return 0;
TRACE(gdi, "hdc=%04x %04x\n", dc->hSelf, handle );
TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
switch(ptr->wMagic)
{
@ -80,7 +80,7 @@ BOOL X11DRV_DeleteObject( HGDIOBJ handle )
break;
default:
ERR(gdi, "Shouldn't be here!\n");
ERR("Shouldn't be here!\n");
ret = FALSE;
break;
}

38
graphics/x11drv/palette.c
View File

@ -15,7 +15,7 @@
#include <string.h>
#include "color.h"
#include "debug.h"
#include "debugtools.h"
#include "gdi.h"
#include "monitor.h"
#include "options.h"
@ -104,7 +104,7 @@ BOOL X11DRV_PALETTE_Init(void)
Visual *visual = DefaultVisual( display, DefaultScreen(display) );
TRACE(palette, "initializing palette manager...\n");
TRACE("initializing palette manager...\n");
white = WhitePixelOfScreen( X11DRV_GetXScreen() );
black = BlackPixelOfScreen( X11DRV_GetXScreen() );
@ -179,7 +179,7 @@ BOOL X11DRV_PALETTE_Init(void)
}
}
TRACE(palette," visual class %i (%i)\n", visual->class, monoPlane);
TRACE(" visual class %i (%i)\n", visual->class, monoPlane);
memset(X11DRV_PALETTE_freeList, 0, 256*sizeof(unsigned char));
@ -256,7 +256,7 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap(void)
COLOR_sysPal = (PALETTEENTRY*)xmalloc(sizeof(PALETTEENTRY)*X11DRV_DevCaps.sizePalette);
TRACE(palette,"Building private map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
TRACE("Building private map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
/* Allocate system palette colors */
@ -319,9 +319,9 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
COLOR_max = PROFILE_GetWineIniInt( "options", "AllocSystemColors", 256);
if (COLOR_max > 256) COLOR_max = 256;
else if (COLOR_max < 20) COLOR_max = 20;
TRACE(palette,"%d colors configured.\n", COLOR_max);
TRACE("%d colors configured.\n", COLOR_max);
TRACE(palette,"Building shared map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
TRACE("Building shared map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
/* Be nice and allocate system colors as read-only */
@ -338,7 +338,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
if( !warn++ )
{
WARN(palette, "Not enough colors for the full system palette.\n");
WARN("Not enough colors for the full system palette.\n");
bp = BlackPixel(display, DefaultScreen(display));
wp = WhitePixel(display, DefaultScreen(display));
@ -376,7 +376,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
sysPixel[i] = color.pixel;
TRACE(palette,"syscolor(%lx) -> pixel %i\n",
TRACE("syscolor(%lx) -> pixel %i\n",
*(COLORREF*)(COLOR_sysPalTemplate+i), (int)color.pixel);
/* Set EGA mapping if color in the first or last eight */
@ -393,7 +393,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
{
int c_min = 0, c_max = X11DRV_DevCaps.sizePalette, c_val;
TRACE(palette,"Dynamic colormap... \n");
TRACE("Dynamic colormap... \n");
/* comment this out if you want to debug palette init */
@ -427,7 +427,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
if( !TSXAllocColorCells(display, X11DRV_PALETTE_PaletteXColormap, False,
plane_masks, 0, pixDynMapping, c_min) )
{
WARN(palette,"Inexplicable failure during colorcell allocation.\n");
WARN("Inexplicable failure during colorcell allocation.\n");
c_min = 0;
}
@ -435,7 +435,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
TSXUngrabServer(display);
TRACE(palette,"adjusted size %i colorcells\n", X11DRV_DevCaps.sizePalette);
TRACE("adjusted size %i colorcells\n", X11DRV_DevCaps.sizePalette);
}
else if( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL )
{
@ -444,12 +444,12 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
* to maintain compatibility
*/
X11DRV_DevCaps.sizePalette = 256;
TRACE(palette,"Virtual colorspace - screendepth %i\n", MONITOR_GetDepth(&MONITOR_PrimaryMonitor));
TRACE("Virtual colorspace - screendepth %i\n", MONITOR_GetDepth(&MONITOR_PrimaryMonitor));
}
else X11DRV_DevCaps.sizePalette = NB_RESERVED_COLORS; /* system palette only - however we can alloc a bunch
* of colors and map to them */
TRACE(palette,"Shared system palette uses %i colors.\n", X11DRV_DevCaps.sizePalette);
TRACE("Shared system palette uses %i colors.\n", X11DRV_DevCaps.sizePalette);
/* set gap to account for pixel shortage. It has to be right in the center
* of the system palette because otherwise raster ops get screwed. */
@ -503,7 +503,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
else
X11DRV_PALETTE_PaletteToXPixel[i] = i;
TRACE(palette,"index %i -> pixel %i\n", i, X11DRV_PALETTE_PaletteToXPixel[i]);
TRACE("index %i -> pixel %i\n", i, X11DRV_PALETTE_PaletteToXPixel[i]);
if( X11DRV_PALETTE_XPixelToPalette )
X11DRV_PALETTE_XPixelToPalette[X11DRV_PALETTE_PaletteToXPixel[i]] = i;
@ -675,7 +675,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
if( (idx = color & 0xffff) >= palPtr->logpalette.palNumEntries)
{
WARN(palette, "RGB(%lx) : idx %d is out of bounds, assuming black\n", color, idx);
WARN("RGB(%lx) : idx %d is out of bounds, assuming black\n", color, idx);
GDI_HEAP_UNLOCK( hPal );
return 0;
}
@ -728,7 +728,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
if( !palPtr ) return 0;
else if( !palPtr->mapping )
WARN(palette, "Palette %04x is not realized\n", dc->w.hPalette);
WARN("Palette %04x is not realized\n", dc->w.hPalette);
switch(spec_type) /* we have to peruse DC and system palette */
{
@ -754,7 +754,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
index = color & 0xffff;
if( index >= palPtr->logpalette.palNumEntries )
WARN(palette, "RGB(%lx) : index %i is out of bounds\n", color, index);
WARN("RGB(%lx) : index %i is out of bounds\n", color, index);
else if( palPtr->mapping ) index = palPtr->mapping[index];
/* TRACE(palette,"PALETTEINDEX(%04x) -> pixel %i\n", (WORD)color, index);
@ -870,7 +870,7 @@ int X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNum, BOOL
index = *(WORD*)(palPtr->logpalette.palPalEntry + uStart);
if( index > 255 || (index >= COLOR_gapStart && index <= COLOR_gapEnd) )
{
WARN(palette,"PC_EXPLICIT: idx %d out of system palette, assuming black.\n", index);
WARN("PC_EXPLICIT: idx %d out of system palette, assuming black.\n", index);
index = 0;
}
break;
@ -927,7 +927,7 @@ int X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNum, BOOL
if( !prevMapping || palPtr->mapping[uStart] != index ) iRemapped++;
palPtr->mapping[uStart] = index;
TRACE(palette,"entry %i (%lx) -> pixel %i\n", uStart,
TRACE("entry %i (%lx) -> pixel %i\n", uStart,
*(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), index);
}

2
graphics/x11drv/pen.c
View File

@ -11,7 +11,7 @@
#include "pen.h"
#include "color.h"
#include "x11drv.h"
#include "debug.h"
#include "debugtools.h"
static const char PEN_dash[] = { 5,3 }; /* ----- ----- ----- */
static const char PEN_dot[] = { 1,1 }; /* -- -- -- -- -- -- */

8
graphics/x11drv/text.c
View File

@ -18,7 +18,7 @@
#include "gdi.h"
#include "heap.h"
#include "x11font.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(text)
@ -53,7 +53,7 @@ X11DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
lfUnderline = (pfo->fo_flags & FO_SYNTH_UNDERLINE) ? 1 : 0;
lfStrikeOut = (pfo->fo_flags & FO_SYNTH_STRIKEOUT) ? 1 : 0;
TRACE(text,"hdc=%04x df=%04x %d,%d %s, %d flags=%d lpDx=%p\n",
TRACE("hdc=%04x df=%04x %d,%d %s, %d flags=%d lpDx=%p\n",
dc->hSelf, (UINT16)(physDev->font), x, y,
debugstr_an (str, count), count, flags, lpDx);
@ -62,7 +62,7 @@ X11DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
terminating newlines seems ok. MW, April 1998. */
if (count > 0 && str[count - 1] == '\n') count--;
if (lprect != NULL) TRACE(text, "\trect=(%d,%d - %d,%d)\n",
if (lprect != NULL) TRACE("\trect=(%d,%d - %d,%d)\n",
lprect->left, lprect->top,
lprect->right, lprect->bottom );
/* Setup coordinates */
@ -101,7 +101,7 @@ X11DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
x = XLPTODP( dc, x );
y = YLPTODP( dc, y );
TRACE(text,"\treal coord: x=%i, y=%i, rect=(%d,%d - %d,%d)\n",
TRACE("\treal coord: x=%i, y=%i, rect=(%d,%d - %d,%d)\n",
x, y, rect.left, rect.top, rect.right, rect.bottom);
/* Draw the rectangle */

88
graphics/x11drv/xfont.c
View File

@ -29,7 +29,7 @@
#include "heap.h"
#include "options.h"
#include "font.h"
#include "debug.h"
#include "debugtools.h"
#include "ldt.h"
DEFAULT_DEBUG_CHANNEL(font)
@ -657,7 +657,7 @@ static BOOL LFD_ComposeLFD( fontObject* fo,
break;
}
TRACE(font,"\tLFD(uRelax=%d): %s\n", uRelax, lpLFD );
TRACE("\tLFD(uRelax=%d): %s\n", uRelax, lpLFD );
assert(*(lpLFD+MAX_LFD_LENGTH-1)==0); /* check if overwrittem */
return TRUE;
}
@ -1017,7 +1017,7 @@ static void XFONT_WindowsNames( char* buffer )
fi->df.dfPitchAndFamily |= bFamilyStyle;
}
TRACE(font,"typeface \'%s\'\n", fr->lfFaceName);
TRACE("typeface \'%s\'\n", fr->lfFaceName);
fr->fr_flags |= FR_NAMESET;
}
@ -1057,7 +1057,7 @@ static fontAlias* XFONT_CreateAlias( LPCSTR lpTypeFace, LPCSTR lpAlias )
/* check if we already got one */
if( !strcasecmp( pfa->faTypeFace, lpAlias ) )
{
TRACE(font,"\tredundant alias '%s' -> '%s'\n",
TRACE("\tredundant alias '%s' -> '%s'\n",
lpAlias, lpTypeFace );
return NULL;
}
@ -1076,7 +1076,7 @@ static fontAlias* XFONT_CreateAlias( LPCSTR lpTypeFace, LPCSTR lpAlias )
pfa->faAlias = pfa->faTypeFace + j;
lstrcpyA( pfa->faAlias, lpAlias );
TRACE(font, "\tadded alias '%s' for %s\n", lpAlias, lpTypeFace );
TRACE("\tadded alias '%s' for %s\n", lpAlias, lpTypeFace );
return pfa;
}
@ -1180,7 +1180,7 @@ static void XFONT_LoadAliases( char** buffer, int *buf_size )
prev = pfa;
}
TRACE(font, "\tsubstituted '%s' with %s\n",
TRACE("\tsubstituted '%s' with %s\n",
frMatch->lfFaceName, lpAlias );
lstrcpynA( frMatch->lfFaceName, lpAlias, LF_FACESIZE );
@ -1193,7 +1193,7 @@ static void XFONT_LoadAliases( char** buffer, int *buf_size )
}
}
}
else ERR(font, " malformed font alias '%s'\n", *buffer );
else ERR(" malformed font alias '%s'\n", *buffer );
}
else break;
} while(TRUE);
@ -1238,7 +1238,7 @@ static void XFONT_LoadPenalties( char** buffer, int *buf_size )
{
if( !strncasecmp( (*ppfr)->resource, *buffer, length ) )
{
TRACE(font, "Ignoring '%s'\n", (*ppfr)->resource );
TRACE("Ignoring '%s'\n", (*ppfr)->resource );
XFONT_RemoveFontResource( ppfr );
}
@ -1311,7 +1311,7 @@ static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x
fontResource* pfr = fontList;
fontInfo* pfi = NULL;
TRACE(font,"Reading cached font metrics:\n");
TRACE("Reading cached font metrics:\n");
read( fd, fontList, i); /* read all metrics at once */
while( offset < length )
@ -1351,7 +1351,7 @@ static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x
offset += sizeof(int);
for( pfr = fontList; pfr; pfr = pfr->next )
{
TRACE(font,"\t%s, %i instances\n", lpch, pfr->fi_count );
TRACE("\t%s, %i instances\n", lpch, pfr->fi_count );
pfr->resource = lpch;
while( TRUE )
{
@ -1409,13 +1409,13 @@ static BOOL XFONT_WriteCachedMetrics( int fd, unsigned x_checksum, int x_count,
i += n_ff * sizeof(fontResource) + j * sizeof(fontInfo) + sizeof(int);
write( fd, &i, sizeof(int) );
TRACE(font,"Writing font cache:\n");
TRACE("Writing font cache:\n");
for( pfr = fontList; pfr; pfr = pfr->next )
{
fontInfo fi;
TRACE(font,"\t%s, %i instances\n", pfr->resource, pfr->fi_count );
TRACE("\t%s, %i instances\n", pfr->resource, pfr->fi_count );
i = write( fd, pfr, sizeof(fontResource) );
if( i == sizeof(fontResource) )
@ -1480,7 +1480,7 @@ static int XFONT_CheckIniSection()
PROFILE_EnumerateWineIniSection("Fonts", &XFONT_CheckIniCallback,
(void *)&found);
if(found)
MSG(fontmsgepilogue);
MESSAGE(fontmsgepilogue);
return 1;
}
@ -1508,21 +1508,21 @@ static void XFONT_CheckIniCallback(
/* Valid key; make sure the value doesn't contain a wildcard */
if(strchr(value, '*')) {
if(*(int *)found == 0) {
MSG(fontmsgprologue);
MESSAGE(fontmsgprologue);
++*(int *)found;
}
MSG(" %s=%s [no wildcards allowed]\n", key, value);
MESSAGE(" %s=%s [no wildcards allowed]\n", key, value);
}
}
else {
/* Not a valid key */
if(*(int *)found == 0) {
MSG(fontmsgprologue);
MESSAGE(fontmsgprologue);
++*(int *)found;
}
MSG(" %s=%s [obsolete]\n", key, value);
MESSAGE(" %s=%s [obsolete]\n", key, value);
}
return;
@ -1606,13 +1606,13 @@ static int XFONT_BuildDefaultAliases( char** buffer, int* buf_size )
if( fr )
{
TRACE(font, "Using \'%s\' as default serif font\n", fr->lfFaceName);
TRACE("Using \'%s\' as default serif font\n", fr->lfFaceName);
aliasTable[1].faTypeFace = fr->lfFaceName;
faTemplate[1].fatResource = fr->resource;
}
else
{
WARN(font, "No typeface found for \'%s\'; using \'%s\'\n", *buffer,
WARN("No typeface found for \'%s\'; using \'%s\'\n", *buffer,
fatDefaultSerif.fatAlias);
aliasTable[1].faTypeFace = fatDefaultSerif.fatAlias; /* Charter */
faTemplate[1].fatResource = fatDefaultSerif.fatResource;
@ -1638,13 +1638,13 @@ static int XFONT_BuildDefaultAliases( char** buffer, int* buf_size )
if( fr )
{
TRACE(font, "Using \'%s\' as default sans serif font\n", fr->lfFaceName);
TRACE("Using \'%s\' as default sans serif font\n", fr->lfFaceName);
aliasTable[0].faTypeFace = fr->lfFaceName;
faTemplate[0].fatResource = fr->resource;
}
else
{
WARN(font, "No typeface found for \'%s\'; using \'%s\'\n", *buffer,
WARN("No typeface found for \'%s\'; using \'%s\'\n", *buffer,
fatDefaultSansSerif.fatAlias);
aliasTable[0].faTypeFace = fatDefaultSansSerif.fatAlias; /* Helvetica */
faTemplate[0].fatResource = fatDefaultSansSerif.fatResource;
@ -1674,7 +1674,7 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps )
x_pattern = TSXListFonts(display, "*", MAX_FONT_FAMILIES * 16, &x_count );
TRACE(font,"Font Mapper: initializing %i fonts [LPY=%i, XDR=%i, DR=%i]\n",
TRACE("Font Mapper: initializing %i fonts [LPY=%i, XDR=%i, DR=%i]\n",
x_count, pDevCaps->logPixelsY, DefResolution, res);
for( i = x_checksum = 0; i < x_count; i++ )
{
@ -1746,7 +1746,7 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps )
fr->resource = (char*) HeapAlloc(SystemHeap, 0, j + 1 );
lstrcpynA( fr->resource, typeface, j + 1 );
TRACE(font," family: %s\n", fr->resource );
TRACE(" family: %s\n", fr->resource );
if( pfr ) pfr->next = fr;
else fontList = fr;
@ -1788,14 +1788,14 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps )
XFONT_SetFontMetric( fi, fr, x_fs );
TSXFreeFont( display, x_fs );
TRACE(font,"\t[% 2ipt] '%s'\n", fi->df.dfPoints, typeface );
TRACE("\t[% 2ipt] '%s'\n", fi->df.dfPoints, typeface );
XFONT_CheckFIList( fr, fi, REMOVE_SUBSETS );
fi = NULL; /* preventing reuse */
}
else
{
ERR(font, "failed to load %s\n", lpstr );
ERR("failed to load %s\n", lpstr );
XFONT_CheckFIList( fr, fi, UNMARK_SUBSETS );
}
@ -1836,7 +1836,7 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps )
fontCache = (fontObject*) HeapAlloc(SystemHeap, 0, fontCacheSize * sizeof(fontObject));
XFONT_GrowFreeList(0, fontCacheSize - 1);
TRACE(font,"done!\n");
TRACE("done!\n");
/* update text caps parameter */
@ -1925,7 +1925,7 @@ static UINT XFONT_Match( fontMatch* pfm )
BOOL bScale = pfi->fi_flags & FI_SCALABLE;
INT d, h;
TRACE(font,"\t[ %-2ipt h=%-3i w=%-3i %s%s]\n", pfi->df.dfPoints,
TRACE("\t[ %-2ipt h=%-3i w=%-3i %s%s]\n", pfi->df.dfPoints,
pfi->df.dfPixHeight, pfi->df.dfAvgWidth,
(pfi->df.dfWeight > 400) ? "Bold " : "Normal ",
(pfi->df.dfItalic) ? "Italic" : "" );
@ -2022,7 +2022,7 @@ static UINT XFONT_Match( fontMatch* pfm )
if( penalty && pfi->lfd_resolution != DefResolution )
penalty++;
TRACE(font," returning %i\n", penalty );
TRACE(" returning %i\n", penalty );
return penalty;
}
@ -2099,7 +2099,7 @@ static void XFONT_CheckFIList( fontResource* fr, fontInfo* fi, int action)
fr->fi_count++;
}
if( i ) TRACE(font,"\t purged %i subsets [%i]\n", i , fr->fi_count);
if( i ) TRACE("\t purged %i subsets [%i]\n", i , fr->fi_count);
}
/***********************************************************************
@ -2142,7 +2142,7 @@ static BOOL XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm )
if( fm.pfr ) /* match family */
{
TRACE(font, "%s\n", fm.pfr->lfFaceName );
TRACE("%s\n", fm.pfr->lfFaceName );
if( fm.pfr->fr_flags & FR_REMOVED )
fm.pfr = 0;
@ -2169,7 +2169,7 @@ static BOOL XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm )
fm.pfr = *ppfr;
TRACE(font, "%s\n", fm.pfr->lfFaceName );
TRACE("%s\n", fm.pfr->lfFaceName );
current_score = XFONT_MatchFIList( &fm );
if( current_score < score )
@ -2244,7 +2244,7 @@ static fontObject* XFONT_GetCacheEntry()
{
int prev_i, prev_j, j;
TRACE(font,"font cache is full\n");
TRACE("font cache is full\n");
/* lookup the least recently used font */
@ -2263,7 +2263,7 @@ static fontObject* XFONT_GetCacheEntry()
{
/* detach from the lru list */
TRACE(font,"\tfreeing entry %i\n", j );
TRACE("\tfreeing entry %i\n", j );
fontCache[j].fr->fo_count--;
@ -2286,7 +2286,7 @@ static fontObject* XFONT_GetCacheEntry()
prev_i = fontCacheSize + FONTCACHE;
TRACE(font,"\tgrowing font cache from %i to %i\n", fontCacheSize, prev_i );
TRACE("\tgrowing font cache from %i to %i\n", fontCacheSize, prev_i );
if( (newCache = (fontObject*)HeapReAlloc(SystemHeap, 0,
fontCache, prev_i)) )
@ -2348,7 +2348,7 @@ static BOOL XFONT_SetX11Trans( fontObject *pfo )
PX->ascent = PX->pixelsize / 1000.0 * PX->RAW_ASCENT;
PX->descent = PX->pixelsize / 1000.0 * PX->RAW_DESCENT;
TRACE(font, "[%f %f %f %f] RA = %ld RD = %ld\n", pfo->lpX11Trans->a,
TRACE("[%f %f %f %f] RA = %ld RD = %ld\n", pfo->lpX11Trans->a,
pfo->lpX11Trans->b, pfo->lpX11Trans->c, pfo->lpX11Trans->d,
pfo->lpX11Trans->RAW_ASCENT, pfo->lpX11Trans->RAW_DESCENT);
@ -2387,12 +2387,12 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf )
{
UINT uRelaxLevel = 0;
TRACE(font,"(%u) '%s' h=%i weight=%i %s\n",
TRACE("(%u) '%s' h=%i weight=%i %s\n",
plf->lfCharSet, plf->lfFaceName, plf->lfHeight,
plf->lfWeight, (plf->lfItalic) ? "Italic" : "" );
if(abs(plf->lfHeight) > MAX_FONT_SIZE) {
ERR(font,
ERR(
"plf->lfHeight = %d, this is probably not right. Setting to 12\n",
plf->lfHeight);
plf->lfHeight = 12;
@ -2493,7 +2493,7 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf )
pfo->lru = fontMRU;
fontMRU = (pfo - fontCache);
TRACE(font,"physfont %i\n", fontMRU);
TRACE("physfont %i\n", fontMRU);
return (X_PHYSFONT)(X_PFONT_MAGIC | fontMRU);
}
@ -2636,7 +2636,7 @@ BOOL X11DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
pfo->fs->min_bounds.attributes;
}
y = pfo->lpX11Trans->RAW_ASCENT + pfo->lpX11Trans->RAW_DESCENT;
TRACE(font, "x = %f y = %f\n", x, y);
TRACE("x = %f y = %f\n", x, y);
x *= pfo->lpX11Trans->pixelsize / 1000.0;
y *= pfo->lpX11Trans->pixelsize / 1000.0;
size->cx = fabs((x + dc->w.breakRem + count * dc->w.charExtra) *
@ -2746,7 +2746,7 @@ INT16 WINAPI AddFontResource16( LPCSTR filename )
*/
INT WINAPI AddFontResourceA( LPCSTR str )
{
FIXME(font, "(%s): stub\n", debugres_a(str));
FIXME("(%s): stub\n", debugres_a(str));
return 1;
}
@ -2756,7 +2756,7 @@ INT WINAPI AddFontResourceA( LPCSTR str )
*/
INT WINAPI AddFontResourceW( LPCWSTR str )
{
FIXME(font, "(%s): stub\n", debugres_w(str) );
FIXME("(%s): stub\n", debugres_w(str) );
return 1;
}
@ -2765,7 +2765,7 @@ INT WINAPI AddFontResourceW( LPCWSTR str )
*/
BOOL16 WINAPI RemoveFontResource16( SEGPTR str )
{
FIXME(font, "(%s): stub\n", debugres_a(PTR_SEG_TO_LIN(str)));
FIXME("(%s): stub\n", debugres_a(PTR_SEG_TO_LIN(str)));
return TRUE;
}
@ -2797,7 +2797,7 @@ BOOL WINAPI RemoveFontResourceA( LPCSTR str )
LeaveCriticalSection( &crtsc_fontList );
return retVal;
*/
FIXME(font, "(%s): stub\n", debugres_a(str));
FIXME("(%s): stub\n", debugres_a(str));
return TRUE;
}
@ -2807,7 +2807,7 @@ BOOL WINAPI RemoveFontResourceA( LPCSTR str )
*/
BOOL WINAPI RemoveFontResourceW( LPCWSTR str )
{
FIXME(font, "(%s): stub\n", debugres_w(str) );
FIXME("(%s): stub\n", debugres_w(str) );
return TRUE;
}

10
misc/callback.c
View File

@ -12,7 +12,7 @@
#include "cursoricon.h"
#include "user.h"
#include "queue.h"
#include "debug.h"
#include "debugtools.h"
#include "win.h"
DEFAULT_DEBUG_CHANNEL(relay)
@ -42,7 +42,7 @@ static LRESULT WINAPI CALLBACK_CallWndProc( WNDPROC16 proc, HWND16 hwnd,
*/
static LONG WINAPI CALLBACK_CallRegisterProc( CONTEXT86 *context, INT offset)
{
ERR(relay, "Cannot call a register proc in Winelib\n" );
ERR("Cannot call a register proc in Winelib\n" );
assert( FALSE );
return 0;
}
@ -142,7 +142,7 @@ static HGLOBAL16 WINAPI CALLBACK_CallResourceHandlerProc( FARPROC16 proc,
HMODULE16 hModule,
HRSRC16 hRsrc )
{
ERR( relay, "Cannot call a 16-bit resource handler in Winelib\n" );
ERR("Cannot call a 16-bit resource handler in Winelib\n" );
assert( FALSE );
return 0;
}
@ -239,7 +239,7 @@ static BOOL WINAPI CALLBACK_CallWOWCallback16Ex(
);
break;
default:
WARN(relay,"(%ld) arguments not supported.\n",cbArgs);
WARN("(%ld) arguments not supported.\n",cbArgs);
if (dwFlags == WCB16_CDECL)
HeapFree(GetProcessHeap(),0,args);
return FALSE;
@ -256,7 +256,7 @@ static BOOL WINAPI CALLBACK_CallWOWCallback16Ex(
*/
static DWORD WINAPI CALLBACK_CallUTProc( FARPROC16 proc, DWORD w1, DWORD w2 )
{
ERR( relay, "Cannot call a UT thunk proc in Winelib\n" );
ERR("Cannot call a UT thunk proc in Winelib\n" );
assert( FALSE );
return 0;
}

48
misc/cdrom.c
View File

@ -11,7 +11,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include "cdrom.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(cdaudio)
@ -33,7 +33,7 @@ int CDAUDIO_Open(WINE_CDAUDIO* wcda)
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
wcda->unixdev = open(CDAUDIO_DEV, O_RDONLY | O_NONBLOCK, 0);
if (wcda->unixdev == -1) {
WARN(cdaudio,"can't open '%s'!. errno=%d\n", CDAUDIO_DEV, errno);
WARN("can't open '%s'!. errno=%d\n", CDAUDIO_DEV, errno);
return -1;
}
wcda->cdaMode = WINE_CDA_OPEN; /* to force reading tracks info */
@ -86,7 +86,7 @@ UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda)
if (ioctl(wcda->unixdev, CDIOREADTOCHEADER, &hdr))
#endif
{
WARN(cdaudio, "(%p) -- Error occured (%d)!\n", wcda, errno);
WARN("(%p) -- Error occured (%d)!\n", wcda, errno);
return (WORD)-1;
}
#ifdef linux
@ -123,7 +123,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
if (wcda->nTracks == 0) {
if (CDAUDIO_GetNumberOfTracks(wcda) == (WORD)-1) return FALSE;
}
TRACE(cdaudio,"nTracks=%u\n", wcda->nTracks);
TRACE("nTracks=%u\n", wcda->nTracks);
if (wcda->lpdwTrackLen != NULL)
free(wcda->lpdwTrackLen);
@ -136,7 +136,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
wcda->lpbTrackFlags = (LPBYTE)malloc((wcda->nTracks + 1) * sizeof(BYTE));
if (wcda->lpdwTrackLen == NULL || wcda->lpdwTrackPos == NULL ||
wcda->lpbTrackFlags == NULL) {
WARN(cdaudio, "error allocating track table !\n");
WARN("error allocating track table !\n");
return FALSE;
}
memset(wcda->lpdwTrackLen, 0, (wcda->nTracks + 1) * sizeof(DWORD));
@ -170,7 +170,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
if (ioctl(wcda->unixdev, CDIOREADTOCENTRYS, &entry))
#endif
{
WARN(cdaudio, "error read entry (%d)\n", errno);
WARN("error read entry (%d)\n", errno);
/* update status according to new status */
CDAUDIO_GetCDStatus(wcda);
@ -188,7 +188,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
if (i == 0) {
last_start = start;
wcda->dwFirstOffset = start;
TRACE(cdaudio, "dwFirstOffset=%u\n", start);
TRACE("dwFirstOffset=%u\n", start);
} else {
length = start - last_start;
last_start = start;
@ -196,7 +196,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
total_length += length;
wcda->lpdwTrackLen[i - 1] = length;
wcda->lpdwTrackPos[i - 1] = start;
TRACE(cdaudio, "track #%u start=%u len=%u\n", i, start, length);
TRACE("track #%u start=%u len=%u\n", i, start, length);
}
#ifdef linux
wcda->lpbTrackFlags[i] =
@ -205,10 +205,10 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
wcda->lpbTrackFlags[i] =
(toc_buffer.addr_type << 4) | (toc_buffer.control & 0x0f);
#endif
TRACE(cdaudio, "track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]);
TRACE("track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]);
}
wcda->dwTotalLen = total_length;
TRACE(cdaudio,"total_len=%u\n", total_length);
TRACE("total_len=%u\n", total_length);
return TRUE;
#else
return FALSE;
@ -239,7 +239,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
if (ioctl(wcda->unixdev, CDIOCREADSUBCHANNEL, &read_sc))
#endif
{
TRACE(cdaudio,"opened or no_media (%d)!\n", errno);
TRACE("opened or no_media (%d)!\n", errno);
wcda->cdaMode = WINE_CDA_OPEN; /* was NOT_READY */
return TRUE;
}
@ -255,7 +255,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
#else
case CD_AS_AUDIO_INVALID:
#endif
WARN(cdaudio, "device doesn't support status.\n");
WARN("device doesn't support status.\n");
wcda->cdaMode = WINE_CDA_DONTKNOW;
break;
#ifdef linux
@ -264,7 +264,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
case CD_AS_NO_STATUS:
#endif
wcda->cdaMode = WINE_CDA_STOP;
TRACE(cdaudio,"WINE_CDA_STOP !\n");
TRACE("WINE_CDA_STOP !\n");
break;
#ifdef linux
case CDROM_AUDIO_PLAY:
@ -279,14 +279,14 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
case CD_AS_PLAY_PAUSED:
#endif
wcda->cdaMode = WINE_CDA_PAUSE;
TRACE(cdaudio,"WINE_CDA_PAUSE !\n");
TRACE("WINE_CDA_PAUSE !\n");
break;
default:
#ifdef linux
TRACE(cdaudio,"status=%02X !\n",
TRACE("status=%02X !\n",
wcda->sc.cdsc_audiostatus);
#else
TRACE(cdaudio,"status=%02X !\n",
TRACE("status=%02X !\n",
wcda->sc.header.audio_status);
#endif
}
@ -304,13 +304,13 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
wcda->sc.what.position.absaddr.msf.frame;
#endif
#ifdef linux
TRACE(cdaudio,"%02u-%02u:%02u:%02u \n",
TRACE("%02u-%02u:%02u:%02u \n",
wcda->sc.cdsc_trk,
wcda->sc.cdsc_absaddr.msf.minute,
wcda->sc.cdsc_absaddr.msf.second,
wcda->sc.cdsc_absaddr.msf.frame);
#else
TRACE(cdaudio,"%02u-%02u:%02u:%02u \n",
TRACE("%02u-%02u:%02u:%02u \n",
wcda->sc.what.position.track_number,
wcda->sc.what.position.absaddr.msf.minute,
wcda->sc.what.position.absaddr.msf.second,
@ -319,7 +319,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
if (oldmode != wcda->cdaMode && oldmode == WINE_CDA_OPEN) {
if (!CDAUDIO_GetTracksInfo(wcda)) {
WARN(cdaudio, "error updating TracksInfo !\n");
WARN("error updating TracksInfo !\n");
return FALSE;
}
}
@ -362,7 +362,7 @@ int CDAUDIO_Play(WINE_CDAUDIO* wcda, DWORD start, DWORD end)
if (ioctl(wcda->unixdev, CDIOCSTART, NULL))
#endif
{
WARN(cdaudio, "motor doesn't start !\n");
WARN("motor doesn't start !\n");
return -1;
}
#ifdef linux
@ -371,15 +371,15 @@ int CDAUDIO_Play(WINE_CDAUDIO* wcda, DWORD start, DWORD end)
if (ioctl(wcda->unixdev, CDIOCPLAYMSF, &msf))
#endif
{
WARN(cdaudio, "device doesn't play !\n");
WARN("device doesn't play !\n");
return -1;
}
#ifdef linux
TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n",
TRACE("msf = %d:%d:%d %d:%d:%d\n",
msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0,
msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1);
#else
TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n",
TRACE("msf = %d:%d:%d %d:%d:%d\n",
msf.start_m, msf.start_s, msf.start_f,
msf.end_m, msf.end_s, msf.end_f);
#endif
@ -440,7 +440,7 @@ int CDAUDIO_Seek(WINE_CDAUDIO* wcda, DWORD at)
/* FIXME: the current end for play is lost
* use end of CD ROM instead
*/
FIXME(cdaudio, "Could a BSD expert implement the seek function ?\n");
FIXME("Could a BSD expert implement the seek function ?\n");
CDAUDIO_Play(wcda, at, wcda->lpdwTrackPos[wcda->nTracks] + wcda->lpdwTrackLen[wcda->nTracks]);
#endif

172
misc/comm.c
View File

@ -66,7 +66,7 @@
#include "winerror.h"
#include "async.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(comm)
@ -108,15 +108,15 @@ void COMM_Init(void)
}
stat(temp, &st);
if (!S_ISCHR(st.st_mode))
WARN(comm,"Can't use `%s' as %s !\n", temp, option);
WARN("Can't use `%s' as %s !\n", temp, option);
else
if ((COM[x].devicename = malloc(strlen(temp)+1)) == NULL)
WARN(comm,"Can't malloc for device info!\n");
WARN("Can't malloc for device info!\n");
else {
COM[x].fd = 0;
strcpy(COM[x].devicename, temp);
}
TRACE(comm, "%s = %s\n", option, COM[x].devicename);
TRACE("%s = %s\n", option, COM[x].devicename);
}
strcpy(option, "LPTx");
@ -130,15 +130,15 @@ void COMM_Init(void)
else {
stat(temp, &st);
if (!S_ISCHR(st.st_mode))
WARN(comm,"Can't use `%s' as %s !\n", temp, option);
WARN("Can't use `%s' as %s !\n", temp, option);
else
if ((LPT[x].devicename = malloc(strlen(temp)+1)) == NULL)
WARN(comm,"Can't malloc for device info!\n");
WARN("Can't malloc for device info!\n");
else {
LPT[x].fd = 0;
strcpy(LPT[x].devicename, temp);
}
TRACE(comm, "%s = %s\n", option, LPT[x].devicename);
TRACE("%s = %s\n", option, LPT[x].devicename);
}
}
@ -184,7 +184,7 @@ static int ValidLPTPort(int x)
static int WinError(void)
{
TRACE(comm, "errno = %d\n", errno);
TRACE("errno = %d\n", errno);
switch (errno) {
default:
return CE_IOE;
@ -220,7 +220,7 @@ static void comm_notification(int fd,void*private)
WORD mask = 0;
int cid = GetCommPort_fd(fd);
TRACE(comm, "async notification\n");
TRACE("async notification\n");
/* read data from comm port */
prev = comm_inbuf(ptr);
do {
@ -286,7 +286,7 @@ static void comm_notification(int fd,void*private)
/* send notifications, if any */
if (ptr->wnd && mask) {
TRACE(comm, "notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask);
TRACE("notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask);
PostMessage16(ptr->wnd, WM_COMMNOTIFY, cid, mask);
}
}
@ -301,14 +301,14 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
int port;
char *ptr, temp[256];
TRACE(comm, "(%s), ptr %p\n", device, lpdcb);
TRACE("(%s), ptr %p\n", device, lpdcb);
if (!lstrncmpiA(device,"COM",3)) {
port = device[3] - '0';
if (port-- == 0) {
ERR(comm, "BUG ! COM0 can't exist!.\n");
ERR("BUG ! COM0 can't exist!.\n");
return -1;
}
@ -333,13 +333,13 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
lpdcb->BaudRate = COM[port].baudrate;
else
lpdcb->BaudRate = atoi(ptr);
TRACE(comm,"baudrate (%d)\n", lpdcb->BaudRate);
TRACE("baudrate (%d)\n", lpdcb->BaudRate);
ptr = strtok(NULL, ", ");
if (islower(*ptr))
*ptr = toupper(*ptr);
TRACE(comm,"parity (%c)\n", *ptr);
TRACE("parity (%c)\n", *ptr);
lpdcb->fParity = TRUE;
switch (*ptr) {
case 'N':
@ -356,16 +356,16 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
lpdcb->Parity = ODDPARITY;
break;
default:
WARN(comm,"Unknown parity `%c'!\n", *ptr);
WARN("Unknown parity `%c'!\n", *ptr);
return -1;
}
ptr = strtok(NULL, ", ");
TRACE(comm, "charsize (%c)\n", *ptr);
TRACE("charsize (%c)\n", *ptr);
lpdcb->ByteSize = *ptr - '0';
ptr = strtok(NULL, ", ");
TRACE(comm, "stopbits (%c)\n", *ptr);
TRACE("stopbits (%c)\n", *ptr);
switch (*ptr) {
case '1':
lpdcb->StopBits = ONESTOPBIT;
@ -374,7 +374,7 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
lpdcb->StopBits = TWOSTOPBITS;
break;
default:
WARN(comm,"Unknown # of stopbits `%c'!\n", *ptr);
WARN("Unknown # of stopbits `%c'!\n", *ptr);
return -1;
}
}
@ -389,16 +389,16 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
{
int port,fd;
TRACE(comm, "%s, %d, %d\n", device, cbInQueue, cbOutQueue);
TRACE("%s, %d, %d\n", device, cbInQueue, cbOutQueue);
port = device[3] - '0';
if (port-- == 0)
ERR(comm, "BUG ! COM0 or LPT0 don't exist !\n");
ERR("BUG ! COM0 or LPT0 don't exist !\n");
if (!lstrncmpiA(device,"COM",3)) {
TRACE(comm, "%s = %s\n", device, COM[port].devicename);
TRACE("%s = %s\n", device, COM[port].devicename);
if (!ValidCOMPort(port))
return IE_BADID;
@ -408,7 +408,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
fd = open(COM[port].devicename, O_RDWR | O_NONBLOCK);
if (fd == -1) {
ERR(comm, "error=%d\n", errno);
ERR("error=%d\n", errno);
return IE_HARDWARE;
} else {
unknown[port] = SEGPTR_ALLOC(40);
@ -448,7 +448,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
/* not enough memory */
tcsetattr(COM[port].fd,TCSANOW,&m_stat[port]);
close(COM[port].fd);
ERR(comm, "out of memory");
ERR("out of memory");
return IE_MEMORY;
}
@ -488,7 +488,7 @@ INT16 WINAPI CloseComm16(INT16 cid)
{
struct DosDeviceStruct *ptr;
TRACE(comm,"cid=%d\n", cid);
TRACE("cid=%d\n", cid);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -524,7 +524,7 @@ INT16 WINAPI SetCommBreak16(INT16 cid)
{
struct DosDeviceStruct *ptr;
TRACE(comm,"cid=%d\n", cid);
TRACE("cid=%d\n", cid);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -541,7 +541,7 @@ INT16 WINAPI ClearCommBreak16(INT16 cid)
{
struct DosDeviceStruct *ptr;
TRACE(comm,"cid=%d\n", cid);
TRACE("cid=%d\n", cid);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -560,7 +560,7 @@ LONG WINAPI EscapeCommFunction16(UINT16 cid,UINT16 nFunction)
struct DosDeviceStruct *ptr;
struct termios port;
TRACE(comm,"cid=%d, function=%d\n", cid, nFunction);
TRACE("cid=%d, function=%d\n", cid, nFunction);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -613,7 +613,7 @@ LONG WINAPI EscapeCommFunction16(UINT16 cid,UINT16 nFunction)
break;
default:
WARN(comm,"(cid=%d,nFunction=%d): Unknown function\n",
WARN("(cid=%d,nFunction=%d): Unknown function\n",
cid, nFunction);
break;
}
@ -635,7 +635,7 @@ INT16 WINAPI FlushComm16(INT16 cid,INT16 fnQueue)
int queue;
struct DosDeviceStruct *ptr;
TRACE(comm,"cid=%d, queue=%d\n", cid, fnQueue);
TRACE("cid=%d, queue=%d\n", cid, fnQueue);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -649,7 +649,7 @@ INT16 WINAPI FlushComm16(INT16 cid,INT16 fnQueue)
ptr->ibuf_head = ptr->ibuf_tail;
break;
default:
WARN(comm,"(cid=%d,fnQueue=%d):Unknown queue\n",
WARN("(cid=%d,fnQueue=%d):Unknown queue\n",
cid, fnQueue);
return -1;
}
@ -676,7 +676,7 @@ INT16 WINAPI GetCommError16(INT16 cid,LPCOMSTAT16 lpStat)
return -1;
}
if (cid&FLAG_LPT) {
WARN(comm," cid %d not comm port\n",cid);
WARN(" cid %d not comm port\n",cid);
return CE_MODE;
}
stol = (unsigned char *)unknown[cid] + COMM_MSR_OFFSET;
@ -692,12 +692,12 @@ INT16 WINAPI GetCommError16(INT16 cid,LPCOMSTAT16 lpStat)
lpStat->cbOutQue = comm_outbuf(ptr);
lpStat->cbInQue = comm_inbuf(ptr);
TRACE(comm, "cid %d, error %d, lpStat %d %d %d stol %x\n",
TRACE("cid %d, error %d, lpStat %d %d %d stol %x\n",
cid, ptr->commerror, lpStat->status, lpStat->cbInQue,
lpStat->cbOutQue, *stol);
}
else
TRACE(comm, "cid %d, error %d, lpStat NULL stol %x\n",
TRACE("cid %d, error %d, lpStat NULL stol %x\n",
cid, ptr->commerror, *stol);
/* Return any errors and clear it */
@ -716,26 +716,26 @@ SEGPTR WINAPI SetCommEventMask16(INT16 cid,UINT16 fuEvtMask)
int repid;
unsigned int mstat;
TRACE(comm,"cid %d,mask %d\n",cid,fuEvtMask);
TRACE("cid %d,mask %d\n",cid,fuEvtMask);
if ((ptr = GetDeviceStruct(cid)) == NULL)
return (SEGPTR)NULL;
ptr->eventmask = fuEvtMask;
if ((cid&FLAG_LPT) || !ValidCOMPort(cid)) {
WARN(comm," cid %d not comm port\n",cid);
WARN(" cid %d not comm port\n",cid);
return (SEGPTR)NULL;
}
/* it's a COM port ? -> modify flags */
stol = (unsigned char *)unknown[cid] + COMM_MSR_OFFSET;
repid = ioctl(ptr->fd,TIOCMGET,&mstat);
TRACE(comm, " ioctl %d, msr %x at %p %p\n",repid,mstat,stol,unknown[cid]);
TRACE(" ioctl %d, msr %x at %p %p\n",repid,mstat,stol,unknown[cid]);
if ((mstat&TIOCM_CAR))
*stol |= 0x80;
else
*stol &=0x7f;
TRACE(comm," modem dcd construct %x\n",*stol);
TRACE(" modem dcd construct %x\n",*stol);
return SEGPTR_GET(unknown[cid]);
}
@ -747,12 +747,12 @@ UINT16 WINAPI GetCommEventMask16(INT16 cid,UINT16 fnEvtClear)
struct DosDeviceStruct *ptr;
WORD events;
TRACE(comm, "cid %d, mask %d\n", cid, fnEvtClear);
TRACE("cid %d, mask %d\n", cid, fnEvtClear);
if ((ptr = GetDeviceStruct(cid)) == NULL)
return 0;
if ((cid&FLAG_LPT) || !ValidCOMPort(cid)) {
WARN(comm," cid %d not comm port\n",cid);
WARN(" cid %d not comm port\n",cid);
return 0;
}
@ -769,7 +769,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
struct termios port;
struct DosDeviceStruct *ptr;
TRACE(comm, "cid %d, ptr %p\n", lpdcb->Id, lpdcb);
TRACE("cid %d, ptr %p\n", lpdcb->Id, lpdcb);
if ((ptr = GetDeviceStruct(lpdcb->Id)) == NULL) {
return -1;
}
@ -796,7 +796,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
port.c_lflag &= ~(ICANON|ECHO|ISIG);
port.c_lflag |= NOFLSH;
TRACE(comm,"baudrate %d\n",lpdcb->BaudRate);
TRACE("baudrate %d\n",lpdcb->BaudRate);
#ifdef CBAUD
port.c_cflag &= ~CBAUD;
switch (lpdcb->BaudRate) {
@ -894,7 +894,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
}
port.c_ispeed = port.c_ospeed;
#endif
TRACE(comm,"bytesize %d\n",lpdcb->ByteSize);
TRACE("bytesize %d\n",lpdcb->ByteSize);
port.c_cflag &= ~CSIZE;
switch (lpdcb->ByteSize) {
case 5:
@ -914,7 +914,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
return -1;
}
TRACE(comm,"fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity);
TRACE("fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity);
port.c_cflag &= ~(PARENB | PARODD);
if (lpdcb->fParity)
port.c_iflag |= INPCK;
@ -935,7 +935,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
}
TRACE(comm,"stopbits %d\n",lpdcb->StopBits);
TRACE("stopbits %d\n",lpdcb->StopBits);
switch (lpdcb->StopBits) {
case ONESTOPBIT:
@ -984,7 +984,7 @@ INT16 WINAPI GetCommState16(INT16 cid, LPDCB16 lpdcb)
struct DosDeviceStruct *ptr;
struct termios port;
TRACE(comm,"cid %d, ptr %p\n", cid, lpdcb);
TRACE("cid %d, ptr %p\n", cid, lpdcb);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -1122,7 +1122,7 @@ INT16 WINAPI TransmitCommChar16(INT16 cid,CHAR chTransmit)
{
struct DosDeviceStruct *ptr;
TRACE(comm, "cid %d, data %d \n", cid, chTransmit);
TRACE("cid %d, data %d \n", cid, chTransmit);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -1161,7 +1161,7 @@ INT16 WINAPI UngetCommChar16(INT16 cid,CHAR chUnget)
{
struct DosDeviceStruct *ptr;
TRACE(comm,"cid %d (char %d)\n", cid, chUnget);
TRACE("cid %d (char %d)\n", cid, chUnget);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -1193,7 +1193,7 @@ INT16 WINAPI ReadComm16(INT16 cid,LPSTR lpvBuf,INT16 cbRead)
struct DosDeviceStruct *ptr;
LPSTR orgBuf = lpvBuf;
TRACE(comm, "cid %d, ptr %p, length %d\n", cid, lpvBuf, cbRead);
TRACE("cid %d, ptr %p, length %d\n", cid, lpvBuf, cbRead);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
}
@ -1228,7 +1228,7 @@ INT16 WINAPI ReadComm16(INT16 cid,LPSTR lpvBuf,INT16 cbRead)
length += status;
}
TRACE(comm,"%.*s\n", length, orgBuf);
TRACE("%.*s\n", length, orgBuf);
ptr->commerror = 0;
return length;
}
@ -1241,7 +1241,7 @@ INT16 WINAPI WriteComm16(INT16 cid, LPSTR lpvBuf, INT16 cbWrite)
int status, length;
struct DosDeviceStruct *ptr;
TRACE(comm,"cid %d, ptr %p, length %d\n",
TRACE("cid %d, ptr %p, length %d\n",
cid, lpvBuf, cbWrite);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return -1;
@ -1252,7 +1252,7 @@ INT16 WINAPI WriteComm16(INT16 cid, LPSTR lpvBuf, INT16 cbWrite)
return -1;
}
TRACE(comm,"%.*s\n", cbWrite, lpvBuf );
TRACE("%.*s\n", cbWrite, lpvBuf );
length = 0;
while (length < cbWrite) {
@ -1291,7 +1291,7 @@ BOOL16 WINAPI EnableCommNotification16( INT16 cid, HWND16 hwnd,
{
struct DosDeviceStruct *ptr;
TRACE(comm, "(%d, %x, %d, %d)\n", cid, hwnd, cbWriteNotify, cbOutQueue);
TRACE("(%d, %x, %d, %d)\n", cid, hwnd, cbWriteNotify, cbOutQueue);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
ptr->commerror = IE_BADID;
return -1;
@ -1320,12 +1320,12 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb,
int port;
char *ptr,*temp;
TRACE(comm,"(%s,%p,%p)\n",device,lpdcb,lptimeouts);
TRACE("(%s,%p,%p)\n",device,lpdcb,lptimeouts);
if (!lstrncmpiA(device,"COM",3)) {
port=device[3]-'0';
if (port--==0) {
ERR(comm,"BUG! COM0 can't exists!.\n");
ERR("BUG! COM0 can't exists!.\n");
return FALSE;
}
if (!ValidCOMPort(port))
@ -1393,19 +1393,19 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb,
flag=0;
if (!strncmp("baud=",ptr,5)) {
if (!sscanf(ptr+5,"%ld",&x))
WARN(comm,"Couldn't parse %s\n",ptr);
WARN("Couldn't parse %s\n",ptr);
lpdcb->BaudRate = x;
flag=1;
}
if (!strncmp("stop=",ptr,5)) {
if (!sscanf(ptr+5,"%ld",&x))
WARN(comm,"Couldn't parse %s\n",ptr);
WARN("Couldn't parse %s\n",ptr);
lpdcb->StopBits = x;
flag=1;
}
if (!strncmp("data=",ptr,5)) {
if (!sscanf(ptr+5,"%ld",&x))
WARN(comm,"Couldn't parse %s\n",ptr);
WARN("Couldn't parse %s\n",ptr);
lpdcb->ByteSize = x;
flag=1;
}
@ -1429,7 +1429,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb,
flag=1;
}
if (!flag)
ERR(comm,"Unhandled specifier '%s', please report.\n",ptr);
ERR("Unhandled specifier '%s', please report.\n",ptr);
ptr=strtok(NULL," ");
}
if (lpdcb->BaudRate==110)
@ -1446,7 +1446,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsW( LPCWSTR devid, LPDCB lpdcb,
LPSTR devidA;
BOOL ret;
TRACE(comm,"(%p,%p,%p)\n",devid,lpdcb,lptimeouts);
TRACE("(%p,%p,%p)\n",devid,lpdcb,lptimeouts);
devidA = HEAP_strdupWtoA( GetProcessHeap(), 0, devid );
ret=BuildCommDCBAndTimeoutsA(devidA,lpdcb,lptimeouts);
HeapFree( GetProcessHeap(), 0, devidA );
@ -1497,7 +1497,7 @@ int commerror=0,eventmask=0;
*/
BOOL WINAPI SetCommBreak(HANDLE handle)
{
FIXME(comm,"handle %d, stub!\n", handle);
FIXME("handle %d, stub!\n", handle);
return TRUE;
}
@ -1506,7 +1506,7 @@ BOOL WINAPI SetCommBreak(HANDLE handle)
*/
BOOL WINAPI ClearCommBreak(HANDLE handle)
{
FIXME(comm,"handle %d, stub!\n", handle);
FIXME("handle %d, stub!\n", handle);
return TRUE;
}
@ -1518,7 +1518,7 @@ BOOL WINAPI EscapeCommFunction(HANDLE handle,UINT nFunction)
int fd;
struct termios port;
TRACE(comm,"handle %d, function=%d\n", handle, nFunction);
TRACE("handle %d, function=%d\n", handle, nFunction);
fd = COMM_GetWriteFd(handle);
if(fd<0)
return FALSE;
@ -1563,15 +1563,15 @@ BOOL WINAPI EscapeCommFunction(HANDLE handle,UINT nFunction)
port.c_iflag |= IXON;
break;
case SETBREAK:
FIXME(comm,"setbreak, stub\n");
FIXME("setbreak, stub\n");
/* ptr->suspended = 1; */
break;
case CLRBREAK:
FIXME(comm,"clrbreak, stub\n");
FIXME("clrbreak, stub\n");
/* ptr->suspended = 0; */
break;
default:
WARN(comm,"(handle=%d,nFunction=%d): Unknown function\n",
WARN("(handle=%d,nFunction=%d): Unknown function\n",
handle, nFunction);
break;
}
@ -1594,7 +1594,7 @@ BOOL WINAPI PurgeComm( HANDLE handle, DWORD flags)
{
int fd;
TRACE(comm,"handle %d, flags %lx\n", handle, flags);
TRACE("handle %d, flags %lx\n", handle, flags);
fd = COMM_GetWriteFd(handle);
if(fd<0)
@ -1644,15 +1644,15 @@ BOOL WINAPI ClearCommError(INT handle,LPDWORD errors,LPCOMSTAT lpStat)
lpStat->status = 0;
if(ioctl(fd, TIOCOUTQ, &lpStat->cbOutQue))
WARN(comm, "ioctl returned error\n");
WARN("ioctl returned error\n");
if(ioctl(fd, TIOCINQ, &lpStat->cbInQue))
WARN(comm, "ioctl returned error\n");
WARN("ioctl returned error\n");
}
close(fd);
TRACE(comm,"handle %d cbInQue = %ld cbOutQue = %ld\n",
TRACE("handle %d cbInQue = %ld cbOutQue = %ld\n",
handle,
lpStat->cbInQue,
lpStat->cbOutQue);
@ -1677,7 +1677,7 @@ BOOL WINAPI SetupComm( HANDLE handle, DWORD insize, DWORD outsize)
{
int fd;
FIXME(comm, "insize %ld outsize %ld unimplemented stub\n", insize, outsize);
FIXME("insize %ld outsize %ld unimplemented stub\n", insize, outsize);
fd=COMM_GetWriteFd(handle);
if(0>fd)
{
@ -1694,7 +1694,7 @@ BOOL WINAPI GetCommMask(HANDLE handle,LPDWORD evtmask)
{
int fd;
TRACE(comm, "handle %d, mask %p\n", handle, evtmask);
TRACE("handle %d, mask %p\n", handle, evtmask);
if(0>(fd=COMM_GetReadFd(handle)))
{
return FALSE;
@ -1711,7 +1711,7 @@ BOOL WINAPI SetCommMask(INT handle,DWORD evtmask)
{
int fd;
TRACE(comm, "handle %d, mask %lx\n", handle, evtmask);
TRACE("handle %d, mask %lx\n", handle, evtmask);
if(0>(fd=COMM_GetWriteFd(handle))) {
return FALSE;
}
@ -1728,7 +1728,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb)
struct termios port;
int fd;
TRACE(comm,"handle %d, ptr %p\n", handle, lpdcb);
TRACE("handle %d, ptr %p\n", handle, lpdcb);
if ((fd = COMM_GetWriteFd(handle)) < 0) return FALSE;
@ -1849,7 +1849,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb)
}
port.c_ispeed = port.c_ospeed;
#endif
TRACE(comm,"bytesize %d\n",lpdcb->ByteSize);
TRACE("bytesize %d\n",lpdcb->ByteSize);
port.c_cflag &= ~CSIZE;
switch (lpdcb->ByteSize) {
case 5:
@ -1870,7 +1870,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb)
return FALSE;
}
TRACE(comm,"fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity);
TRACE("fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity);
port.c_cflag &= ~(PARENB | PARODD);
if (lpdcb->fParity)
port.c_iflag |= INPCK;
@ -1892,7 +1892,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb)
}
TRACE(comm,"stopbits %d\n",lpdcb->StopBits);
TRACE("stopbits %d\n",lpdcb->StopBits);
switch (lpdcb->StopBits) {
case ONESTOPBIT:
port.c_cflag &= ~CSTOPB;
@ -1944,12 +1944,12 @@ BOOL WINAPI GetCommState(INT handle, LPDCB lpdcb)
struct termios port;
int fd;
TRACE(comm,"handle %d, ptr %p\n", handle, lpdcb);
TRACE("handle %d, ptr %p\n", handle, lpdcb);
if ((fd = COMM_GetReadFd(handle)) < 0) return FALSE;
if (tcgetattr(fd, &port) == -1) {
TRACE(comm,"tcgetattr(%d, ...) returned -1",fd);
TRACE("tcgetattr(%d, ...) returned -1",fd);
commerror = WinError();
close( fd );
return FALSE;
@ -2060,7 +2060,7 @@ BOOL WINAPI GetCommState(INT handle, LPDCB lpdcb)
commerror = 0;
TRACE(comm,"OK\n");
TRACE("OK\n");
return TRUE;
}
@ -2072,7 +2072,7 @@ BOOL WINAPI TransmitCommChar(INT cid,CHAR chTransmit)
{
struct DosDeviceStruct *ptr;
FIXME(comm,"(%d,'%c'), use win32 handle!\n",cid,chTransmit);
FIXME("(%d,'%c'), use win32 handle!\n",cid,chTransmit);
if ((ptr = GetDeviceStruct(cid)) == NULL) {
return FALSE;
}
@ -2095,7 +2095,7 @@ BOOL WINAPI TransmitCommChar(INT cid,CHAR chTransmit)
*/
BOOL WINAPI GetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts)
{
FIXME(comm,"(%x,%p):stub.\n",cid,lptimeouts);
FIXME("(%x,%p):stub.\n",cid,lptimeouts);
return TRUE;
}
@ -2103,7 +2103,7 @@ BOOL WINAPI GetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts)
* SetCommTimeouts (KERNEL32.453)
*/
BOOL WINAPI SetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) {
FIXME(comm,"(%x,%p):stub.\n",cid,lptimeouts);
FIXME("(%x,%p):stub.\n",cid,lptimeouts);
return TRUE;
}
@ -2112,7 +2112,7 @@ BOOL WINAPI SetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) {
*/
BOOL WINAPI GetCommModemStatus(HANDLE hFile,LPDWORD lpModemStat )
{
FIXME(comm, "(%d %p)\n",hFile,lpModemStat );
FIXME("(%d %p)\n",hFile,lpModemStat );
return TRUE;
}
/***********************************************************************
@ -2120,7 +2120,7 @@ BOOL WINAPI GetCommModemStatus(HANDLE hFile,LPDWORD lpModemStat )
*/
BOOL WINAPI WaitCommEvent(HANDLE hFile,LPDWORD eventmask ,LPOVERLAPPED overlapped)
{
FIXME(comm, "(%d %p %p )\n",hFile, eventmask,overlapped);
FIXME("(%d %p %p )\n",hFile, eventmask,overlapped);
return TRUE;
}
@ -2129,7 +2129,7 @@ BOOL WINAPI WaitCommEvent(HANDLE hFile,LPDWORD eventmask ,LPOVERLAPPED overlappe
*/
BOOL WINAPI GetCommProperties(HANDLE hFile, LPDCB *dcb)
{
FIXME(comm, "(%d %p )\n",hFile,dcb);
FIXME("(%d %p )\n",hFile,dcb);
return TRUE;
}
@ -2138,7 +2138,7 @@ BOOL WINAPI GetCommProperties(HANDLE hFile, LPDCB *dcb)
*/
BOOL WINAPI SetCommProperties(HANDLE hFile, LPDCB dcb)
{
FIXME(comm, "(%d %p )\n",hFile,dcb);
FIXME("(%d %p )\n",hFile,dcb);
return TRUE;
}

4
misc/cpu.c
View File

@ -15,7 +15,7 @@
#include "winnt.h"
#include "winerror.h"
#include "winreg.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(reg)
@ -76,7 +76,7 @@ VOID WINAPI GetSystemInfo(
/* Create this registry key for all systems */
if (RegCreateKey16(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor",&hkey)!=ERROR_SUCCESS) {
WARN(reg,"Unable to register CPU information\n");
WARN("Unable to register CPU information\n");
}
#ifdef linux

192
misc/crtdll.c
View File

@ -42,7 +42,7 @@ AJ 990101:
#include "winuser.h"
#include "winerror.h"
#include "ntddk.h"
#include "debug.h"
#include "debugtools.h"
#include "module.h"
#include "heap.h"
#include "crtdll.h"
@ -106,7 +106,7 @@ CRTDLL_FILE * __cdecl CRTDLL__fdopen(INT handle, LPCSTR mode);
*/
BOOL WINAPI CRTDLL_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE(crtdll,"(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved);
TRACE("(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH) {
CRTDLL__fdopen(0,"r");
@ -127,12 +127,12 @@ DWORD __cdecl CRTDLL__GetMainArgs(LPDWORD argc,LPSTR **argv,
int xargc,i,afterlastspace;
DWORD version;
TRACE(crtdll,"(%p,%p,%p,%ld).\n",
TRACE("(%p,%p,%p,%ld).\n",
argc,argv,environ,flag
);
CRTDLL_acmdln_dll = cmdline = HEAP_strdupA( GetProcessHeap(), 0,
GetCommandLineA() );
TRACE(crtdll,"got '%s'\n", cmdline);
TRACE("got '%s'\n", cmdline);
version = GetVersion();
CRTDLL_osver_dll = version >> 16;
@ -174,7 +174,7 @@ DWORD __cdecl CRTDLL__GetMainArgs(LPDWORD argc,LPSTR **argv,
CRTDLL_argv_dll = xargv;
*argv = xargv;
TRACE(crtdll,"found %d arguments\n",
TRACE("found %d arguments\n",
CRTDLL_argc_dll);
CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
return 0;
@ -200,7 +200,7 @@ struct find_t
*/
DWORD __cdecl CRTDLL__findfirst(LPCSTR fname, struct find_t * x2)
{
FIXME(crtdll, ":(%s,%p): stub\n",fname,x2);
FIXME(":(%s,%p): stub\n",fname,x2);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -213,7 +213,7 @@ DWORD __cdecl CRTDLL__findfirst(LPCSTR fname, struct find_t * x2)
*/
INT __cdecl CRTDLL__findnext(DWORD hand, struct find_t * x2)
{
FIXME(crtdll, ":(%ld,%p): stub\n",hand,x2);
FIXME(":(%ld,%p): stub\n",hand,x2);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -226,7 +226,7 @@ INT __cdecl CRTDLL__findnext(DWORD hand, struct find_t * x2)
*/
int __cdecl CRTDLL__fstat(int file, struct stat* buf)
{
FIXME(crtdll, ":(%d,%p): stub\n",file,buf);
FIXME(":(%d,%p): stub\n",file,buf);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -238,7 +238,7 @@ DWORD __cdecl CRTDLL__initterm(_INITTERMFUN *start,_INITTERMFUN *end)
{
_INITTERMFUN *current;
TRACE(crtdll,"(%p,%p)\n",start,end);
TRACE("(%p,%p)\n",start,end);
current=start;
while (current<end) {
if (*current) (*current)();
@ -273,7 +273,7 @@ CRTDLL_FILE * __cdecl CRTDLL__fdopen(INT handle, LPCSTR mode)
file->handle = handle;
break;
}
TRACE(crtdll, "open handle %d mode %s got file %p\n",
TRACE("open handle %d mode %s got file %p\n",
handle, mode, file);
return file;
}
@ -292,7 +292,7 @@ void __cdecl CRTDLL__global_unwind2( PEXCEPTION_FRAME frame )
*/
void __cdecl CRTDLL__local_unwind2( PEXCEPTION_FRAME endframe, DWORD nr )
{
TRACE(crtdll,"(%p,%ld)\n",endframe,nr);
TRACE("(%p,%ld)\n",endframe,nr);
}
/*********************************************************************
* _read (CRTDLL.256)
@ -302,7 +302,7 @@ void __cdecl CRTDLL__local_unwind2( PEXCEPTION_FRAME endframe, DWORD nr )
*/
INT __cdecl CRTDLL__read(INT fd, LPVOID buf, UINT count)
{
FIXME(crtdll,":(%d,%p,%d): stub\n",fd,buf,count);
FIXME(":(%d,%p,%d): stub\n",fd,buf,count);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -318,7 +318,7 @@ CRTDLL_FILE * __cdecl CRTDLL_fopen(LPCSTR path, LPCSTR mode)
DOS_FULL_NAME full_name;
if (!DOSFS_GetFullName( path, FALSE, &full_name )) {
WARN(crtdll, "file %s bad name\n",path);
WARN("file %s bad name\n",path);
return 0;
}
@ -359,7 +359,7 @@ CRTDLL_FILE * __cdecl CRTDLL_fopen(LPCSTR path, LPCSTR mode)
file = HeapAlloc( GetProcessHeap(), 0, sizeof(*file) );
file->handle = handle;
}
TRACE(crtdll, "file %s mode %s got handle %d file %p\n",
TRACE("file %s mode %s got handle %d file %p\n",
path,mode,handle,file);
return file;
}
@ -378,7 +378,7 @@ DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file)
known binary extensions must be unchanged */
while ( (i < (nmemb*size)) && (ret==1)) {
ret=fread(temp,1,1,file);
TRACE(crtdll, "got %c 0x%02x ret %d\n",
TRACE("got %c 0x%02x ret %d\n",
(isalpha(*(unsigned char*)temp))? *(unsigned char*)temp:
' ',*(unsigned char*)temp, ret);
if (*(unsigned char*)temp != 0xd) { /* skip CR */
@ -386,21 +386,21 @@ DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file)
i++;
}
else
TRACE(crtdll, "skipping ^M\n");
TRACE("skipping ^M\n");
}
TRACE(crtdll, "0x%08x items of size %d from file %p to %p\n",
TRACE("0x%08x items of size %d from file %p to %p\n",
nmemb,size,file,ptr,);
if(i!=nmemb)
WARN(crtdll, " failed!\n");
WARN(" failed!\n");
return i;
#else
DWORD ret;
TRACE(crtdll, "0x%08x items of size %d from file %p to %p\n",
TRACE("0x%08x items of size %d from file %p to %p\n",
nmemb,size,file,ptr);
if (!ReadFile( file->handle, ptr, size * nmemb, &ret, NULL ))
WARN(crtdll, " failed!\n");
WARN(" failed!\n");
return ret / size;
#endif
@ -413,7 +413,7 @@ DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file)
*/
DWORD __cdecl CRTDLL_freopen(LPCSTR path, LPCSTR mode, LPVOID stream)
{
FIXME(crtdll, ":(%s,%s,%p): stub\n", path, mode, stream);
FIXME(":(%s,%s,%p): stub\n", path, mode, stream);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -434,7 +434,7 @@ INT __cdecl CRTDLL_fscanf( CRTDLL_FILE *stream, LPSTR format, ... )
va_end( valist );
return res;
#endif
FIXME(crtdll,"broken\n");
FIXME("broken\n");
return 0;
}
@ -443,13 +443,13 @@ INT __cdecl CRTDLL_fscanf( CRTDLL_FILE *stream, LPSTR format, ... )
*/
LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT whence)
{
TRACE(crtdll, "file %p to 0x%08lx pos %s\n",
TRACE("file %p to 0x%08lx pos %s\n",
file,offset,(whence==SEEK_SET)?"SEEK_SET":
(whence==SEEK_CUR)?"SEEK_CUR":
(whence==SEEK_END)?"SEEK_END":"UNKNOWN");
if (SetFilePointer( file->handle, offset, NULL, whence ) != 0xffffffff)
return 0;
WARN(crtdll, " failed!\n");
WARN(" failed!\n");
return -1;
}
@ -458,7 +458,7 @@ LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT whence)
*/
INT __cdecl CRTDLL_fsetpos( CRTDLL_FILE *file, INT *pos )
{
TRACE(crtdll, "file %p pos %d\n", file, *pos );
TRACE("file %p pos %d\n", file, *pos );
return CRTDLL_fseek(file, *pos, SEEK_SET);
}
@ -477,12 +477,12 @@ DWORD __cdecl CRTDLL_fwrite( LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file
{
DWORD ret;
TRACE(crtdll, "0x%08x items of size %d to file %p(%d) from %p\n",
TRACE("0x%08x items of size %d to file %p(%d) from %p\n",
nmemb,size,file,file-(CRTDLL_FILE*)CRTDLL_iob,ptr);
if (!WriteFile( file->handle, ptr, size * nmemb, &ret, NULL ))
WARN(crtdll, " failed!\n");
WARN(" failed!\n");
return ret / size;
}
@ -491,7 +491,7 @@ DWORD __cdecl CRTDLL_fwrite( LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file
*/
INT __cdecl CRTDLL_setbuf(CRTDLL_FILE *file, LPSTR buf)
{
TRACE(crtdll, "(file %p buf %p)\n", file, buf);
TRACE("(file %p buf %p)\n", file, buf);
/* this doesn't work:"void value not ignored as it ought to be"
return setbuf(file,buf);
*/
@ -522,7 +522,7 @@ HFILE handle;
default:
return (-1);
}
TRACE(crtdll, "(handle %08lx,flags %d) return %d\n",
TRACE("(handle %08lx,flags %d) return %d\n",
osfhandle,flags,handle);
return handle;
@ -598,7 +598,7 @@ clock_t __cdecl CRTDLL_clock(void)
*/
BOOL __cdecl CRTDLL__isatty(DWORD x)
{
TRACE(crtdll,"(%ld)\n",x);
TRACE("(%ld)\n",x);
return TRUE;
}
@ -615,7 +615,7 @@ INT __cdecl CRTDLL__write(INT fd,LPCVOID buf,UINT count)
len = (UINT)write(fd,buf,(LONG)count);
else
len = _lwrite(fd,buf,count);
TRACE(crtdll,"%d/%d byte to dfh %d from %p,\n",
TRACE("%d/%d byte to dfh %d from %p,\n",
len,count,fd,buf);
return len;
}
@ -635,7 +635,7 @@ INT __cdecl CRTDLL__write(INT fd,LPCVOID buf,UINT count)
*/
void __cdecl CRTDLL__cexit(INT ret)
{
TRACE(crtdll,"(%d)\n",ret);
TRACE("(%d)\n",ret);
ExitProcess(ret);
}
@ -645,7 +645,7 @@ void __cdecl CRTDLL__cexit(INT ret)
*/
void __cdecl CRTDLL_exit(DWORD ret)
{
TRACE(crtdll,"(%ld)\n",ret);
TRACE("(%ld)\n",ret);
ExitProcess(ret);
}
@ -655,7 +655,7 @@ void __cdecl CRTDLL_exit(DWORD ret)
*/
INT __cdecl CRTDLL__abnormal_termination(void)
{
TRACE(crtdll,"(void)\n");
TRACE("(void)\n");
return 0;
}
@ -720,7 +720,7 @@ INT __cdecl CRTDLL_fputc( INT c, CRTDLL_FILE *file )
{
char ch = (char)c;
DWORD res;
TRACE(crtdll, "%c to file %p\n",c,file);
TRACE("%c to file %p\n",c,file);
if (!WriteFile( file->handle, &ch, 1, &res, NULL )) return -1;
return c;
}
@ -732,7 +732,7 @@ INT __cdecl CRTDLL_fputc( INT c, CRTDLL_FILE *file )
INT __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file )
{
DWORD res;
TRACE(crtdll, "%s to file %p\n",s,file);
TRACE("%s to file %p\n",s,file);
if (!WriteFile( file->handle, s, strlen(s), &res, NULL )) return -1;
return res;
}
@ -743,7 +743,7 @@ INT __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file )
*/
INT __cdecl CRTDLL_puts(LPCSTR s)
{
TRACE(crtdll, "%s \n",s);
TRACE("%s \n",s);
return puts(s);
}
@ -799,7 +799,7 @@ CHAR* __cdecl CRTDLL_fgets( LPSTR s, INT size, CRTDLL_FILE *file )
*s = '\0';
TRACE(crtdll,"got '%s'\n", buf_start);
TRACE("got '%s'\n", buf_start);
return buf_start;
}
@ -821,7 +821,7 @@ LPSTR __cdecl CRTDLL_gets(LPSTR buf)
*buf = '\0';
TRACE(crtdll,"got '%s'\n", buf_start);
TRACE("got '%s'\n", buf_start);
return buf_start;
}
@ -833,7 +833,7 @@ UINT __cdecl CRTDLL__rotl(UINT x,INT shift)
{
unsigned int ret = (x >> shift)|( x >>((sizeof(x))-shift));
TRACE(crtdll, "got 0x%08x rot %d ret 0x%08x\n",
TRACE("got 0x%08x rot %d ret 0x%08x\n",
x,shift,ret);
return ret;
@ -845,7 +845,7 @@ DWORD __cdecl CRTDLL__lrotl(DWORD x,INT shift)
{
unsigned long ret = (x >> shift)|( x >>((sizeof(x))-shift));
TRACE(crtdll, "got 0x%08lx rot %d ret 0x%08lx\n",
TRACE("got 0x%08lx rot %d ret 0x%08lx\n",
x,shift,ret);
return ret;
@ -902,7 +902,7 @@ INT __cdecl CRTDLL_vswprintf( LPWSTR buffer, LPCWSTR spec, va_list args )
*/
unsigned char* __cdecl CRTDLL__mbscpy(unsigned char *x,unsigned char *y)
{
TRACE(crtdll,"CRTDLL_mbscpy %s and %s\n",x,y);
TRACE("CRTDLL_mbscpy %s and %s\n",x,y);
return strcpy(x,y);
}
@ -943,13 +943,13 @@ LPSTR __cdecl CRTDLL__strlwr(LPSTR x)
{
unsigned char *y =x;
TRACE(crtdll, "CRTDLL_strlwr got %s\n", x);
TRACE("CRTDLL_strlwr got %s\n", x);
while (*y) {
if ((*y > 0x40) && (*y< 0x5b))
*y = *y + 0x20;
y++;
}
TRACE(crtdll, " returned %s\n", x);
TRACE(" returned %s\n", x);
return x;
}
@ -976,7 +976,7 @@ INT __cdecl CRTDLL_system(LPSTR x)
}
/* If buffer too short, exit. */
if (i > SYSBUF_LENGTH) {
TRACE(crtdll,"_system buffer to small\n");
TRACE("_system buffer to small\n");
return 127;
}
@ -993,7 +993,7 @@ INT __cdecl CRTDLL_system(LPSTR x)
}
*bp++ = '"';
*bp = 0;
TRACE(crtdll, "_system got '%s', executing '%s'\n",x,buffer);
TRACE("_system got '%s', executing '%s'\n",x,buffer);
return system(buffer);
}
@ -1046,7 +1046,7 @@ LPWSTR __cdecl CRTDLL__wcslwr(LPWSTR x)
*/
VOID __cdecl CRTDLL_longjmp(jmp_buf env, int val)
{
FIXME(crtdll,"CRTDLL_longjmp semistup, expect crash\n");
FIXME("CRTDLL_longjmp semistup, expect crash\n");
longjmp(env, val);
}
@ -1132,7 +1132,7 @@ LPWSTR __cdecl CRTDLL__wcsdup(LPCWSTR ptr)
*/
INT __cdecl CRTDLL_fclose( CRTDLL_FILE *file )
{
TRACE(crtdll,"%p\n", file );
TRACE("%p\n", file );
if (!CloseHandle( file->handle )) return -1;
HeapFree( GetProcessHeap(), 0, file );
return 0;
@ -1147,15 +1147,15 @@ INT __cdecl CRTDLL__unlink(LPCSTR pathname)
DOS_FULL_NAME full_name;
if (!DOSFS_GetFullName( pathname, FALSE, &full_name )) {
WARN(crtdll, "CRTDLL_unlink file %s bad name\n",pathname);
WARN("CRTDLL_unlink file %s bad name\n",pathname);
return EOF;
}
ret=unlink(full_name.long_name);
TRACE(crtdll,"(%s unix %s)\n",
TRACE("(%s unix %s)\n",
pathname,full_name.long_name);
if(ret)
WARN(crtdll, " Failed!\n");
WARN(" Failed!\n");
return ret;
}
@ -1197,13 +1197,13 @@ int __cdecl CRTDLL__stat(const char * filename, struct win_stat * buf)
if (!DOSFS_GetFullName( filename, TRUE, &full_name ))
{
WARN(crtdll, "CRTDLL__stat filename %s bad name\n",filename);
WARN("CRTDLL__stat filename %s bad name\n",filename);
return -1;
}
ret=stat(full_name.long_name,&mystat);
TRACE(crtdll,"CRTDLL__stat %s\n", filename);
TRACE("CRTDLL__stat %s\n", filename);
if(ret)
WARN(crtdll, " Failed!\n");
WARN(" Failed!\n");
/* FIXME: should check what Windows returns */
@ -1260,14 +1260,14 @@ HFILE __cdecl CRTDLL__open(LPCSTR path,INT flags)
creation = OPEN_EXISTING;
}
if (flags & 0x0008) /* O_APPEND */
FIXME(crtdll, "O_APPEND not supported\n" );
FIXME("O_APPEND not supported\n" );
if (flags & 0xf0f4)
TRACE(crtdll,"CRTDLL_open file unsupported flags 0x%04x\n",flags);
TRACE("CRTDLL_open file unsupported flags 0x%04x\n",flags);
/* End Fixme */
ret = CreateFileA( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, creation, FILE_ATTRIBUTE_NORMAL, -1 );
TRACE(crtdll,"CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret);
TRACE("CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret);
return ret;
}
@ -1278,9 +1278,9 @@ INT __cdecl CRTDLL__close(HFILE fd)
{
int ret=_lclose(fd);
TRACE(crtdll,"(%d)\n",fd);
TRACE("(%d)\n",fd);
if(ret)
WARN(crtdll, " Failed!\n");
WARN(" Failed!\n");
return ret;
}
@ -1290,7 +1290,7 @@ INT __cdecl CRTDLL__close(HFILE fd)
*/
INT __cdecl CRTDLL_feof( CRTDLL_FILE *file )
{
FIXME(crtdll,"stub\n" );
FIXME("stub\n" );
return 0;
}
@ -1310,7 +1310,7 @@ LPSTR __cdecl CRTDLL_setlocale(INT category,LPCSTR locale)
case CRTDLL_LC_TIME: categorystr="LC_TIME";break;
default: categorystr = "UNKNOWN?";break;
}
FIXME(crtdll,"(%s,%s),stub!\n",categorystr,locale);
FIXME("(%s,%s),stub!\n",categorystr,locale);
return "C";
}
@ -1528,7 +1528,7 @@ INT __cdecl CRTDLL__setmode( INT fh,INT mode)
#define O_TEXT 0x4000
#define O_BINARY 0x8000
FIXME(crtdll, "on fhandle %d mode %s, STUB.\n",
FIXME("on fhandle %d mode %s, STUB.\n",
fh,(mode=O_TEXT)?"O_TEXT":
(mode=O_BINARY)?"O_BINARY":"UNKNOWN");
return -1;
@ -1539,7 +1539,7 @@ INT __cdecl CRTDLL__setmode( INT fh,INT mode)
*/
VOID __cdecl CRTDLL__fpreset(void)
{
FIXME(crtdll," STUB.\n");
FIXME(" STUB.\n");
}
/*********************************************************************
@ -1547,7 +1547,7 @@ VOID __cdecl CRTDLL__fpreset(void)
*/
INT __cdecl CRTDLL_atexit(LPVOID x)
{
FIXME(crtdll,"(%p), STUB.\n",x);
FIXME("(%p), STUB.\n",x);
return 0; /* successful */
}
@ -1567,7 +1567,7 @@ WCHAR __cdecl CRTDLL_mblen(CHAR *mb,INT size)
else if (!(*mb))
ret =0;
TRACE(crtdll,"CRTDLL_mlen %s for max %d bytes ret %d\n",mb,size,ret);
TRACE("CRTDLL_mlen %s for max %d bytes ret %d\n",mb,size,ret);
return ret;
}
@ -1594,7 +1594,7 @@ INT __cdecl CRTDLL_mbstowcs(LPWSTR wcs, LPCSTR mbs, INT size)
p++;
ret = (p -wcs);
TRACE(crtdll,"CRTDLL_mbstowcs %s for %d chars put %d wchars\n",
TRACE("CRTDLL_mbstowcs %s for %d chars put %d wchars\n",
mbs,size,ret);
return ret;
}
@ -1622,7 +1622,7 @@ WCHAR __cdecl CRTDLL_mbtowc(WCHAR* wc,CHAR* mb,INT size)
else
ret = -1;
TRACE(crtdll,"CRTDLL_mbtowc %s for %d chars\n",mb,size);
TRACE("CRTDLL_mbtowc %s for %d chars\n",mb,size);
return ret;
}
@ -1686,7 +1686,7 @@ LPSTR __cdecl CRTDLL__fullpath(LPSTR buf, LPCSTR name, INT size)
}
if (!DOSFS_GetFullName( name, FALSE, &full_name )) return NULL;
lstrcpynA(buf,full_name.short_name,size);
TRACE(crtdll,"CRTDLL_fullpath got %s\n",buf);
TRACE("CRTDLL_fullpath got %s\n",buf);
return buf;
}
@ -1702,7 +1702,7 @@ VOID __cdecl CRTDLL__splitpath(LPCSTR path, LPSTR drive, LPSTR directory, LPSTR
*/
char * drivechar,*dirchar,*namechar;
TRACE(crtdll,"CRTDLL__splitpath got %s\n",path);
TRACE("CRTDLL__splitpath got %s\n",path);
drivechar = strchr(path,':');
dirchar = strrchr(path,'/');
@ -1746,7 +1746,7 @@ VOID __cdecl CRTDLL__splitpath(LPCSTR path, LPSTR drive, LPSTR directory, LPSTR
}
}
TRACE(crtdll,"CRTDLL__splitpath found %s %s %s %s\n",drive,directory,filename,extension);
TRACE("CRTDLL__splitpath found %s %s %s %s\n",drive,directory,filename,extension);
}
@ -1760,7 +1760,7 @@ VOID __cdecl CRTDLL__makepath(LPSTR path, LPCSTR drive,
LPCSTR extension )
{
char ch;
TRACE(crtdll,"CRTDLL__makepath got %s %s %s %s\n", drive, directory,
TRACE("CRTDLL__makepath got %s %s %s %s\n", drive, directory,
filename, extension);
if ( !path )
@ -1791,7 +1791,7 @@ VOID __cdecl CRTDLL__makepath(LPSTR path, LPCSTR drive,
}
}
TRACE(crtdll,"CRTDLL__makepath returns %s\n",path);
TRACE("CRTDLL__makepath returns %s\n",path);
}
/*********************************************************************
@ -1820,7 +1820,7 @@ CHAR* __cdecl CRTDLL__getcwd(LPSTR buf, INT size)
if (len > size)
{
/* set error to ERANGE */
TRACE(crtdll,"CRTDLL_getcwd buffer to small\n");
TRACE("CRTDLL_getcwd buffer to small\n");
return NULL;
}
return buf;
@ -1835,7 +1835,7 @@ CHAR* __cdecl CRTDLL__getdcwd(INT drive,LPSTR buf, INT size)
char test[1];
int len;
FIXME(crtdll,"(\"%c:\",%s,%d)\n",drive+'A',buf,size);
FIXME("(\"%c:\",%s,%d)\n",drive+'A',buf,size);
len = size;
if (!buf) {
if (size < 0) /* allocate as big as nescessary */
@ -1854,7 +1854,7 @@ CHAR* __cdecl CRTDLL__getdcwd(INT drive,LPSTR buf, INT size)
if (len > size)
{
/* set error to ERANGE */
TRACE(crtdll,"buffer to small\n");
TRACE("buffer to small\n");
return NULL;
}
return buf;
@ -1915,25 +1915,25 @@ LPSTR __cdecl CRTDLL__tempnam(LPCSTR dir, LPCSTR prefix)
DOS_FULL_NAME tempname;
if ((ret = tempnam(dir,prefix))==NULL) {
WARN(crtdll, "Unable to get unique filename\n");
WARN("Unable to get unique filename\n");
return NULL;
}
if (!DOSFS_GetFullName(ret,FALSE,&tempname))
{
TRACE(crtdll, "Wrong path?\n");
TRACE("Wrong path?\n");
return NULL;
}
free(ret);
if ((ret = CRTDLL_malloc(strlen(tempname.short_name)+1)) == NULL) {
WARN(crtdll, "CRTDL_malloc for shortname failed\n");
WARN("CRTDL_malloc for shortname failed\n");
return NULL;
}
if ((ret = strcpy(ret,tempname.short_name)) == NULL) {
WARN(crtdll, "Malloc for shortname failed\n");
WARN("Malloc for shortname failed\n");
return NULL;
}
TRACE(crtdll,"dir %s prefix %s got %s\n",
TRACE("dir %s prefix %s got %s\n",
dir,prefix,ret);
return ret;
@ -1949,18 +1949,18 @@ LPSTR __cdecl CRTDLL_tmpnam(LPSTR s)
char *ret;
if ((ret =tmpnam(s))== NULL) {
WARN(crtdll, "Unable to get unique filename\n");
WARN("Unable to get unique filename\n");
return NULL;
}
if (!DOSFS_GetFullName(ret,FALSE,&CRTDLL_tmpname))
{
TRACE(crtdll, "Wrong path?\n");
TRACE("Wrong path?\n");
return NULL;
}
strcat(CRTDLL_tmpname.short_name,".");
TRACE(crtdll,"for buf %p got %s\n",
TRACE("for buf %p got %s\n",
s,CRTDLL_tmpname.short_name);
TRACE(crtdll,"long got %s\n",
TRACE("long got %s\n",
CRTDLL_tmpname.long_name);
if ( s != NULL)
return strcpy(s,CRTDLL_tmpname.short_name);
@ -1984,7 +1984,7 @@ LPSTR __cdecl CRTDLL__itoa(INT x,LPSTR buf,INT buflen)
LPSTR __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix)
{
switch(radix) {
case 2: FIXME(crtdll, "binary format not implemented !\n");
case 2: FIXME("binary format not implemented !\n");
break;
case 8: wsnprintfA(buf,0x80,"%o",x);
break;
@ -1992,7 +1992,7 @@ LPSTR __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix)
break;
case 16: wsnprintfA(buf,0x80,"%x",x);
break;
default: FIXME(crtdll, "radix %d not implemented !\n", radix);
default: FIXME("radix %d not implemented !\n", radix);
}
return buf;
}
@ -2003,7 +2003,7 @@ LPSTR __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix)
LPSTR __cdecl CRTDLL__ultoa(long x,LPSTR buf,INT radix)
{
switch(radix) {
case 2: FIXME(crtdll, "binary format not implemented !\n");
case 2: FIXME("binary format not implemented !\n");
break;
case 8: wsnprintfA(buf,0x80,"%lo",x);
break;
@ -2011,7 +2011,7 @@ LPSTR __cdecl CRTDLL__ultoa(long x,LPSTR buf,INT radix)
break;
case 16: wsnprintfA(buf,0x80,"%lx",x);
break;
default: FIXME(crtdll, "radix %d not implemented !\n", radix);
default: FIXME("radix %d not implemented !\n", radix);
}
return buf;
}
@ -2023,7 +2023,7 @@ typedef VOID (*sig_handler_type)(VOID);
*/
VOID __cdecl CRTDLL_signal(int sig, sig_handler_type ptr)
{
FIXME(crtdll, "(%d %p):stub.\n", sig, ptr);
FIXME("(%d %p):stub.\n", sig, ptr);
}
/*********************************************************************
@ -2039,7 +2039,7 @@ LONG __cdecl CRTDLL__ftol(void) {
}
#else
LONG __cdecl CRTDLL__ftol(double fl) {
FIXME(crtdll,"should be register function\n");
FIXME("should be register function\n");
return (LONG)fl;
}
#endif
@ -2056,7 +2056,7 @@ LONG __cdecl CRTDLL__CIpow(void) {
}
#else
LONG __cdecl CRTDLL__CIpow(double x,double y) {
FIXME(crtdll,"should be register function\n");
FIXME("should be register function\n");
return pow(x,y);
}
#endif
@ -2066,7 +2066,7 @@ LONG __cdecl CRTDLL__CIpow(double x,double y) {
*/
VOID __cdecl CRTDLL__sleep(unsigned long timeout)
{
TRACE(crtdll,"CRTDLL__sleep for %ld milliseconds\n",timeout);
TRACE("CRTDLL__sleep for %ld milliseconds\n",timeout);
Sleep((timeout)?timeout:1);
}
@ -2091,7 +2091,7 @@ LPSTR __cdecl CRTDLL_getenv(const char *name)
if ((pp)&& (pos))
{
pp = pos+1;
TRACE(crtdll,"got %s\n",pp);
TRACE("got %s\n",pp);
}
FreeEnvironmentStringsA( environ );
return pp;
@ -2133,7 +2133,7 @@ INT __cdecl CRTDLL__memicmp(
*/
VOID __cdecl CRTDLL__dllonexit ()
{
FIXME(crtdll,"stub\n");
FIXME("stub\n");
}
/*********************************************************************
@ -2176,7 +2176,7 @@ INT __cdecl CRTDLL_wcstol(LPWSTR s,LPWSTR *end,INT base) {
* strdate (CRTDLL.283)
*/
LPSTR __cdecl CRTDLL__strdate (LPSTR date)
{ FIXME (crtdll,"%p stub\n", date);
{ FIXME("%p stub\n", date);
return 0;
}
@ -2184,6 +2184,6 @@ LPSTR __cdecl CRTDLL__strdate (LPSTR date)
* strtime (CRTDLL.299)
*/
LPSTR __cdecl CRTDLL__strtime (LPSTR date)
{ FIXME (crtdll,"%p stub\n", date);
{ FIXME("%p stub\n", date);
return 0;
}

210
misc/ddeml.c
View File

@ -16,7 +16,7 @@
#include "winerror.h"
#include "heap.h"
#include "shm_semaph.h"
#include "debug.h"
#include "debugtools.h"
#include "tchar.h"
#include "winnt.h"
@ -217,7 +217,7 @@ static void InsertHSZNode( HSZ hsz )
* so set the global list pointer to it.
*/
reference_inst->Node_list = pNew;
TRACE(ddeml,"HSZ node list entry added\n");
TRACE("HSZ node list entry added\n");
}
}
}
@ -245,12 +245,12 @@ static void InsertHSZNode( HSZ hsz )
{
if ( reference_inst->Instance_id == InstId )
{
TRACE(ddeml,"Instance entry found\n");
TRACE("Instance entry found\n");
return reference_inst;
}
reference_inst = reference_inst->Next_Entry;
}
TRACE(ddeml,"Instance entry missing\n");
TRACE("Instance entry missing\n");
return NULL;
}
@ -277,12 +277,12 @@ static void InsertHSZNode( HSZ hsz )
{
if ( reference_name->hsz == Service_Name )
{
TRACE(ddeml,"Service Name found\n");
TRACE("Service Name found\n");
return reference_name;
}
reference_name = reference_name->next;
}
TRACE(ddeml,"Service name missing\n");
TRACE("Service name missing\n");
return NULL;
}
@ -308,7 +308,7 @@ static DWORD Release_reserved_mutex (HANDLE mutex, LPSTR mutex_name, BOOL releas
ReleaseMutex(mutex);
if ( (err_no=GetLastError()) != 0 )
{
ERR(ddeml,"ReleaseMutex failed - %s mutex %li\n",mutex_name,err_no);
ERR("ReleaseMutex failed - %s mutex %li\n",mutex_name,err_no);
HeapFree(SystemHeap, 0, this_instance);
if ( release_handle_m )
{
@ -354,13 +354,13 @@ DWORD IncrementInstanceId()
}
if ( (err_no=GetLastError()) != 0 )
{
ERR(ddeml,"CreateMutex failed - inst_count %li\n",err_no);
ERR("CreateMutex failed - inst_count %li\n",err_no);
err_no=Release_reserved_mutex (handle_mutex,"handle_mutex",0,1);
return DMLERR_SYS_ERROR;
}
DDE_Max_Assigned_Instance++;
this_instance->Instance_id = DDE_Max_Assigned_Instance;
TRACE(ddeml,"New instance id %ld allocated\n",DDE_Max_Assigned_Instance);
TRACE("New instance id %ld allocated\n",DDE_Max_Assigned_Instance);
if (Release_reserved_mutex(inst_count_mutex,"instance_count",1,0)) return DMLERR_SYS_ERROR;
return DMLERR_NO_ERROR;
}
@ -462,7 +462,7 @@ void DdeReleaseAtom( DDE_HANDLE_ENTRY * reference_inst,HSZ hsz)
UINT16 WINAPI DdeInitialize16( LPDWORD pidInst, PFNCALLBACK16 pfnCallback,
DWORD afCmd, DWORD ulRes)
{
TRACE(ddeml,"DdeInitialize16 called - calling DdeInitializeA\n");
TRACE("DdeInitialize16 called - calling DdeInitializeA\n");
return (UINT16)DdeInitializeA(pidInst,(PFNCALLBACK)pfnCallback,
afCmd, ulRes);
}
@ -474,7 +474,7 @@ UINT16 WINAPI DdeInitialize16( LPDWORD pidInst, PFNCALLBACK16 pfnCallback,
UINT WINAPI DdeInitializeA( LPDWORD pidInst, PFNCALLBACK pfnCallback,
DWORD afCmd, DWORD ulRes )
{
TRACE(ddeml,"DdeInitializeA called - calling DdeInitializeW\n");
TRACE("DdeInitializeA called - calling DdeInitializeW\n");
return DdeInitializeW(pidInst,pfnCallback,afCmd,ulRes);
}
@ -516,8 +516,8 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
if( ulRes )
{
ERR(ddeml, "Reserved value not zero? What does this mean?\n");
FIXME(ddeml, "(%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback,
ERR("Reserved value not zero? What does this mean?\n");
FIXME("(%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback,
afCmd,ulRes);
/* trap this and no more until we know more */
return DMLERR_NO_ERROR;
@ -529,7 +529,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
/* can't set up the instance with nothing to act as a callback */
TRACE(ddeml,"No callback provided\n");
TRACE("No callback provided\n");
return DMLERR_INVALIDPARAMETER; /* might be DMLERR_DLL_USAGE */
}
@ -539,7 +539,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
if ( this_instance == NULL )
{
/* catastrophe !! warn user & abort */
ERR (ddeml, "Instance create failed - out of memory\n");
ERR("Instance create failed - out of memory\n");
return DMLERR_SYS_ERROR;
}
this_instance->Next_Entry = NULL;
@ -570,11 +570,11 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
==CBF_FAIL_ALLSVRXACTIONS;
}
TRACE(ddeml,"instance created - checking validity \n");
TRACE("instance created - checking validity \n");
if( *pidInst == 0 ) {
/* Initialisation of new Instance Identifier */
TRACE(ddeml,"new instance, callback %p flags %lX\n",pfnCallback,afCmd);
TRACE("new instance, callback %p flags %lX\n",pfnCallback,afCmd);
if ( DDE_Max_Assigned_Instance == 0 )
{
/* Nothing has been initialised - exit now ! can return TRUE since effect is the same */
@ -585,7 +585,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
handle_mutex = CreateMutexW(s_att,1,DDEHandleAccess);
if ( (err_no=GetLastError()) != 0 )
{
ERR(ddeml,"CreateMutex failed - handle list %li\n",err_no);
ERR("CreateMutex failed - handle list %li\n",err_no);
HeapFree(SystemHeap, 0, this_instance);
return DMLERR_SYS_ERROR;
}
@ -596,12 +596,12 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return DMLERR_SYS_ERROR;
}
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
if (DDE_Handle_Table_Base == NULL )
{
/* can't be another instance in this case, assign to the base pointer */
@ -617,14 +617,14 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
*/
this_instance->CBF_Flags=this_instance->CBF_Flags|APPCMD_FILTERINITS;
TRACE(ddeml,"First application instance detected OK\n");
TRACE("First application instance detected OK\n");
/* allocate new instance ID */
if ((err_no = IncrementInstanceId()) ) return err_no;
} else {
/* really need to chain the new one in to the latest here, but after checking conditions
* such as trying to start a conversation from an application trying to monitor */
reference_inst = DDE_Handle_Table_Base;
TRACE(ddeml,"Subsequent application instance - starting checks\n");
TRACE("Subsequent application instance - starting checks\n");
while ( reference_inst->Next_Entry != NULL )
{
/*
@ -667,23 +667,23 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
}
/* All cleared, add to chain */
TRACE(ddeml,"Application Instance checks finished\n");
TRACE("Application Instance checks finished\n");
if ((err_no = IncrementInstanceId())) return err_no;
if ( Release_reserved_mutex(handle_mutex,"handle_mutex",0,0)) return DMLERR_SYS_ERROR;
reference_inst->Next_Entry = this_instance;
}
*pidInst = this_instance->Instance_id;
TRACE(ddeml,"New application instance processing finished OK\n");
TRACE("New application instance processing finished OK\n");
} else {
/* Reinitialisation situation --- FIX */
TRACE(ddeml,"reinitialisation of (%p,%p,0x%lx,%ld): stub\n",pidInst,pfnCallback,afCmd,ulRes);
TRACE("reinitialisation of (%p,%p,0x%lx,%ld): stub\n",pidInst,pfnCallback,afCmd,ulRes);
WaitForSingleObject(handle_mutex,1000);
if ( (err_no=GetLastError()) != 0 )
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
HeapFree(SystemHeap, 0, this_instance);
return DMLERR_SYS_ERROR;
}
@ -769,7 +769,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
*/
BOOL16 WINAPI DdeUninitialize16( DWORD idInst )
{
FIXME(ddeml," stub calling DdeUninitialize\n");
FIXME(" stub calling DdeUninitialize\n");
return (BOOL16)DdeUninitialize( idInst );
}
@ -802,10 +802,10 @@ BOOL WINAPI DdeUninitialize( DWORD idInst )
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return DMLERR_SYS_ERROR;
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
/* First check instance
*/
this_instance = Find_Instance_Entry(idInst);
@ -817,7 +817,7 @@ BOOL WINAPI DdeUninitialize( DWORD idInst )
*/
return FALSE;
}
FIXME(ddeml, "(%ld): partial stub\n", idInst);
FIXME("(%ld): partial stub\n", idInst);
/* FIXME ++++++++++++++++++++++++++++++++++++++++++
* Needs to de-register all service names
@ -887,7 +887,7 @@ HCONVLIST WINAPI DdeConnectList16( DWORD idInst, HSZ hszService, HSZ hszTopic,
HCONVLIST WINAPI DdeConnectList( DWORD idInst, HSZ hszService, HSZ hszTopic,
HCONVLIST hConvList, LPCONVCONTEXT pCC )
{
FIXME(ddeml, "(%ld,%ld,%ld,%ld,%p): stub\n", idInst, hszService, hszTopic,
FIXME("(%ld,%ld,%ld,%ld,%p): stub\n", idInst, hszService, hszTopic,
hConvList,pCC);
return 1;
}
@ -907,7 +907,7 @@ HCONV WINAPI DdeQueryNextServer16( HCONVLIST hConvList, HCONV hConvPrev )
*/
HCONV WINAPI DdeQueryNextServer( HCONVLIST hConvList, HCONV hConvPrev )
{
FIXME(ddeml, "(%ld,%ld): stub\n",hConvList,hConvPrev);
FIXME("(%ld,%ld): stub\n",hConvList,hConvPrev);
return 0;
}
@ -929,7 +929,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT
DWORD ret = 0;
CHAR pString[MAX_BUFFER_LEN];
FIXME(ddeml,
FIXME(
"(%ld, 0x%lx, %p, %ld, %d): partial stub\n",
idInst,
hsz,
@ -947,11 +947,11 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
/* needs something for DdeGetLAstError even if the manual doesn't say so */
return FALSE;
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
/* First check instance
*/
@ -980,7 +980,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT
} else {
Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE);
}
TRACE(ddeml,"returning pointer\n");
TRACE("returning pointer\n");
return ret;
}
@ -1003,7 +1003,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN
WCHAR pString[MAX_BUFFER_LEN];
int factor = 1;
FIXME(ddeml,
FIXME(
"(%ld, 0x%lx, %p, %ld, %d): stub\n",
idInst,
hsz,
@ -1045,7 +1045,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN
DWORD WINAPI DdeQueryString16(DWORD idInst, HSZ hsz, LPSTR lpsz, DWORD cchMax, int codepage)
{
FIXME(ddeml,"(%ld, 0x%lx, %p, %ld, %d): stub \n",
FIXME("(%ld, 0x%lx, %p, %ld, %d): stub \n",
idInst,
hsz,
lpsz,
@ -1074,7 +1074,7 @@ BOOL16 WINAPI DdeDisconnectList16( HCONVLIST hConvList )
BOOL WINAPI DdeDisconnectList(
HCONVLIST hConvList) /* [in] Handle to conversation list */
{
FIXME(ddeml, "(%ld): stub\n", hConvList);
FIXME("(%ld): stub\n", hConvList);
return TRUE;
}
@ -1085,7 +1085,7 @@ BOOL WINAPI DdeDisconnectList(
HCONV WINAPI DdeConnect16( DWORD idInst, HSZ hszService, HSZ hszTopic,
LPCONVCONTEXT16 pCC )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return 0;
}
@ -1096,7 +1096,7 @@ HCONV WINAPI DdeConnect16( DWORD idInst, HSZ hszService, HSZ hszTopic,
HCONV WINAPI DdeConnect( DWORD idInst, HSZ hszService, HSZ hszTopic,
LPCONVCONTEXT pCC )
{
FIXME(ddeml, "(0x%lx,%ld,%ld,%p): stub\n",idInst,hszService,hszTopic,
FIXME("(0x%lx,%ld,%ld,%p): stub\n",idInst,hszService,hszTopic,
pCC);
return 0;
}
@ -1115,7 +1115,7 @@ BOOL16 WINAPI DdeDisconnect16( HCONV hConv )
*/
BOOL16 WINAPI DdeSetUserHandle16( HCONV hConv, DWORD id, DWORD hUser )
{
FIXME( ddeml, "(%ld,%ld,%ld): stub\n",hConv,id, hUser );
FIXME("(%ld,%ld,%ld): stub\n",hConv,id, hUser );
return 0;
}
@ -1142,7 +1142,7 @@ HDDEDATA WINAPI DdeCreateDataHandle( DWORD idInst, LPBYTE pSrc, DWORD cb,
DWORD cbOff, HSZ hszItem, UINT wFmt,
UINT afCmd )
{
FIXME( ddeml,
FIXME(
"(%ld,%p,%ld,%ld,0x%lx,%d,%d): stub\n",
idInst,
pSrc,
@ -1160,7 +1160,7 @@ HDDEDATA WINAPI DdeCreateDataHandle( DWORD idInst, LPBYTE pSrc, DWORD cb,
*/
BOOL WINAPI DdeDisconnect( HCONV hConv )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return 0;
}
@ -1170,7 +1170,7 @@ BOOL WINAPI DdeDisconnect( HCONV hConv )
*/
HCONV WINAPI DdeReconnect( HCONV hConv )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return 0;
}
@ -1194,7 +1194,7 @@ HSZ WINAPI DdeCreateStringHandle16( DWORD idInst, LPCSTR str, INT16 codepage )
{
return DdeCreateStringHandleA( idInst, str, codepage );
} else {
TRACE(ddeml,"Default codepage supplied\n");
TRACE("Default codepage supplied\n");
return DdeCreateStringHandleA( idInst, str, CP_WINANSI);
}
}
@ -1220,7 +1220,7 @@ HSZ WINAPI DdeCreateStringHandle16( DWORD idInst, LPCSTR str, INT16 codepage )
HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage )
{
HSZ hsz = 0;
TRACE(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_a(psz),codepage);
TRACE("(%ld,%s,%d): partial stub\n",idInst,debugstr_a(psz),codepage);
if ( DDE_Max_Assigned_Instance == 0 )
@ -1233,10 +1233,10 @@ HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage )
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return DMLERR_SYS_ERROR;
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
/* First check instance
*/
@ -1256,19 +1256,19 @@ HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage )
/* Save the handle so we know to clean it when
* uninitialize is called.
*/
TRACE(ddeml,"added atom %s with HSZ 0x%lx, \n",debugstr_a(psz),hsz);
TRACE("added atom %s with HSZ 0x%lx, \n",debugstr_a(psz),hsz);
InsertHSZNode( hsz );
if ( Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE))
{
reference_inst->Last_Error = DMLERR_SYS_ERROR;
return 0;
}
TRACE(ddeml,"Returning pointer\n");
TRACE("Returning pointer\n");
return hsz;
} else {
Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE);
}
TRACE(ddeml,"Returning error\n");
TRACE("Returning error\n");
return 0;
}
@ -1297,7 +1297,7 @@ HSZ WINAPI DdeCreateStringHandleW(
{
HSZ hsz = 0;
TRACE(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage);
TRACE("(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage);
if ( DDE_Max_Assigned_Instance == 0 )
@ -1310,10 +1310,10 @@ HSZ WINAPI DdeCreateStringHandleW(
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return DMLERR_SYS_ERROR;
}
TRACE(ddeml,"CreateString - Handle Mutex created/reserved\n");
TRACE("CreateString - Handle Mutex created/reserved\n");
/* First check instance
*/
@ -1327,7 +1327,7 @@ HSZ WINAPI DdeCreateStringHandleW(
return 0;
}
FIXME(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage);
FIXME("(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage);
if (codepage==CP_WINUNICODE)
/*
@ -1344,12 +1344,12 @@ HSZ WINAPI DdeCreateStringHandleW(
reference_inst->Last_Error = DMLERR_SYS_ERROR;
return 0;
}
TRACE(ddeml,"Returning pointer\n");
TRACE("Returning pointer\n");
return hsz;
} else {
Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE);
}
TRACE(ddeml,"Returning error\n");
TRACE("Returning error\n");
return 0;
}
@ -1359,7 +1359,7 @@ HSZ WINAPI DdeCreateStringHandleW(
*/
BOOL16 WINAPI DdeFreeStringHandle16( DWORD idInst, HSZ hsz )
{
FIXME(ddeml,"idInst %ld hsz 0x%lx\n",idInst,hsz);
FIXME("idInst %ld hsz 0x%lx\n",idInst,hsz);
return (BOOL)DdeFreeStringHandle( idInst, hsz );
}
@ -1381,7 +1381,7 @@ BOOL16 WINAPI DdeFreeStringHandle16( DWORD idInst, HSZ hsz )
*/
BOOL WINAPI DdeFreeStringHandle( DWORD idInst, HSZ hsz )
{
TRACE(ddeml, "(%ld,%ld): \n",idInst,hsz);
TRACE("(%ld,%ld): \n",idInst,hsz);
if ( DDE_Max_Assigned_Instance == 0 )
{
/* Nothing has been initialised - exit now ! can return TRUE since effect is the same */
@ -1390,17 +1390,17 @@ BOOL WINAPI DdeFreeStringHandle( DWORD idInst, HSZ hsz )
if ( ( prev_err = GetLastError()) != 0 )
{
/* something earlier failed !! */
ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err);
ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err);
}
WaitForSingleObject(handle_mutex,1000);
if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err ))
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return DMLERR_SYS_ERROR;
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
/* First check instance
*/
@ -1437,7 +1437,7 @@ BOOL16 WINAPI DdeFreeDataHandle16( HDDEDATA hData )
*/
BOOL WINAPI DdeFreeDataHandle( HDDEDATA hData )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return TRUE;
}
@ -1472,7 +1472,7 @@ BOOL16 WINAPI DdeKeepStringHandle16( DWORD idInst, HSZ hsz )
BOOL WINAPI DdeKeepStringHandle( DWORD idInst, HSZ hsz )
{
TRACE(ddeml, "(%ld,%ld): \n",idInst,hsz);
TRACE("(%ld,%ld): \n",idInst,hsz);
if ( DDE_Max_Assigned_Instance == 0 )
{
/* Nothing has been initialised - exit now ! can return FALSE since effect is the same */
@ -1481,17 +1481,17 @@ BOOL WINAPI DdeKeepStringHandle( DWORD idInst, HSZ hsz )
if ( ( prev_err = GetLastError()) != 0 )
{
/* something earlier failed !! */
ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err);
ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err);
}
WaitForSingleObject(handle_mutex,1000);
if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err ))
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return FALSE;
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
/* First check instance
*/
@ -1530,7 +1530,7 @@ HDDEDATA WINAPI DdeClientTransaction( LPBYTE pData, DWORD cbData,
UINT wType, DWORD dwTimeout,
LPDWORD pdwResult )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return 0;
}
@ -1542,7 +1542,7 @@ HDDEDATA WINAPI DdeClientTransaction( LPBYTE pData, DWORD cbData,
BOOL16 WINAPI DdeAbandonTransaction16( DWORD idInst, HCONV hConv,
DWORD idTransaction )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return TRUE;
}
@ -1562,7 +1562,7 @@ BOOL16 WINAPI DdeAbandonTransaction16( DWORD idInst, HCONV hConv,
BOOL WINAPI DdeAbandonTransaction( DWORD idInst, HCONV hConv,
DWORD idTransaction )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return TRUE;
}
@ -1587,7 +1587,7 @@ BOOL WINAPI DdePostAdvise(
HSZ hszTopic, /* [in] Handle to topic name string */
HSZ hszItem) /* [in] Handle to item name string */
{
FIXME(ddeml, "(%ld,%ld,%ld): stub\n",idInst,hszTopic,hszItem);
FIXME("(%ld,%ld,%ld): stub\n",idInst,hszTopic,hszItem);
return TRUE;
}
@ -1598,7 +1598,7 @@ BOOL WINAPI DdePostAdvise(
HDDEDATA WINAPI DdeAddData16( HDDEDATA hData, LPBYTE pSrc, DWORD cb,
DWORD cbOff )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return 0;
}
@ -1617,7 +1617,7 @@ HDDEDATA WINAPI DdeAddData16( HDDEDATA hData, LPBYTE pSrc, DWORD cb,
HDDEDATA WINAPI DdeAddData( HDDEDATA hData, LPBYTE pSrc, DWORD cb,
DWORD cbOff )
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return 0;
}
@ -1637,7 +1637,7 @@ HDDEDATA WINAPI DdeAddData( HDDEDATA hData, LPBYTE pSrc, DWORD cb,
BOOL WINAPI DdeImpersonateClient( HCONV hConv)
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return TRUE;
}
@ -1658,7 +1658,7 @@ BOOL WINAPI DdeImpersonateClient( HCONV hConv)
BOOL WINAPI DdeSetQualityOfService( HWND hwndClient, CONST SECURITY_QUALITY_OF_SERVICE *pqosNew,
PSECURITY_QUALITY_OF_SERVICE pqosPrev)
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return TRUE;
}
@ -1677,7 +1677,7 @@ BOOL WINAPI DdeSetQualityOfService( HWND hwndClient, CONST SECURITY_QUALITY_OF_S
BOOL WINAPI DdeSetUserHandle( HCONV hConv, DWORD id, DWORD hUser)
{
FIXME( ddeml, "empty stub\n" );
FIXME("empty stub\n" );
return TRUE;
}
@ -1693,7 +1693,7 @@ DWORD WINAPI DdeGetData(
DWORD cbMax, /* [in] Amount of data to copy */
DWORD cbOff) /* [in] Offset to beginning of data */
{
FIXME(ddeml, "(%ld,%p,%ld,%ld): stub\n",hData,pDst,cbMax,cbOff);
FIXME("(%ld,%p,%ld,%ld): stub\n",hData,pDst,cbMax,cbOff);
return cbMax;
}
@ -1724,7 +1724,7 @@ LPBYTE WINAPI DdeAccessData16( HDDEDATA hData, LPDWORD pcbDataSize )
*/
LPBYTE WINAPI DdeAccessData( HDDEDATA hData, LPDWORD pcbDataSize )
{
FIXME( ddeml, "(%ld,%p): stub\n", hData, pcbDataSize);
FIXME("(%ld,%p): stub\n", hData, pcbDataSize);
return 0;
}
@ -1741,7 +1741,7 @@ BOOL16 WINAPI DdeUnaccessData16( HDDEDATA hData )
*/
BOOL WINAPI DdeUnaccessData( HDDEDATA hData )
{
FIXME( ddeml, "(0x%lx): stub\n", hData);
FIXME("(0x%lx): stub\n", hData);
return 0;
}
@ -1759,7 +1759,7 @@ BOOL16 WINAPI DdeEnableCallback16( DWORD idInst, HCONV hConv, UINT16 wCmd )
*/
BOOL WINAPI DdeEnableCallback( DWORD idInst, HCONV hConv, UINT wCmd )
{
FIXME( ddeml, "(%ld, 0x%lx, %d) stub\n", idInst, hConv, wCmd);
FIXME("(%ld, 0x%lx, %d) stub\n", idInst, hConv, wCmd);
return 0;
}
@ -1808,7 +1808,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
CHAR SNameBuffer[MAX_BUFFER_LEN];
UINT rcode;
this_service = NULL;
FIXME(ddeml, "(%ld,%ld,%ld,%d): stub\n",idInst,hsz1,hsz2,afCmd);
FIXME("(%ld,%ld,%ld,%d): stub\n",idInst,hsz1,hsz2,afCmd);
if ( DDE_Max_Assigned_Instance == 0 )
{
/* Nothing has been initialised - exit now !
@ -1820,10 +1820,10 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return DMLERR_SYS_ERROR;
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
/* First check instance
*/
@ -1831,7 +1831,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
this_instance = reference_inst;
if (reference_inst == NULL)
{
TRACE(ddeml,"Instance not found as initialised\n");
TRACE("Instance not found as initialised\n");
if ( Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE)) return TRUE;
/* Nothing has been initialised - exit now ! can return TRUE since effect is the same */
return FALSE;
@ -1844,7 +1844,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
*/
reference_inst->Last_Error = DMLERR_INVALIDPARAMETER;
Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE);
FIXME(ddeml,"Reserved parameter no-zero !!\n");
FIXME("Reserved parameter no-zero !!\n");
return FALSE;
}
if ( hsz1 == 0L )
@ -1857,7 +1857,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
/* don't know if we should check this but it makes sense
* why supply REGISTER or filter flags if de-registering all
*/
TRACE(ddeml,"General unregister unexpected flags\n");
TRACE("General unregister unexpected flags\n");
reference_inst->Last_Error = DMLERR_DLL_USAGE;
Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE);
return FALSE;
@ -1868,7 +1868,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
{
/* None to unregister !!
*/
TRACE(ddeml,"General de-register - nothing registered\n");
TRACE("General de-register - nothing registered\n");
reference_inst->Last_Error = DMLERR_DLL_USAGE;
Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE);
return FALSE;
@ -1883,12 +1883,12 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */
}
HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */
TRACE(ddeml,"General de-register - finished\n");
TRACE("General de-register - finished\n");
}
Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE);
return TRUE;
}
TRACE(ddeml,"Specific name action detected\n");
TRACE("Specific name action detected\n");
reference_service = Find_Service_Name(hsz1,reference_inst);
if (( Cmd_flags && DNS_REGISTER ) == DNS_REGISTER )
{
@ -1905,7 +1905,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
{
/* easy one - nothing else there
*/
TRACE(ddeml,"Adding 1st service name\n");
TRACE("Adding 1st service name\n");
reference_inst->ServiceNames = this_service;
GlobalAddAtomA(SNameBuffer);
} else
@ -1918,12 +1918,12 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
* what do we do ?
*/
HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */
FIXME(ddeml,"Trying to register already registered service !!\n");
FIXME("Trying to register already registered service !!\n");
} else
{
/* Add this one into the chain
*/
TRACE(ddeml,"Adding subsequent service name\n");
TRACE("Adding subsequent service name\n");
this_service->next = reference_inst->ServiceNames;
reference_inst->ServiceNames = this_service;
GlobalAddAtomA(SNameBuffer);
@ -1949,7 +1949,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
/* Service name not registered !!
* what do we do ?
*/
FIXME(ddeml,"Trying to de-register unregistered service !!\n");
FIXME("Trying to de-register unregistered service !!\n");
} else
{
/* Delete this one from the chain
@ -2049,7 +2049,7 @@ UINT16 WINAPI DdeGetLastError16( DWORD idInst )
UINT WINAPI DdeGetLastError( DWORD idInst )
{
DWORD error_code;
FIXME(ddeml, "(%ld): stub\n",idInst);
FIXME("(%ld): stub\n",idInst);
if ( DDE_Max_Assigned_Instance == 0 )
{
/* Nothing has been initialised - exit now ! */
@ -2058,17 +2058,17 @@ UINT WINAPI DdeGetLastError( DWORD idInst )
if ( ( prev_err = GetLastError()) != 0 )
{
/* something earlier failed !! */
ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err);
ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err);
}
WaitForSingleObject(handle_mutex,1000);
if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err ))
{
/* FIXME - needs refinement with popup for timeout, also is timeout interval OK */
ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no);
ERR("WaitForSingleObject failed - handle list %li\n",err_no);
return DMLERR_SYS_ERROR;
}
TRACE(ddeml,"Handle Mutex created/reserved\n");
TRACE("Handle Mutex created/reserved\n");
/* First check instance
*/
@ -2113,7 +2113,7 @@ int WINAPI DdeCmpStringHandles( HSZ hsz1, HSZ hsz2 )
int ret = 0;
int ret1, ret2;
TRACE( ddeml, "handle 1, handle 2\n" );
TRACE("handle 1, handle 2\n" );
ret1 = GlobalGetAtomNameA( hsz1, psz1, MAX_BUFFER_LEN );
ret2 = GlobalGetAtomNameA( hsz2, psz2, MAX_BUFFER_LEN );
@ -2169,7 +2169,7 @@ int WINAPI DdeCmpStringHandles( HSZ hsz1, HSZ hsz2 )
*/
UINT WINAPI PackDDElParam(UINT msg, UINT uiLo, UINT uiHi)
{
FIXME(ddeml, "stub.\n");
FIXME("stub.\n");
return 0;
}
@ -2184,7 +2184,7 @@ UINT WINAPI PackDDElParam(UINT msg, UINT uiLo, UINT uiHi)
UINT WINAPI UnpackDDElParam(UINT msg, UINT lParam,
UINT *uiLo, UINT *uiHi)
{
FIXME(ddeml, "stub.\n");
FIXME("stub.\n");
return 0;
}
@ -2198,7 +2198,7 @@ UINT WINAPI UnpackDDElParam(UINT msg, UINT lParam,
*/
UINT WINAPI FreeDDElParam(UINT msg, UINT lParam)
{
FIXME(ddeml, "stub.\n");
FIXME("stub.\n");
return 0;
}
@ -2209,7 +2209,7 @@ UINT WINAPI FreeDDElParam(UINT msg, UINT lParam)
UINT WINAPI ReuseDDElParam(UINT lParam, UINT msgIn, UINT msgOut,
UINT uiLi, UINT uiHi)
{
FIXME(ddeml, "stub.\n");
FIXME("stub.\n");
return 0;
}
@ -2219,7 +2219,7 @@ UINT WINAPI ReuseDDElParam(UINT lParam, UINT msgIn, UINT msgOut,
*/
UINT16 WINAPI DdeQueryConvInfo16( HCONV hconv, DWORD idTransaction , LPCONVINFO16 lpConvInfo)
{
FIXME(ddeml,"stub.\n");
FIXME("stub.\n");
return 0;
}
@ -2230,6 +2230,6 @@ UINT16 WINAPI DdeQueryConvInfo16( HCONV hconv, DWORD idTransaction , LPCONVINFO1
*/
UINT WINAPI DdeQueryConvInfo( HCONV hconv, DWORD idTransaction , LPCONVINFO lpConvInfo)
{
FIXME(ddeml,"stub.\n");
FIXME("stub.\n");
return 0;
}

6
misc/error.c
View File

@ -9,7 +9,7 @@
#include "windef.h"
#include "stackframe.h"
#include "debug.h"
#include "debugtools.h"
#define ErrorString(manifest) { manifest, # manifest }
@ -140,7 +140,7 @@ static const char *GetParamErrorString(UINT16 uErr) {
*/
VOID WINAPI LogError16(UINT16 uErr, LPVOID lpvInfo)
{
MSG("(%s, %p)\n", GetErrorString(uErr), lpvInfo);
MESSAGE("(%s, %p)\n", GetErrorString(uErr), lpvInfo);
}
@ -152,7 +152,7 @@ void WINAPI LogParamError16(UINT16 uErr, FARPROC16 lpfn, LPVOID lpvParam)
/* FIXME: is it possible to get the module name/function
* from the lpfn param?
*/
MSG("(%s, %p, %p)\n", GetParamErrorString(uErr), lpfn, lpvParam);
MESSAGE("(%s, %p, %p)\n", GetParamErrorString(uErr), lpfn, lpvParam);
}
/***********************************************************************

122
misc/imm.c
View File

@ -8,7 +8,7 @@
#include "winuser.h"
#include "winerror.h"
#include "windef.h"
#include "debug.h"
#include "debugtools.h"
#include "winversion.h"
#include "imm.h"
@ -19,7 +19,7 @@ DEFAULT_DEBUG_CHANNEL(imm)
*/
HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
{
FIXME(imm, "(0x%08x, 0x%08x): stub\n",hWnd,hIMC);
FIXME("(0x%08x, 0x%08x): stub\n",hWnd,hIMC);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return (HIMC)NULL;
}
@ -30,7 +30,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
BOOL WINAPI ImmConfigureIMEA(
HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
{
FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n",
FIXME("(0x%08x, 0x%08x, %ld, %p): stub\n",
hKL, hWnd, dwMode, lpData
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -43,7 +43,7 @@ BOOL WINAPI ImmConfigureIMEA(
BOOL WINAPI ImmConfigureIMEW(
HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
{
FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n",
FIXME("(0x%08x, 0x%08x, %ld, %p): stub\n",
hKL, hWnd, dwMode, lpData
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -55,7 +55,7 @@ BOOL WINAPI ImmConfigureIMEW(
*/
HIMC WINAPI ImmCreateContext()
{
FIXME(imm, "(): stub\n");
FIXME("(): stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return (HIMC)NULL;
}
@ -65,7 +65,7 @@ HIMC WINAPI ImmCreateContext()
*/
BOOL WINAPI ImmDestroyContext(HIMC hIMC)
{
FIXME(imm, "(0x%08x): stub\n",hIMC);
FIXME("(0x%08x): stub\n",hIMC);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -78,7 +78,7 @@ UINT WINAPI ImmEnumRegisterWordA(
LPCSTR lpszReading, DWORD dwStyle,
LPCSTR lpszRegister, LPVOID lpData)
{
FIXME(imm, "(0x%08x, %p, %s, %ld, %s, %p): stub\n",
FIXME("(0x%08x, %p, %s, %ld, %s, %p): stub\n",
hKL, lpfnEnumProc,
debugstr_a(lpszReading), dwStyle,
debugstr_a(lpszRegister), lpData
@ -95,7 +95,7 @@ UINT WINAPI ImmEnumRegisterWordW(
LPCWSTR lpszReading, DWORD dwStyle,
LPCWSTR lpszRegister, LPVOID lpData)
{
FIXME(imm, "(0x%08x, %p, %s, %ld, %s, %p): stub\n",
FIXME("(0x%08x, %p, %s, %ld, %s, %p): stub\n",
hKL, lpfnEnumProc,
debugstr_w(lpszReading), dwStyle,
debugstr_w(lpszRegister), lpData
@ -111,7 +111,7 @@ LRESULT WINAPI ImmEscapeA(
HKL hKL, HIMC hIMC,
UINT uEscape, LPVOID lpData)
{
FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n",
FIXME("(0x%08x, 0x%08x, %d, %p): stub\n",
hKL, hIMC, uEscape, lpData
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -125,7 +125,7 @@ LRESULT WINAPI ImmEscapeW(
HKL hKL, HIMC hIMC,
UINT uEscape, LPVOID lpData)
{
FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n",
FIXME("(0x%08x, 0x%08x, %d, %p): stub\n",
hKL, hIMC, uEscape, lpData
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -139,7 +139,7 @@ DWORD WINAPI ImmGetCandidateListA(
HIMC hIMC, DWORD deIndex,
LPCANDIDATELIST lpCandList, DWORD dwBufLen)
{
FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
FIXME("(0x%08x, %ld, %p, %ld): stub\n",
hIMC, deIndex,
lpCandList, dwBufLen
);
@ -153,7 +153,7 @@ DWORD WINAPI ImmGetCandidateListA(
DWORD WINAPI ImmGetCandidateListCountA(
HIMC hIMC, LPDWORD lpdwListCount)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount);
FIXME("(0x%08x, %p): stub\n", hIMC, lpdwListCount);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
@ -164,7 +164,7 @@ DWORD WINAPI ImmGetCandidateListCountA(
DWORD WINAPI ImmGetCandidateListCountW(
HIMC hIMC, LPDWORD lpdwListCount)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount);
FIXME("(0x%08x, %p): stub\n", hIMC, lpdwListCount);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
@ -176,7 +176,7 @@ DWORD WINAPI ImmGetCandidateListW(
HIMC hIMC, DWORD deIndex,
LPCANDIDATELIST lpCandList, DWORD dwBufLen)
{
FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
FIXME("(0x%08x, %ld, %p, %ld): stub\n",
hIMC, deIndex,
lpCandList, dwBufLen
);
@ -190,7 +190,7 @@ DWORD WINAPI ImmGetCandidateListW(
BOOL WINAPI ImmGetCandidateWindow(
HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate)
{
FIXME(imm, "(0x%08x, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate);
FIXME("(0x%08x, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -200,7 +200,7 @@ BOOL WINAPI ImmGetCandidateWindow(
*/
BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
FIXME("(0x%08x, %p): stub\n", hIMC, lplf);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -210,7 +210,7 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
*/
BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
FIXME("(0x%08x, %p): stub\n", hIMC, lplf);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -221,14 +221,14 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf)
LONG WINAPI ImmGetCompositionStringA(
HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen)
{
FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
FIXME("(0x%08x, %ld, %p, %ld): stub\n",
hIMC, dwIndex, lpBuf, dwBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
switch(VERSION_GetVersion())
{
default:
FIXME(imm, "%s not supported",VERSION_GetVersionName());
FIXME("%s not supported",VERSION_GetVersionName());
case WIN95:
return 0xffffffff;
case NT40:
@ -243,14 +243,14 @@ LONG WINAPI ImmGetCompositionStringW(
HIMC hIMC, DWORD dwIndex,
LPVOID lpBuf, DWORD dwBufLen)
{
FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
FIXME("(0x%08x, %ld, %p, %ld): stub\n",
hIMC, dwIndex, lpBuf, dwBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
switch(VERSION_GetVersion())
{
default:
FIXME(imm, "%s not supported",VERSION_GetVersionName());
FIXME("%s not supported",VERSION_GetVersionName());
case WIN95:
return 0xffffffff;
case NT40:
@ -263,7 +263,7 @@ LONG WINAPI ImmGetCompositionStringW(
*/
BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm);
FIXME("(0x%08x, %p): stub\n", hIMC, lpCompForm);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
@ -273,7 +273,7 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm)
*/
HIMC WINAPI ImmGetContext(HWND hWnd)
{
FIXME(imm, "(0x%08x): stub\n", hWnd);
FIXME("(0x%08x): stub\n", hWnd);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return (HIMC)NULL;
}
@ -286,7 +286,7 @@ DWORD WINAPI ImmGetConversionListA(
LPCSTR pSrc, LPCANDIDATELIST lpDst,
DWORD dwBufLen, UINT uFlag)
{
FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n",
FIXME("(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n",
hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -301,7 +301,7 @@ DWORD WINAPI ImmGetConversionListW(
LPCWSTR pSrc, LPCANDIDATELIST lpDst,
DWORD dwBufLen, UINT uFlag)
{
FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n",
FIXME("(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n",
hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -314,7 +314,7 @@ DWORD WINAPI ImmGetConversionListW(
BOOL WINAPI ImmGetConversionStatus(
HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence)
{
FIXME(imm, "(0x%08x, %p, %p): stub\n",
FIXME("(0x%08x, %p, %p): stub\n",
hIMC, lpfdwConversion, lpfdwSentence
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -326,7 +326,7 @@ BOOL WINAPI ImmGetConversionStatus(
*/
HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
{
FIXME(imm, "(0x%08x): stub\n", hWnd);
FIXME("(0x%08x): stub\n", hWnd);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return (HWND)NULL;
}
@ -337,7 +337,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
UINT WINAPI ImmGetDescriptionA(
HKL hKL, LPSTR lpszDescription, UINT uBufLen)
{
FIXME(imm, "(0x%08x, %s, %d): stub\n",
FIXME("(0x%08x, %s, %d): stub\n",
hKL, debugstr_a(lpszDescription), uBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -349,7 +349,7 @@ UINT WINAPI ImmGetDescriptionA(
*/
UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen)
{
FIXME(imm, "(0x%08x, %s, %d): stub\n",
FIXME("(0x%08x, %s, %d): stub\n",
hKL, debugstr_w(lpszDescription), uBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -362,7 +362,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen)
DWORD WINAPI ImmGetGuideLineA(
HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen)
{
FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n",
FIXME("(0x%08x, %ld, %s, %ld): stub\n",
hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -374,7 +374,7 @@ DWORD WINAPI ImmGetGuideLineA(
*/
DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen)
{
FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n",
FIXME("(0x%08x, %ld, %s, %ld): stub\n",
hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -387,7 +387,7 @@ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBu
UINT WINAPI ImmGetIMEFileNameA(
HKL hKL, LPSTR lpszFileName, UINT uBufLen)
{
FIXME(imm, "(0x%08x, %s, %d): stub\n",
FIXME("(0x%08x, %s, %d): stub\n",
hKL, debugstr_a(lpszFileName), uBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -400,7 +400,7 @@ UINT WINAPI ImmGetIMEFileNameA(
UINT WINAPI ImmGetIMEFileNameW(
HKL hKL, LPWSTR lpszFileName, UINT uBufLen)
{
FIXME(imm, "(0x%08x, %s, %d): stub\n",
FIXME("(0x%08x, %s, %d): stub\n",
hKL, debugstr_w(lpszFileName), uBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -412,7 +412,7 @@ UINT WINAPI ImmGetIMEFileNameW(
*/
BOOL WINAPI ImmGetOpenStatus(HIMC hIMC)
{
FIXME(imm, "(0x%08x): stub\n", hIMC);
FIXME("(0x%08x): stub\n", hIMC);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -422,7 +422,7 @@ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC)
*/
DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex)
{
FIXME(imm, "(0x%08x, %ld): stub\n", hKL, fdwIndex);
FIXME("(0x%08x, %ld): stub\n", hKL, fdwIndex);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
@ -433,7 +433,7 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex)
UINT WINAPI ImmGetRegisterWordStyleA(
HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf)
{
FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf);
FIXME("(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
@ -444,7 +444,7 @@ UINT WINAPI ImmGetRegisterWordStyleA(
UINT WINAPI ImmGetRegisterWordStyleW(
HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf)
{
FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf);
FIXME("(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
@ -454,7 +454,7 @@ UINT WINAPI ImmGetRegisterWordStyleW(
*/
BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos);
FIXME("(0x%08x, %p): stub\n", hIMC, lpptPos);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -464,12 +464,12 @@ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos)
*/
UINT WINAPI ImmGetVirtualKey(HWND hWnd)
{
FIXME(imm, "(0x%08x): stub\n", hWnd);
FIXME("(0x%08x): stub\n", hWnd);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
switch(VERSION_GetVersion())
{
default:
FIXME(imm, "%s not supported", VERSION_GetVersionName());
FIXME("%s not supported", VERSION_GetVersionName());
case WIN95:
return VK_PROCESSKEY;
case NT40:
@ -483,7 +483,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd)
HKL WINAPI ImmInstallIMEA(
LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText)
{
FIXME(imm, "(%s, %s): stub\n",
FIXME("(%s, %s): stub\n",
debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -496,7 +496,7 @@ HKL WINAPI ImmInstallIMEA(
HKL WINAPI ImmInstallIMEW(
LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText)
{
FIXME(imm, "(%s, %s): stub\n",
FIXME("(%s, %s): stub\n",
debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -508,7 +508,7 @@ HKL WINAPI ImmInstallIMEW(
*/
BOOL WINAPI ImmIsIME(HKL hKL)
{
FIXME(imm, "(0x%08x): stub\n", hKL);
FIXME("(0x%08x): stub\n", hKL);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -519,7 +519,7 @@ BOOL WINAPI ImmIsIME(HKL hKL)
BOOL WINAPI ImmIsUIMessageA(
HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam)
{
FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n",
FIXME("(0x%08x, %d, %d, %ld): stub\n",
hWndIME, msg, wParam, lParam
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -532,7 +532,7 @@ BOOL WINAPI ImmIsUIMessageA(
BOOL WINAPI ImmIsUIMessageW(
HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam)
{
FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n",
FIXME("(0x%08x, %d, %d, %ld): stub\n",
hWndIME, msg, wParam, lParam
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -545,7 +545,7 @@ BOOL WINAPI ImmIsUIMessageW(
BOOL WINAPI ImmNotifyIME(
HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
{
FIXME(imm, "(0x%08x, %ld, %ld, %ld): stub\n",
FIXME("(0x%08x, %ld, %ld, %ld): stub\n",
hIMC, dwAction, dwIndex, dwValue
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -558,7 +558,7 @@ BOOL WINAPI ImmNotifyIME(
BOOL WINAPI ImmRegisterWordA(
HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister)
{
FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
FIXME("(0x%08x, %s, %ld, %s): stub\n",
hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -571,7 +571,7 @@ BOOL WINAPI ImmRegisterWordA(
BOOL WINAPI ImmRegisterWordW(
HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
{
FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
FIXME("(0x%08x, %s, %ld, %s): stub\n",
hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -583,7 +583,7 @@ BOOL WINAPI ImmRegisterWordW(
*/
BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC)
{
FIXME(imm, "(0x%08x, 0x%08x): stub\n", hWnd, hIMC);
FIXME("(0x%08x, 0x%08x): stub\n", hWnd, hIMC);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -594,7 +594,7 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC)
BOOL WINAPI ImmSetCandidateWindow(
HIMC hIMC, LPCANDIDATEFORM lpCandidate)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCandidate);
FIXME("(0x%08x, %p): stub\n", hIMC, lpCandidate);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -604,7 +604,7 @@ BOOL WINAPI ImmSetCandidateWindow(
*/
BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
FIXME("(0x%08x, %p): stub\n", hIMC, lplf);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -614,7 +614,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
*/
BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
FIXME("(0x%08x, %p): stub\n", hIMC, lplf);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -627,7 +627,7 @@ BOOL WINAPI ImmSetCompositionStringA(
LPCVOID lpComp, DWORD dwCompLen,
LPCVOID lpRead, DWORD dwReadLen)
{
FIXME(imm, "(0x%08x, %ld, %p, %ld, %p, %ld): stub\n",
FIXME("(0x%08x, %ld, %p, %ld, %p, %ld): stub\n",
hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -642,7 +642,7 @@ BOOL WINAPI ImmSetCompositionStringW(
LPCVOID lpComp, DWORD dwCompLen,
LPCVOID lpRead, DWORD dwReadLen)
{
FIXME(imm, "(0x%08x, %ld, %p, %ld, %p, %ld): stub\n",
FIXME("(0x%08x, %ld, %p, %ld, %p, %ld): stub\n",
hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -655,7 +655,7 @@ BOOL WINAPI ImmSetCompositionStringW(
BOOL WINAPI ImmSetCompositionWindow(
HIMC hIMC, LPCOMPOSITIONFORM lpCompForm)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm);
FIXME("(0x%08x, %p): stub\n", hIMC, lpCompForm);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -666,7 +666,7 @@ BOOL WINAPI ImmSetCompositionWindow(
BOOL WINAPI ImmSetConversionStatus(
HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence)
{
FIXME(imm, "(0x%08x, %ld, %ld): stub\n",
FIXME("(0x%08x, %ld, %ld): stub\n",
hIMC, fdwConversion, fdwSentence
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -678,7 +678,7 @@ BOOL WINAPI ImmSetConversionStatus(
*/
BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen)
{
FIXME(imm, "(0x%08x, %d): stub\n", hIMC, fOpen);
FIXME("(0x%08x, %d): stub\n", hIMC, fOpen);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -688,7 +688,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen)
*/
BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos)
{
FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos);
FIXME("(0x%08x, %p): stub\n", hIMC, lpptPos);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -698,7 +698,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos)
*/
BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID)
{
FIXME(imm, "(0x%08x, %ld): stub\n", hWnd, dwHotKeyID);
FIXME("(0x%08x, %ld): stub\n", hWnd, dwHotKeyID);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@ -709,7 +709,7 @@ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID)
BOOL WINAPI ImmUnregisterWordA(
HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister)
{
FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
FIXME("(0x%08x, %s, %ld, %s): stub\n",
hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -725,7 +725,7 @@ BOOL WINAPI ImmUnregisterWordA(
BOOL WINAPI ImmUnregisterWordW(
HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
{
FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
FIXME("(0x%08x, %s, %ld, %s): stub\n",
hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

12
misc/lstr.c
View File

@ -31,7 +31,7 @@
#include "ldt.h"
#include "stackframe.h"
#include "module.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(resource)
@ -520,10 +520,10 @@ DWORD WINAPI FormatMessageA(
DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
DWORD nolinefeed = 0;
TRACE(resource, "(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
if (width)
FIXME(resource,"line wrapping not supported.\n");
FIXME("line wrapping not supported.\n");
from = NULL;
if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
from = HEAP_strdupA( GetProcessHeap(), 0, (LPSTR)lpSource);
@ -657,7 +657,7 @@ DWORD WINAPI FormatMessageA(
if (nSize && talloced<nSize) {
target = (char*)HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize);
}
TRACE(resource,"-- %s\n",debugstr_a(target));
TRACE("-- %s\n",debugstr_a(target));
if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) {
/* nSize is the MINIMUM size */
*((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(GMEM_ZEROINIT,talloced);
@ -696,10 +696,10 @@ DWORD WINAPI FormatMessageW(
DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
DWORD nolinefeed = 0;
TRACE(resource, "(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
if (width)
FIXME(resource,"line wrapping not supported.\n");
FIXME("line wrapping not supported.\n");
from = NULL;
if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
from = HEAP_strdupWtoA(GetProcessHeap(),0,(LPWSTR)lpSource);

28
misc/lzexpand.c
View File

@ -16,7 +16,7 @@
#include "file.h"
#include "heap.h"
#include "lzexpand.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(file)
@ -121,7 +121,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head)
*/
INT16 WINAPI LZStart16(void)
{
TRACE(file,"(void)\n");
TRACE("(void)\n");
return 1;
}
@ -131,7 +131,7 @@ INT16 WINAPI LZStart16(void)
*/
INT WINAPI LZStart(void)
{
TRACE(file,"(void)\n");
TRACE("(void)\n");
return 1;
}
@ -167,7 +167,7 @@ HFILE WINAPI LZInit( HFILE hfSrc )
DWORD ret;
int i;
TRACE(file,"(%d)\n",hfSrc);
TRACE("(%d)\n",hfSrc);
ret=read_header(hfSrc,&head);
if (ret<=0) {
_llseek(hfSrc,0,SEEK_SET);
@ -199,7 +199,7 @@ HFILE WINAPI LZInit( HFILE hfSrc )
*/
void WINAPI LZDone(void)
{
TRACE(file,"(void)\n");
TRACE("(void)\n");
}
@ -231,7 +231,7 @@ INT WINAPI GetExpandedNameA( LPCSTR in, LPSTR out )
INT fnislowercased,ret,len;
LPSTR s,t;
TRACE(file,"(%s)\n",in);
TRACE("(%s)\n",in);
fd=OpenFile(in,&ofs,OF_READ);
if (fd==HFILE_ERROR)
return (INT)(INT16)LZERROR_BADINHANDLE;
@ -253,7 +253,7 @@ INT WINAPI GetExpandedNameA( LPCSTR in, LPSTR out )
/* now mangle the basename */
if (!*s) {
/* FIXME: hmm. shouldn't happen? */
WARN(file,"Specified a directory or what? (%s)\n",in);
WARN("Specified a directory or what? (%s)\n",in);
_lclose(fd);
return 1;
}
@ -328,7 +328,7 @@ INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread )
struct lzstate *lzs;
buf=(LPBYTE)vbuf;
TRACE(file,"(%d,%p,%d)\n",fd,buf,toread);
TRACE("(%d,%p,%d)\n",fd,buf,toread);
howmuch=toread;
if (!(lzs = GET_LZ_STATE(fd))) return _lread(fd,buf,toread);
@ -427,7 +427,7 @@ LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
struct lzstate *lzs;
LONG newwanted;
TRACE(file,"(%d,%ld,%d)\n",fd,off,type);
TRACE("(%d,%ld,%d)\n",fd,off,type);
/* not compressed? just use normal _llseek() */
if (!(lzs = GET_LZ_STATE(fd))) return _llseek(fd,off,type);
newwanted = lzs->realwanted;
@ -495,7 +495,7 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest )
_readfun xread;
TRACE(file,"(%d,%d)\n",src,dest);
TRACE("(%d,%d)\n",src,dest);
if (!IS_LZ_HANDLE(src)) {
src = LZInit(src);
if ((INT)src <= 0) return 0;
@ -570,7 +570,7 @@ HFILE WINAPI LZOpenFileA( LPCSTR fn, LPOFSTRUCT ofs, UINT mode )
{
HFILE fd,cfd;
TRACE(file,"(%s,%p,%d)\n",fn,ofs,mode);
TRACE("(%s,%p,%d)\n",fn,ofs,mode);
/* 0x70 represents all OF_SHARE_* flags, ignore them for the check */
fd=OpenFile(fn,ofs,mode);
if (fd==HFILE_ERROR)
@ -628,7 +628,7 @@ void WINAPI LZClose( HFILE fd )
{
struct lzstate *lzs;
TRACE(file,"(%d)\n",fd);
TRACE("(%d)\n",fd);
if (!(lzs = GET_LZ_STATE(fd))) _lclose(fd);
else
{
@ -644,7 +644,7 @@ void WINAPI LZClose( HFILE fd )
*/
LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
{
TRACE(file,"(%d,%d)\n",src,dest);
TRACE("(%d,%d)\n",src,dest);
return LZCopy16(src,dest);
}
@ -657,6 +657,6 @@ LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
*/
LONG WINAPI CopyLZFile( HFILE src, HFILE dest )
{
TRACE(file,"(%d,%d)\n",src,dest);
TRACE("(%d,%d)\n",src,dest);
return LZCopy(src,dest);
}

58
misc/main.c
View File

@ -30,7 +30,7 @@
#include "options.h"
#include "desktop.h"
#include "builtin32.h"
#include "debug.h"
#include "debugtools.h"
#include "debugdefs.h"
#include "xmalloc.h"
#include "module.h"
@ -143,7 +143,7 @@ static char szUsage[] =
*/
void MAIN_Usage( char *name )
{
MSG( szUsage, WINE_RELEASE_INFO, name );
MESSAGE( szUsage, WINE_RELEASE_INFO, name );
exit(1);
}
@ -290,28 +290,28 @@ BOOL MAIN_ParseDebugOptions(char *options)
return TRUE;
error:
MSG("%s: Syntax: -debugmsg [class]+xxx,... or "
MESSAGE("%s: Syntax: -debugmsg [class]+xxx,... or "
"-debugmsg [class]-xxx,...\n",Options.argv[0]);
MSG("Example: -debugmsg +all,warn-heap\n"
MESSAGE("Example: -debugmsg +all,warn-heap\n"
" turn on all messages except warning heap messages\n");
MSG("Special case: -debugmsg +relay=DLL:DLL.###:FuncName\n"
MESSAGE("Special case: -debugmsg +relay=DLL:DLL.###:FuncName\n"
" turn on -debugmsg +relay only as specified\n"
"Special case: -debugmsg -relay=DLL:DLL.###:FuncName\n"
" turn on -debugmsg +relay except as specified\n"
"Also permitted, +snoop=..., -snoop=... as with relay.\n\n");
MSG("Available message classes:\n");
MESSAGE("Available message classes:\n");
for(i=0;i<DEBUG_CLASS_COUNT;i++)
MSG( "%-9s", debug_cl_name[i]);
MSG("\n\n");
MESSAGE( "%-9s", debug_cl_name[i]);
MESSAGE("\n\n");
MSG("Available message types:\n");
MSG("%-9s ","all");
MESSAGE("Available message types:\n");
MESSAGE("%-9s ","all");
for(i=0;i<DEBUG_CHANNEL_COUNT;i++)
if(debug_ch_name[i])
MSG("%-9s%c",debug_ch_name[i],
MESSAGE("%-9s%c",debug_ch_name[i],
(((i+2)%8==0)?'\n':' '));
MSG("\n\n");
MESSAGE("\n\n");
exit(1);
}
@ -680,9 +680,9 @@ void MAIN_ParseLanguageOption( char *arg )
const WINE_LANGUAGE_DEF *p = Languages;
/* for compatibility whith non-iso names previously used */
if (!strcmp("Sw",arg)) { strcpy(arg,"Sv"); FIXME(system,"use 'Sv' instead of 'Sw'\n");}
if (!strcmp("Cz",arg)) { strcpy(arg,"Cs"); FIXME(system,"use 'Cs' instead of 'Cz'\n");}
if (!strcmp("Po",arg)) { strcpy(arg,"Pt"); FIXME(system,"use 'Pt' instead of 'Po'\n");}
if (!strcmp("Sw",arg)) { strcpy(arg,"Sv"); FIXME_(system)("use 'Sv' instead of 'Sw'\n");}
if (!strcmp("Cz",arg)) { strcpy(arg,"Cs"); FIXME_(system)("use 'Cs' instead of 'Cz'\n");}
if (!strcmp("Po",arg)) { strcpy(arg,"Pt"); FIXME_(system)("use 'Pt' instead of 'Po'\n");}
Options.language = LANG_Xx; /* First (dummy) language */
for (;p->name;p++)
@ -694,9 +694,9 @@ void MAIN_ParseLanguageOption( char *arg )
}
Options.language++;
}
MSG( "Invalid language specified '%s'. Supported languages are: ", arg );
for (p = Languages; p->name; p++) MSG( "%s ", p->name );
MSG( "\n" );
MESSAGE( "Invalid language specified '%s'. Supported languages are: ", arg );
for (p = Languages; p->name; p++) MESSAGE( "%s ", p->name );
MESSAGE( "\n" );
exit(1);
}
@ -712,8 +712,8 @@ void MAIN_ParseModeOption( char *arg )
else if (!lstrcmpiA("standard", arg)) Options.mode = MODE_STANDARD;
else
{
MSG( "Invalid mode '%s' specified.\n", arg);
MSG( "Valid modes are: 'standard', 'enhanced' (default).\n");
MESSAGE( "Invalid mode '%s' specified.\n", arg);
MESSAGE( "Valid modes are: 'standard', 'enhanced' (default).\n");
exit(1);
}
}
@ -744,7 +744,7 @@ static void MAIN_ParseOptions( int *argc, char *argv[] )
{
if (!strcmp( argv[i], "-v" ) || !strcmp( argv[i], "-version" ))
{
MSG( "%s\n", WINE_RELEASE_INFO );
MESSAGE( "%s\n", WINE_RELEASE_INFO );
exit(0);
}
if (!strcmp( argv[i], "-h" ) || !strcmp( argv[i], "-help" ))
@ -784,11 +784,11 @@ BOOL MAIN_WineInit( int *argc, char *argv[] )
mcheck(NULL);
if (!(trace = getenv("MALLOC_TRACE")))
{
MSG( "MALLOC_TRACE not set. No trace generated\n" );
MESSAGE( "MALLOC_TRACE not set. No trace generated\n" );
}
else
{
MSG( "malloc trace goes to %s\n", trace );
MESSAGE( "malloc trace goes to %s\n", trace );
mtrace();
}
#endif
@ -1031,7 +1031,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam,
LPANIMATIONINFO lpAnimInfo = (LPANIMATIONINFO)lpvParam;
/* Do nothing */
WARN(system, "SPI_SETANIMATION ignored.\n");
WARN_(system)("SPI_SETANIMATION ignored.\n");
lpAnimInfo->cbSize = sizeof(ANIMATIONINFO);
uParam = sizeof(ANIMATIONINFO);
break;
@ -1041,7 +1041,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam,
{
LPHIGHCONTRASTA lpHighContrastA = (LPHIGHCONTRASTA)lpvParam;
FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n");
FIXME_(system)("SPI_GETHIGHCONTRAST not fully implemented\n");
if ( lpHighContrastA->cbSize == sizeof( HIGHCONTRASTA ) )
{
@ -1224,7 +1224,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
case SPI_SETFASTTASKSWITCH:
case SPI_SETKEYBOARDDELAY:
case SPI_SETKEYBOARDSPEED:
WARN(system, "Option %d ignored.\n", uAction);
WARN_(system)("Option %d ignored.\n", uAction);
break;
case SPI_GETWORKAREA:
@ -1234,7 +1234,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
break;
default:
WARN(system, "Unknown option %d.\n", uAction);
WARN_(system)("Unknown option %d.\n", uAction);
break;
}
return 1;
@ -1307,7 +1307,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam,
{
LPHIGHCONTRASTW lpHighContrastW = (LPHIGHCONTRASTW)lpvParam;
FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n");
FIXME_(system)("SPI_GETHIGHCONTRAST not fully implemented\n");
if ( lpHighContrastW->cbSize == sizeof( HIGHCONTRASTW ) )
{
@ -1336,6 +1336,6 @@ BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam,
*/
FARPROC16 WINAPI FileCDR16(FARPROC16 x)
{
FIXME(file,"(0x%8x): stub\n", (int) x);
FIXME_(file)("(0x%8x): stub\n", (int) x);
return (FARPROC16)TRUE;
}

58
misc/sound.c
View File

@ -5,56 +5,56 @@
#include <stdlib.h>
#include "windef.h"
#include "wine/winesound.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(sound)
INT16 WINAPI OpenSound16(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
return -1;
}
void WINAPI OpenSound(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
}
void WINAPI CloseSound16(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
}
INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes)
{
FIXME(sound, "(%d,%d): stub\n",nVoice,nBytes);
FIXME("(%d,%d): stub\n",nVoice,nBytes);
return 0;
}
DWORD WINAPI SetVoiceQueueSize(DWORD nVoice, DWORD nBytes)
{
FIXME(sound, "(%ld,%ld): stub\n",nVoice,nBytes);
FIXME("(%ld,%ld): stub\n",nVoice,nBytes);
return 0;
}
INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
INT16 nCdots)
{
FIXME(sound, "(%d,%d,%d,%d): stub\n",nVoice,nValue,nLength,nCdots);
FIXME("(%d,%d,%d,%d): stub\n",nVoice,nValue,nLength,nCdots);
return 0;
}
DWORD WINAPI SetVoiceNote(DWORD nVoice, DWORD nValue, DWORD nLength,
DWORD nCdots)
{
FIXME(sound, "(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots);
FIXME("(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots);
return 0;
}
INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
INT16 nMode, INT16 nPitch)
{
FIXME(sound, "(%d,%d,%d,%d,%d): stub\n", nVoice, nTempo,
FIXME("(%d,%d,%d,%d,%d): stub\n", nVoice, nTempo,
nVolume, nMode, nPitch);
return 0;
}
@ -62,44 +62,44 @@ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
DWORD WINAPI SetVoiceAccent(DWORD nVoice, DWORD nTempo, DWORD nVolume,
DWORD nMode, DWORD nPitch)
{
FIXME(sound, "(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo,
FIXME("(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo,
nVolume, nMode, nPitch);
return 0;
}
INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
{
FIXME(sound, "(%d,%d,%d): stub\n",nVoice,nShape,nRepeat);
FIXME("(%d,%d,%d): stub\n",nVoice,nShape,nRepeat);
return 0;
}
DWORD WINAPI SetVoiceEnvelope(DWORD nVoice, DWORD nShape, DWORD nRepeat)
{
FIXME(sound, "(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat);
FIXME("(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat);
return 0;
}
INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
{
FIXME(sound, "(%d,%d): stub\n",nSource,nDuration);
FIXME("(%d,%d): stub\n",nSource,nDuration);
return 0;
}
DWORD WINAPI SetSoundNoise(DWORD nSource, DWORD nDuration)
{
FIXME(sound, "(%ld,%ld): stub\n",nSource,nDuration);
FIXME("(%ld,%ld): stub\n",nSource,nDuration);
return 0;
}
INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
{
FIXME(sound, "(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration);
FIXME("(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration);
return 0;
}
DWORD WINAPI SetVoiceSound(DWORD nVoice, DWORD lFrequency, DWORD nDuration)
{
FIXME(sound, "(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration);
FIXME("(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration);
return 0;
}
@ -115,79 +115,79 @@ INT16 WINAPI StopSound16(void)
INT16 WINAPI WaitSoundState16(INT16 x)
{
FIXME(sound, "(%d): stub\n", x);
FIXME("(%d): stub\n", x);
return 0;
}
DWORD WINAPI WaitSoundState(DWORD x)
{
FIXME(sound, "(%ld): stub\n", x);
FIXME("(%ld): stub\n", x);
return 0;
}
INT16 WINAPI SyncAllVoices16(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
return 0;
}
DWORD WINAPI SyncAllVoices(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
return 0;
}
INT16 WINAPI CountVoiceNotes16(INT16 x)
{
FIXME(sound, "(%d): stub\n", x);
FIXME("(%d): stub\n", x);
return 0;
}
DWORD WINAPI CountVoiceNotes(DWORD x)
{
FIXME(sound, "(%ld): stub\n", x);
FIXME("(%ld): stub\n", x);
return 0;
}
LPINT16 WINAPI GetThresholdEvent16(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
return NULL;
}
LPDWORD WINAPI GetThresholdEvent(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
return NULL;
}
INT16 WINAPI GetThresholdStatus16(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
return 0;
}
DWORD WINAPI GetThresholdStatus(void)
{
FIXME(sound, "(void): stub\n");
FIXME("(void): stub\n");
return 0;
}
INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
{
FIXME(sound, "(%d,%d): stub\n", a, b);
FIXME("(%d,%d): stub\n", a, b);
return 0;
}
DWORD WINAPI SetVoiceThreshold(DWORD a, DWORD b)
{
FIXME(sound, "(%ld,%ld): stub\n", a, b);
FIXME("(%ld,%ld): stub\n", a, b);
return 0;
}
void WINAPI DoBeep16(void)
{
FIXME(sound, "(void): stub!\n");
FIXME("(void): stub!\n");
}

44
misc/spy.c
View File

@ -12,7 +12,7 @@
#include "win.h"
#include "module.h"
#include "options.h"
#include "debug.h"
#include "debugtools.h"
#include "spy.h"
DEFAULT_DEBUG_CHANNEL(message)
@ -670,22 +670,22 @@ void SPY_DumpStructure (UINT msg, LPARAM structure)
{
case WM_DRAWITEM:
{ DRAWITEMSTRUCT *lpdis = (DRAWITEMSTRUCT*) structure;
TRACE(message, "DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpdis->CtlType, lpdis->CtlID);
TRACE(message, "itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState);
TRACE(message, "hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpdis->CtlType, lpdis->CtlID);
TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState);
TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, lpdis->rcItem.right, lpdis->rcItem.bottom, lpdis->itemData);
}
break;
case WM_MEASUREITEM:
{ MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) structure;
TRACE(message, "MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpmis->CtlType, lpmis->CtlID);
TRACE(message, "itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n", lpmis->itemID, lpmis->itemWidth, lpmis->itemHeight);
TRACE(message, "itemData=0x%08lx\n", lpmis->itemData);
TRACE("MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpmis->CtlType, lpmis->CtlID);
TRACE("itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n", lpmis->itemID, lpmis->itemWidth, lpmis->itemHeight);
TRACE("itemData=0x%08lx\n", lpmis->itemData);
}
break;
case WM_NOTIFY:
{ NMHDR * pnmh = (NMHDR*) structure;
TRACE(message, "NMHDR hwndFrom=0x%08x idFrom=0x%08x code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code);
TRACE("NMHDR hwndFrom=0x%08x idFrom=0x%08x code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code);
}
default:
break;
@ -707,14 +707,14 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
{
case SPY_DISPATCHMESSAGE16:
pname = SPY_GetWndName(hWnd);
TRACE(message,"%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n",
TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
wParam, lParam);
break;
case SPY_DISPATCHMESSAGE:
pname = SPY_GetWndName(hWnd);
TRACE(message,"%*s(%08x) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n",
TRACE("%*s(%08x) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
wParam, lParam);
break;
@ -735,11 +735,11 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
pname = SPY_GetWndName(hWnd);
if (iFlag == SPY_SENDMESSAGE16)
TRACE(message, "%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n",
TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
taskName, wParam, lParam );
else
{ TRACE(message, "%*s(%08x) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n",
{ TRACE("%*s(%08x) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
taskName, wParam, lParam );
SPY_DumpStructure(msg, lParam);
@ -749,14 +749,14 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
case SPY_DEFWNDPROC16:
if( SPY_ExcludeDWP ) return;
TRACE(message, "%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n",
TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ),
msg, wParam, lParam );
break;
case SPY_DEFWNDPROC:
if( SPY_ExcludeDWP ) return;
TRACE(message, "%*s(%08x) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n",
TRACE("%*s(%08x) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ),
msg, wParam, lParam );
break;
@ -781,39 +781,39 @@ void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn )
switch(iFlag)
{
case SPY_RESULT_DEFWND16:
TRACE(message," %*s(%04x) DefWindowProc16: %s [%04x] returned %08lx\n",
TRACE(" %*s(%04x) DefWindowProc16: %s [%04x] returned %08lx\n",
SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
break;
case SPY_RESULT_DEFWND:
TRACE(message," %*s(%08x) DefWindowProc32: %s [%04x] returned %08lx\n",
TRACE(" %*s(%08x) DefWindowProc32: %s [%04x] returned %08lx\n",
SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
break;
case SPY_RESULT_OK16:
pname = SPY_GetWndName(hWnd);
TRACE(message," %*s(%04x) %-16s message [%04x] %s returned %08lx\n",
TRACE(" %*s(%04x) %-16s message [%04x] %s returned %08lx\n",
SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ), lReturn );
break;
case SPY_RESULT_OK:
pname = SPY_GetWndName(hWnd);
TRACE(message," %*s(%08x) %-16s message [%04x] %s returned %08lx\n",
TRACE(" %*s(%08x) %-16s message [%04x] %s returned %08lx\n",
SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ), lReturn );
break;
case SPY_RESULT_INVALIDHWND16:
pname = SPY_GetWndName(hWnd);
WARN(message, " %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n",
WARN(" %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n",
SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ) );
break;
case SPY_RESULT_INVALIDHWND:
pname = SPY_GetWndName(hWnd);
WARN(message, " %*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n",
WARN(" %*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n",
SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ) );
break;
@ -834,7 +834,7 @@ int SPY_Init(void)
PROFILE_GetWineIniString( "Spy", "Include", "", buffer, sizeof(buffer) );
if (buffer[0] && strcmp( buffer, "INCLUDEALL" ))
{
TRACE(message, "Include=%s\n", buffer );
TRACE("Include=%s\n", buffer );
for (i = 0; i <= SPY_MAX_MSGNUM; i++)
SPY_Exclude[i] = (MessageTypeNames[i] && !strstr(buffer,MessageTypeNames[i]));
}
@ -842,7 +842,7 @@ int SPY_Init(void)
PROFILE_GetWineIniString( "Spy", "Exclude", "", buffer, sizeof(buffer) );
if (buffer[0])
{
TRACE(message, "Exclude=%s\n", buffer );
TRACE("Exclude=%s\n", buffer );
if (!strcmp( buffer, "EXCLUDEALL" ))
for (i = 0; i <= SPY_MAX_MSGNUM; i++) SPY_Exclude[i] = TRUE;
else

26
misc/stress.c
View File

@ -1,13 +1,13 @@
#include <limits.h>
#include "stress.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(stress)
int WINAPI AllocDiskSpace(long lLeft, UINT16 uDrive)
{
FIXME(stress, "(%d, %ld) - stub\n",
FIXME("(%d, %ld) - stub\n",
uDrive, lLeft);
return 1;
@ -15,7 +15,7 @@ int WINAPI AllocDiskSpace(long lLeft, UINT16 uDrive)
int WINAPI AllocFileHandles(int Left)
{
TRACE(stress, "(%d) - stub\n", Left);
TRACE("(%d) - stub\n", Left);
if (Left < 0)
return -1;
@ -25,48 +25,48 @@ int WINAPI AllocFileHandles(int Left)
BOOL16 WINAPI AllocGDIMem(UINT16 uLeft)
{
TRACE(stress, "(%d) - stub\n", uLeft);
TRACE("(%d) - stub\n", uLeft);
return 1;
}
BOOL16 WINAPI AllocMem(DWORD dwLeft)
{
FIXME(stress, "(%ld) - stub\n", dwLeft);
FIXME("(%ld) - stub\n", dwLeft);
return 1;
}
BOOL16 WINAPI AllocUserMem(UINT16 uContig)
{
TRACE(stress, "AllocUserMem %d\n", uContig);
TRACE("AllocUserMem %d\n", uContig);
return 1;
}
void WINAPI FreeAllMem(void)
{
TRACE(stress, "FreeAllMem\n");
TRACE("FreeAllMem\n");
}
void WINAPI FreeAllGDIMem(void)
{
TRACE(stress, "FreeAllGDIMem\n");
TRACE("FreeAllGDIMem\n");
}
void WINAPI FreeAllUserMem(void)
{
TRACE(stress, "FreeAllUserMem\n");
TRACE("FreeAllUserMem\n");
}
void WINAPI GetFreeAllUserMem(void)
{
TRACE(stress, "GetFreeAllUserMem\n");
TRACE("GetFreeAllUserMem\n");
}
int WINAPI GetFreeFileHandles(void)
{
TRACE(stress, "GetFreeFileHandles\n");
TRACE("GetFreeFileHandles\n");
#ifndef OPEN_MAX
return _POSIX_OPEN_MAX;
@ -77,10 +77,10 @@ int WINAPI GetFreeFileHandles(void)
void WINAPI UnAllocDiskSpace(UINT16 drive)
{
TRACE(stress, "UnAllocDiskSpace %d\n", drive);
TRACE("UnAllocDiskSpace %d\n", drive);
}
void WINAPI UnAllocFileHandles(void)
{
TRACE(stress, "GetFreeAllUserMem\n");
TRACE("GetFreeAllUserMem\n");
}

6
misc/system.c
View File

@ -7,7 +7,7 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "services.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(system)
@ -91,10 +91,10 @@ DWORD WINAPI InquireSystem16( WORD code, WORD arg )
return MAKELONG( drivetype, drivetype );
case 2: /* Enable one-drive logic */
FIXME(system, "Case %d: set single-drive %d not supported\n", code, arg );
FIXME("Case %d: set single-drive %d not supported\n", code, arg );
return 0;
}
WARN(system, "Unknown code %d\n", code );
WARN("Unknown code %d\n", code );
return 0;
}

18
misc/toolhelp.c
View File

@ -17,7 +17,7 @@
#include "toolhelp.h"
#include "heap.h"
#include "server.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(toolhelp)
@ -42,7 +42,7 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback,
{
int i;
TRACE(toolhelp, "(%x,%lx,%x) called.\n",
TRACE("(%x,%lx,%x) called.\n",
htask, (DWORD)lpfnCallback, wFlags );
if (!htask) htask = GetCurrentTask();
for (i=0;i<nrofnotifys;i++)
@ -68,7 +68,7 @@ BOOL16 WINAPI NotifyUnregister16( HTASK16 htask )
{
int i;
TRACE(toolhelp, "(%x) called.\n", htask );
TRACE("(%x) called.\n", htask );
if (!htask) htask = GetCurrentTask();
for (i=nrofnotifys;i--;)
if (notifys[i].htask==htask)
@ -118,9 +118,9 @@ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process )
{
struct create_snapshot_request *req = get_req_buffer();
TRACE( toolhelp, "%lx,%lx\n", flags, process );
TRACE("%lx,%lx\n", flags, process );
if (flags & (TH32CS_SNAPHEAPLIST|TH32CS_SNAPMODULE|TH32CS_SNAPTHREAD))
FIXME( toolhelp, "flags %lx not implemented\n", flags );
FIXME("flags %lx not implemented\n", flags );
if (!(flags & TH32CS_SNAPPROCESS))
{
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@ -147,7 +147,7 @@ static BOOL TOOLHELP_Process32Next( HANDLE handle, LPPROCESSENTRY lppe, BOOL fir
if (lppe->dwSize < sizeof (PROCESSENTRY))
{
SetLastError( ERROR_INSUFFICIENT_BUFFER );
ERR (toolhelp, "Result buffer too small\n");
ERR("Result buffer too small\n");
return FALSE;
}
req->handle = handle;
@ -193,7 +193,7 @@ BOOL WINAPI Process32Next(HANDLE hSnapshot, LPPROCESSENTRY lppe)
*/
BOOL WINAPI Module32First(HANDLE hSnapshot, LPMODULEENTRY lpme)
{
FIXME(toolhelp,"(%d,%p),stub!\n",hSnapshot,lpme);
FIXME("(%d,%p),stub!\n",hSnapshot,lpme);
return FALSE;
}
@ -204,7 +204,7 @@ BOOL WINAPI Module32First(HANDLE hSnapshot, LPMODULEENTRY lpme)
*/
BOOL WINAPI Module32Next(HANDLE hSnapshot, LPMODULEENTRY lpme)
{
FIXME(toolhelp,"(%d,%p),stub!\n",hSnapshot,lpme);
FIXME("(%d,%p),stub!\n",hSnapshot,lpme);
return FALSE;
}
@ -220,6 +220,6 @@ BOOL WINAPI Module32Next(HANDLE hSnapshot, LPMODULEENTRY lpme)
*/
DWORD WINAPI GlobalMasterHandle16(void)
{
FIXME(toolhelp,": stub\n");
FIXME(": stub\n");
return 0;
}

16
misc/tweak.c
View File

@ -32,7 +32,7 @@
#include "winuser.h"
#include "tweak.h"
#include "options.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(tweak)
@ -65,13 +65,13 @@ int TWEAK_Init (void)
if (strncmp (szIniString, "TestString", 10)) {
if (PROFILE_GetWineIniBool ("Tweak.Layout", "Win95Look", 0)) {
TWEAK_WineLook = WIN95_LOOK;
TRACE (tweak, "Using Win95 look and feel.\n");
TRACE("Using Win95 look and feel.\n");
}
else {
TWEAK_WineLook = WIN31_LOOK;
TRACE (tweak, "Using Win3.1 look and feel.\n");
TRACE("Using Win3.1 look and feel.\n");
}
ERR (tweak,
ERR(
"Replace \"Win95Look\" by \"WineLook\" in your \"wine.ini\"!\n");
}
@ -80,19 +80,19 @@ int TWEAK_Init (void)
if (!strncasecmp (szIniString, "Win31", 5)) {
TWEAK_WineLook = WIN31_LOOK;
TRACE (tweak, "Using Win3.1 look and feel.\n");
TRACE("Using Win3.1 look and feel.\n");
}
else if (!strncasecmp (szIniString, "Win95", 5)) {
TWEAK_WineLook = WIN95_LOOK;
TRACE (tweak, "Using Win95 look and feel.\n");
TRACE("Using Win95 look and feel.\n");
}
else if (!strncasecmp (szIniString, "Win98", 5)) {
TWEAK_WineLook = WIN98_LOOK;
TRACE (tweak, "Using Win98 look and feel.\n");
TRACE("Using Win98 look and feel.\n");
}
else {
TWEAK_WineLook = WIN31_LOOK;
TRACE (tweak, "Using Win3.1 look and feel.\n");
TRACE("Using Win3.1 look and feel.\n");
}
return 1;

30
misc/version.c
View File

@ -14,7 +14,7 @@
#include "wine/winbase16.h"
#include "process.h"
#include "options.h"
#include "debug.h"
#include "debugtools.h"
#include "neexe.h"
#include "winversion.h"
@ -97,10 +97,10 @@ void VERSION_ParseWinVersion( const char *arg )
return;
}
}
MSG("Invalid winver value '%s' specified.\n", arg );
MSG("Valid versions are:" );
MESSAGE("Invalid winver value '%s' specified.\n", arg );
MESSAGE("Valid versions are:" );
for (i = 0; i < NB_WINDOWS_VERSIONS; i++)
MSG(" '%s'%c", WinVersionNames[i],
MESSAGE(" '%s'%c", WinVersionNames[i],
(i == NB_WINDOWS_VERSIONS - 1) ? '\n' : ',' );
}
@ -143,7 +143,7 @@ WINDOWS_VERSION VERSION_GetImageVersion(PDB *pdb)
peheader = PE_HEADER(pdb->exe_modref->module);
#define OPTHD peheader->OptionalHeader
TRACE(ver, "%02x.%02x/%02x.%02x/%02x.%02x/%02x.%02x\n",
TRACE("%02x.%02x/%02x.%02x/%02x.%02x/%02x.%02x\n",
OPTHD.MajorLinkerVersion,
OPTHD.MinorLinkerVersion,
OPTHD.MajorOperatingSystemVersion,
@ -191,7 +191,7 @@ WINDOWS_VERSION VERSION_GetImageVersion(PDB *pdb)
}
default:
if (OPTHD.MajorSubsystemVersion)
ERR(ver,"unknown subsystem version: %04x.%04x, please report.\n",
ERR("unknown subsystem version: %04x.%04x, please report.\n",
OPTHD.MajorSubsystemVersion,
OPTHD.MinorSubsystemVersion );
return defaultWinVersion;
@ -285,7 +285,7 @@ char *VERSION_GetVersionName()
case NT40:
return "Windows NT 4.0";
default:
FIXME(ver,"Windows version %d not named",ver);
FIXME("Windows version %d not named",ver);
return "Windows <Unknown>";
}
}
@ -318,7 +318,7 @@ BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16 *v)
WINDOWS_VERSION ver = VERSION_GetVersion();
if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFO16))
{
WARN(ver,"wrong OSVERSIONINFO size from app");
WARN("wrong OSVERSIONINFO size from app");
return FALSE;
}
v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion;
@ -338,7 +338,7 @@ BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v)
WINDOWS_VERSION ver = VERSION_GetVersion();
if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA))
{
WARN(ver,"wrong OSVERSIONINFO size from app");
WARN("wrong OSVERSIONINFO size from app");
return FALSE;
}
v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion;
@ -359,7 +359,7 @@ BOOL WINAPI GetVersionExW(OSVERSIONINFOW *v)
if (v->dwOSVersionInfoSize!=sizeof(OSVERSIONINFOW))
{
WARN(ver,"wrong OSVERSIONINFO size from app");
WARN("wrong OSVERSIONINFO size from app");
return FALSE;
}
v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion;
@ -398,7 +398,7 @@ DWORD WINAPI GetWinFlags16(void)
break;
default:
ERR(ver, "Unknown mode set? This shouldn't happen. Check GetWinFlags()!\n");
ERR("Unknown mode set? This shouldn't happen. Check GetWinFlags()!\n");
break;
}
if (si.wProcessorLevel >= 4) result |= WF_HASCPUID;
@ -415,7 +415,7 @@ DWORD WINAPI GetWinFlags16(void)
*/
BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO *lpwdi, UINT16 flags)
{
FIXME(ver, "(%8lx,%d): stub returning 0\n",
FIXME("(%8lx,%d): stub returning 0\n",
(unsigned long)lpwdi, flags);
/* 0 means not in debugging mode/version */
/* Can this type of debugging be used in wine ? */
@ -429,7 +429,7 @@ BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO *lpwdi, UINT16 flags)
*/
BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO *lpwdi)
{
FIXME(ver, "(%8lx): stub returning 0\n", (unsigned long)lpwdi);
FIXME("(%8lx): stub returning 0\n", (unsigned long)lpwdi);
/* 0 means not in debugging mode/version */
/* Can this type of debugging be used in wine ? */
/* Constants: WDI_OPTIONS WDI_FILTER WDI_ALLOCBREAK */
@ -477,7 +477,7 @@ UINT WINAPI OaBuildVersion()
{
WINDOWS_VERSION ver = VERSION_GetVersion();
FIXME(ver, "Please report to a.mohr@mailto.de if you get version error messages !\n");
FIXME("Please report to a.mohr@mailto.de if you get version error messages !\n");
switch(VersionData[ver].getVersion32)
{
case 0x80000a03: /* Win 3.1 */
@ -485,7 +485,7 @@ UINT WINAPI OaBuildVersion()
case 0xc0000004: /* Win 95 */
return 0x1e10a9; /* some older version: 0x0a0bd3 */
case 0x04213303: /* NT 3.51 */
FIXME(ver, "NT 3.51 version value unknown !\n");
FIXME("NT 3.51 version value unknown !\n");
return 0x1e10a9; /* value borrowed from Win95 */
case 0x05650004: /* NT 4.0 */
return 0x141016;

6
misc/win32s16.c
View File

@ -8,13 +8,13 @@
#include <string.h>
#include <stdlib.h>
#include "windef.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dll)
void WINAPI BootTask16()
{
MSG("BootTask(): should only be used by WIN32S.EXE.\n");
MESSAGE("BootTask(): should only be used by WIN32S.EXE.\n");
}
/***********************************************************************
@ -24,6 +24,6 @@ void WINAPI BootTask16()
*/
SEGPTR WINAPI StackLinearToSegmented16(WORD w1, WORD w2)
{
FIXME(dll,"(%d,%d):stub.\n",w1,w2);
FIXME("(%d,%d):stub.\n",w1,w2);
return (SEGPTR)NULL;
}

4
misc/windebug.c
View File

@ -8,7 +8,7 @@
#include <stdlib.h>
#include "windef.h"
#include "module.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dll)
@ -18,7 +18,7 @@ DEFAULT_DEBUG_CHANNEL(dll)
*/
void WINAPI WinNotify16(CONTEXT86 *context)
{
FIXME(dll, "(AX=%04x):stub.\n", AX_reg(context));
FIXME("(AX=%04x):stub.\n", AX_reg(context));
switch (AX_reg(context))
{
case 0x000D:

160
misc/winsock.c
View File

@ -58,13 +58,13 @@
#include "task.h"
#include "message.h"
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(winsock)
#define DEBUG_SOCKADDR 0
#define dump_sockaddr(a) \
DUMP("sockaddr_in: family %d, address %s, port %d\n", \
DPRINTF("sockaddr_in: family %d, address %s, port %d\n", \
((struct sockaddr_in *)a)->sin_family, \
inet_ntoa(((struct sockaddr_in *)a)->sin_addr), \
ntohs(((struct sockaddr_in *)a)->sin_port))
@ -149,14 +149,14 @@ static void convert_sockopt(INT *level, INT *optname)
for(i=0; _ws_sock_ops[i]; i++)
if( _ws_sock_ops[i] == *optname ) break;
if( _ws_sock_ops[i] ) *optname = _px_sock_ops[i];
else FIXME(winsock, "Unknown SOL_SOCKET optname %d\n", *optname);
else FIXME("Unknown SOL_SOCKET optname %d\n", *optname);
break;
case WS_IPPROTO_TCP:
*level = IPPROTO_TCP;
for(i=0; _ws_tcp_ops[i]; i++)
if ( _ws_tcp_ops[i] == *optname ) break;
if( _ws_tcp_ops[i] ) *optname = _px_tcp_ops[i];
else FIXME(winsock, "Unknown IPPROTO_TCP optname %d\n", *optname);
else FIXME("Unknown IPPROTO_TCP optname %d\n", *optname);
break;
}
}
@ -174,7 +174,7 @@ static LPWSINFO wsi_find(HTASK16 hTask)
LPWSINFO pwsi = _wsi_list;
while( pwsi && pwsi->tid != hTask ) pwsi = pwsi->next;
if( pwsi )
WARN(winsock,"(pwsi=0x%08x,task=0x%04x):Loose wsi struct! \n",
WARN("(pwsi=0x%08x,task=0x%04x):Loose wsi struct! \n",
(unsigned)pwsi, hTask );
return pwsi;
}
@ -252,7 +252,7 @@ inline static int sock_error_p(int s)
optlen = sizeof(optval);
getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen);
if (optval) WARN(winsock, "\t[%i] error: %d\n", s, optval);
if (optval) WARN("\t[%i] error: %d\n", s, optval);
return optval != 0;
}
@ -295,7 +295,7 @@ static int fd_set_export( LPWSINFO pwsi, fd_set* fds, fd_set* exceptfds, void* w
if( b32 ) wsfds32->fd_count = j;
else wsfds16->fd_count = j;
TRACE(winsock, "\n");
TRACE("\n");
#undef wsfds32
#undef wsfds16
}
@ -440,7 +440,7 @@ static void WINSOCK_WakeUp(void)
}
if (write (__wakeup_pipe[1], "A", 1) != 1)
ERR(winsock, "unable to write in wakeup_pipe\n");
ERR("unable to write in wakeup_pipe\n");
}
/***********************************************************************
@ -502,7 +502,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData)
HTASK16 tid = GetCurrentTask();
LPWSINFO pwsi;
TRACE(winsock, "verReq=%x\n", wVersionRequested);
TRACE("verReq=%x\n", wVersionRequested);
if (LOBYTE(wVersionRequested) < 1 || (LOBYTE(wVersionRequested) == 1 &&
HIBYTE(wVersionRequested) < 1)) return WSAVERNOTSUPPORTED;
@ -516,7 +516,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData)
_WSHeap = HeapCreate(HEAP_ZERO_MEMORY, 8120, 32768);
if( !(_ws_stub = WS_ALLOC(0x10)) )
{
ERR(winsock,"Fatal: failed to create WinSock heap\n");
ERR("Fatal: failed to create WinSock heap\n");
return 0;
}
}
@ -557,7 +557,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData)
memcpy(lpWSAData, &WINSOCK_data, sizeof(WINSOCK_data));
TRACE(winsock, "succeeded\n");
TRACE("succeeded\n");
return 0;
}
@ -599,7 +599,7 @@ INT WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi )
WINSOCK_Shutdown(); /* just in case */
if( pwsi->flags & WSI_BLOCKINGCALL )
TRACE(winsock,"\tinside blocking call!\n");
TRACE("\tinside blocking call!\n");
/* FIXME: aop_control() doesn't decrement pwsi->num_async_rq
*
@ -618,7 +618,7 @@ INT WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi )
close(pwsi->sock[i].fd); j++;
}
if( j )
TRACE(winsock,"\tclosed %i sockets, killed %i async selects!\n", j, n);
TRACE("\tclosed %i sockets, killed %i async selects!\n", j, n);
/* delete scratch buffers */
@ -636,7 +636,7 @@ INT WINAPI WSACleanup(void)
{
HTASK16 hTask = GetCurrentTask();
TRACE(winsock, "(%04x)\n", hTask );
TRACE("(%04x)\n", hTask );
if( hTask )
{
LPWSINFO pwsi = wsi_find(hTask);
@ -734,7 +734,7 @@ SOCKET WINAPI WINSOCK_accept(SOCKET s, struct sockaddr *addr,
struct ws_sockaddr_ipx* addr2 = (struct ws_sockaddr_ipx *)addr;
#endif
TRACE(winsock, "(%08x): socket %04x\n",
TRACE("(%08x): socket %04x\n",
(unsigned)pwsi, (UINT16)s );
if( _check_ws(pwsi, pws) )
{
@ -814,7 +814,7 @@ INT WINAPI WINSOCK_bind(SOCKET s, struct sockaddr *name, INT namelen)
struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name;
#endif
TRACE(winsock, "(%08x): socket %04x, ptr %8x, length %d\n",
TRACE("(%08x): socket %04x, ptr %8x, length %d\n",
(unsigned)pwsi, s, (int) name, namelen);
#if DEBUG_SOCKADDR
dump_sockaddr(name);
@ -850,7 +850,7 @@ INT WINAPI WINSOCK_bind(SOCKET s, struct sockaddr *name, INT namelen)
if ( bind(pws->fd, name, namelen) < 0 )
{
int loc_errno = errno;
WARN(winsock, "\tfailure - errno = %i\n", errno);
WARN("\tfailure - errno = %i\n", errno);
errno = loc_errno;
switch(errno)
{
@ -892,7 +892,7 @@ INT WINAPI WINSOCK_closesocket(SOCKET s)
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket %08x\n", (unsigned)pwsi, s);
TRACE("(%08x): socket %08x\n", (unsigned)pwsi, s);
if( _check_ws(pwsi, pws) )
{
@ -930,7 +930,7 @@ INT WINAPI WINSOCK_connect(SOCKET s, struct sockaddr *name, INT namelen)
struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name;
#endif
TRACE(winsock, "(%08x): socket %04x, ptr %8x, length %d\n",
TRACE("(%08x): socket %04x, ptr %8x, length %d\n",
(unsigned)pwsi, s, (int) name, namelen);
#if DEBUG_SOCKADDR
dump_sockaddr(name);
@ -1014,7 +1014,7 @@ INT WINAPI WINSOCK_getpeername(SOCKET s, struct sockaddr *name,
struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name;
#endif
TRACE(winsock, "(%08x): socket: %04x, ptr %8x, ptr %8x\n",
TRACE("(%08x): socket: %04x, ptr %8x, ptr %8x\n",
(unsigned)pwsi, s, (int) name, *namelen);
if( _check_ws(pwsi, pws) )
{
@ -1080,7 +1080,7 @@ INT WINAPI WINSOCK_getsockname(SOCKET s, struct sockaddr *name,
struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name;
#endif
TRACE(winsock, "(%08x): socket: %04x, ptr %8x, ptr %8x\n",
TRACE("(%08x): socket: %04x, ptr %8x, ptr %8x\n",
(unsigned)pwsi, s, (int) name, (int) *namelen);
if( _check_ws(pwsi, pws) )
{
@ -1150,7 +1150,7 @@ INT WINAPI WINSOCK_getsockopt(SOCKET s, INT level,
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket: %04x, opt %d, ptr %8x, ptr %8x\n",
TRACE("(%08x): socket: %04x, opt %d, ptr %8x, ptr %8x\n",
(unsigned)pwsi, s, level, (int) optval, (int) *optlen);
if( _check_ws(pwsi, pws) )
{
@ -1243,7 +1243,7 @@ INT WINAPI WINSOCK_ioctlsocket(SOCKET s, UINT cmd, UINT *argp)
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket %04x, cmd %08x, ptr %8x\n",
TRACE("(%08x): socket %04x, cmd %08x, ptr %8x\n",
(unsigned)pwsi, s, cmd, (unsigned) argp);
if( _check_ws(pwsi, pws) )
{
@ -1270,13 +1270,13 @@ INT WINAPI WINSOCK_ioctlsocket(SOCKET s, UINT cmd, UINT *argp)
break;
case WS_IOW('f',125,u_long):
WARN(winsock,"Warning: WS1.1 shouldn't be using async I/O\n");
WARN("Warning: WS1.1 shouldn't be using async I/O\n");
SetLastError(WSAEINVAL);
return SOCKET_ERROR;
default:
/* Netscape tries hard to use bogus ioctl 0x667e */
WARN(winsock, "\tunknown WS_IOCTL cmd (%08x)\n", cmd);
WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd);
}
if( ioctl(pws->fd, newcmd, (char*)argp ) == 0 ) return 0;
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
@ -1301,7 +1301,7 @@ INT WINAPI WINSOCK_listen(SOCKET s, INT backlog)
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket %04x, backlog %d\n",
TRACE("(%08x): socket %04x, backlog %d\n",
(unsigned)pwsi, s, backlog);
if( _check_ws(pwsi, pws) )
{
@ -1339,7 +1339,7 @@ INT WINAPI WINSOCK_recv(SOCKET s, char *buf, INT len, INT flags)
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket %04x, buf %8x, len %d, "
TRACE("(%08x): socket %04x, buf %8x, len %d, "
"flags %d\n", (unsigned)pwsi, s, (unsigned)buf,
len, flags);
if( _check_ws(pwsi, pws) )
@ -1347,7 +1347,7 @@ INT WINAPI WINSOCK_recv(SOCKET s, char *buf, INT len, INT flags)
INT length;
if ((length = recv(pws->fd, buf, len, flags)) >= 0)
{
TRACE(winsock, " -> %i bytes\n", length);
TRACE(" -> %i bytes\n", length);
if( pws->psop && (pws->flags & (WS_FD_READ | WS_FD_CLOSE)) )
EVENT_AddIO( pws->fd, EVENT_IO_READ ); /* reenabler */
@ -1357,7 +1357,7 @@ INT WINAPI WINSOCK_recv(SOCKET s, char *buf, INT len, INT flags)
SetLastError(wsaErrno());
}
else SetLastError(WSAENOTSOCK);
WARN(winsock, " -> ERROR\n");
WARN(" -> ERROR\n");
return SOCKET_ERROR;
}
@ -1382,12 +1382,12 @@ INT WINAPI WINSOCK_recvfrom(SOCKET s, char *buf, INT len, INT flags,
struct ws_sockaddr_ipx* from2 = (struct ws_sockaddr_ipx *)from;
#endif
TRACE(winsock, "(%08x): socket %04x, ptr %08x, "
TRACE("(%08x): socket %04x, ptr %08x, "
"len %d, flags %d\n", (unsigned)pwsi, s, (unsigned)buf,
len, flags);
#if DEBUG_SOCKADDR
if( from ) dump_sockaddr(from);
else DUMP("from = NULL\n");
else DPRINTF("from = NULL\n");
#endif
if( _check_ws(pwsi, pws) )
@ -1396,7 +1396,7 @@ INT WINAPI WINSOCK_recvfrom(SOCKET s, char *buf, INT len, INT flags,
if ((length = recvfrom(pws->fd, buf, len, flags, from, fromlen32)) >= 0)
{
TRACE(winsock, " -> %i bytes\n", length);
TRACE(" -> %i bytes\n", length);
if( pws->psop && (pws->flags & (WS_FD_READ | WS_FD_CLOSE)) )
EVENT_AddIO( pws->fd, EVENT_IO_READ ); /* reenabler */
@ -1419,7 +1419,7 @@ INT WINAPI WINSOCK_recvfrom(SOCKET s, char *buf, INT len, INT flags,
SetLastError(wsaErrno());
}
else SetLastError(WSAENOTSOCK);
WARN(winsock, " -> ERROR\n");
WARN(" -> ERROR\n");
#ifdef HAVE_IPX
if (from && ((struct sockaddr_ipx *)from)->sipx_family == AF_IPX) {
from = (struct sockaddr *)
@ -1460,7 +1460,7 @@ static INT __ws_select( BOOL b32, void *ws_readfds, void *ws_writefds, void *ws_
{
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): read %8x, write %8x, excp %8x\n",
TRACE("(%08x): read %8x, write %8x, excp %8x\n",
(unsigned) pwsi, (unsigned) ws_readfds, (unsigned) ws_writefds, (unsigned) ws_exceptfds);
if( pwsi )
@ -1539,7 +1539,7 @@ INT WINAPI WINSOCK_send(SOCKET s, char *buf, INT len, INT flags)
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket %04x, ptr %08x, length %d, flags %d\n",
TRACE("(%08x): socket %04x, ptr %08x, length %d, flags %d\n",
(unsigned)pwsi, s, (unsigned) buf, len, flags);
if( _check_ws(pwsi, pws) )
{
@ -1578,7 +1578,7 @@ INT WINAPI WINSOCK_sendto(SOCKET s, char *buf, INT len, INT flags,
struct ws_sockaddr_ipx* to2 = (struct ws_sockaddr_ipx *)to;
#endif
TRACE(winsock, "(%08x): socket %04x, ptr %08x, length %d, flags %d\n",
TRACE("(%08x): socket %04x, ptr %08x, length %d, flags %d\n",
(unsigned)pwsi, s, (unsigned) buf, len, flags);
if( _check_ws(pwsi, pws) )
{
@ -1643,7 +1643,7 @@ INT WINAPI WINSOCK_setsockopt(SOCKET16 s, INT level, INT optname,
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket %04x, lev %d, opt %d, ptr %08x, len %d\n",
TRACE("(%08x): socket %04x, lev %d, opt %d, ptr %08x, len %d\n",
(unsigned)pwsi, s, level, optname, (int) optval, optlen);
if( _check_ws(pwsi, pws) )
{
@ -1685,7 +1685,7 @@ INT WINAPI WINSOCK_shutdown(SOCKET s, INT how)
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): socket %04x, how %i\n",
TRACE("(%08x): socket %04x, how %i\n",
(unsigned)pwsi, s, how );
if( _check_ws(pwsi, pws) )
{
@ -1750,7 +1750,7 @@ SOCKET WINAPI WINSOCK_socket(INT af, INT type, INT protocol)
{
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): af=%d type=%d protocol=%d\n",
TRACE("(%08x): af=%d type=%d protocol=%d\n",
(unsigned)pwsi, af, type, protocol);
if( pwsi )
@ -1797,7 +1797,7 @@ SOCKET WINAPI WINSOCK_socket(INT af, INT type, INT protocol)
{
ws_socket* pnew = wsi_alloc_socket(pwsi, sock);
TRACE(winsock,"\tcreated %i (handle %04x)\n", sock, (UINT16)WS_PTR2HANDLE(pnew));
TRACE("\tcreated %i (handle %04x)\n", sock, (UINT16)WS_PTR2HANDLE(pnew));
if( pnew )
{
@ -1813,14 +1813,14 @@ SOCKET WINAPI WINSOCK_socket(INT af, INT type, INT protocol)
if (errno == EPERM) /* raw socket denied */
{
if (type == SOCK_RAW)
MSG("WARNING: Trying to create a socket of type SOCK_RAW, will fail unless running as root\n");
MESSAGE("WARNING: Trying to create a socket of type SOCK_RAW, will fail unless running as root\n");
else
MSG("WS_SOCKET: not enough privileges to create socket, try running as root\n");
MESSAGE("WS_SOCKET: not enough privileges to create socket, try running as root\n");
SetLastError(WSAESOCKTNOSUPPORT);
} else SetLastError(wsaErrno());
}
WARN(winsock, "\t\tfailed!\n");
WARN("\t\tfailed!\n");
return INVALID_SOCKET;
}
@ -1867,7 +1867,7 @@ static struct WIN_hostent* __ws_gethostbyaddr(const char *addr, int len, int typ
SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type)
{
struct WIN_hostent* retval;
TRACE(winsock, "ptr %08x, len %d, type %d\n",
TRACE("ptr %08x, len %d, type %d\n",
(unsigned) addr, len, type);
retval = __ws_gethostbyaddr( addr, len, type, WS_DUP_SEGPTR );
return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
@ -1876,7 +1876,7 @@ SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type)
struct WIN_hostent* WINAPI WINSOCK_gethostbyaddr(const char *addr, INT len,
INT type)
{
TRACE(winsock, "ptr %08x, len %d, type %d\n",
TRACE("ptr %08x, len %d, type %d\n",
(unsigned) addr, len, type);
return __ws_gethostbyaddr(addr, len, type, WS_DUP_LINEAR);
}
@ -1903,14 +1903,14 @@ static struct WIN_hostent * __ws_gethostbyname(const char *name, int dup_flag)
SEGPTR WINAPI WINSOCK_gethostbyname16(const char *name)
{
struct WIN_hostent* retval;
TRACE(winsock, "%s\n", (name)?name:NULL_STRING);
TRACE("%s\n", (name)?name:NULL_STRING);
retval = __ws_gethostbyname( name, WS_DUP_SEGPTR );
return (retval)? SEGPTR_GET(retval) : ((SEGPTR)NULL) ;
}
struct WIN_hostent* WINAPI WINSOCK_gethostbyname(const char* name)
{
TRACE(winsock, "%s\n", (name)?name:NULL_STRING);
TRACE("%s\n", (name)?name:NULL_STRING);
return __ws_gethostbyname( name, WS_DUP_LINEAR );
}
@ -1937,14 +1937,14 @@ static struct WIN_protoent* __ws_getprotobyname(const char *name, int dup_flag)
SEGPTR WINAPI WINSOCK_getprotobyname16(const char *name)
{
struct WIN_protoent* retval;
TRACE(winsock, "%s\n", (name)?name:NULL_STRING);
TRACE("%s\n", (name)?name:NULL_STRING);
retval = __ws_getprotobyname(name, WS_DUP_SEGPTR);
return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
}
struct WIN_protoent* WINAPI WINSOCK_getprotobyname(const char* name)
{
TRACE(winsock, "%s\n", (name)?name:NULL_STRING);
TRACE("%s\n", (name)?name:NULL_STRING);
return __ws_getprotobyname(name, WS_DUP_LINEAR);
}
@ -1971,14 +1971,14 @@ static struct WIN_protoent* __ws_getprotobynumber(int number, int dup_flag)
SEGPTR WINAPI WINSOCK_getprotobynumber16(INT16 number)
{
struct WIN_protoent* retval;
TRACE(winsock, "%i\n", number);
TRACE("%i\n", number);
retval = __ws_getprotobynumber(number, WS_DUP_SEGPTR);
return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
}
struct WIN_protoent* WINAPI WINSOCK_getprotobynumber(INT number)
{
TRACE(winsock, "%i\n", number);
TRACE("%i\n", number);
return __ws_getprotobynumber(number, WS_DUP_LINEAR);
}
@ -2009,7 +2009,7 @@ struct WIN_servent* __ws_getservbyname(const char *name, const char *proto, int
SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto)
{
struct WIN_servent* retval;
TRACE(winsock, "'%s', '%s'\n",
TRACE("'%s', '%s'\n",
(name)?name:NULL_STRING, (proto)?proto:NULL_STRING);
retval = __ws_getservbyname(name, proto, WS_DUP_SEGPTR);
return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
@ -2017,7 +2017,7 @@ SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto)
struct WIN_servent* WINAPI WINSOCK_getservbyname(const char *name, const char *proto)
{
TRACE(winsock, "'%s', '%s'\n",
TRACE("'%s', '%s'\n",
(name)?name:NULL_STRING, (proto)?proto:NULL_STRING);
return __ws_getservbyname(name, proto, WS_DUP_LINEAR);
}
@ -2049,7 +2049,7 @@ static struct WIN_servent* __ws_getservbyport(int port, const char* proto, int d
SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto)
{
struct WIN_servent* retval;
TRACE(winsock, "%i, '%s'\n",
TRACE("%i, '%s'\n",
(int)port, (proto)?proto:NULL_STRING);
retval = __ws_getservbyport(port, proto, WS_DUP_SEGPTR);
return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
@ -2057,7 +2057,7 @@ SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto)
struct WIN_servent* WINAPI WINSOCK_getservbyport(INT port, const char *proto)
{
TRACE(winsock, "%i, '%s'\n",
TRACE("%i, '%s'\n",
(int)port, (proto)?proto:NULL_STRING);
return __ws_getservbyport(port, proto, WS_DUP_LINEAR);
}
@ -2070,7 +2070,7 @@ INT WINAPI WINSOCK_gethostname(char *name, INT namelen)
{
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): name %s, len %d\n",
TRACE("(%08x): name %s, len %d\n",
(unsigned)pwsi, (name)?name:NULL_STRING, namelen);
if( pwsi )
{
@ -2110,7 +2110,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending,
DWORD dwEvent, dwErrBytes;
int num_posted;
TRACE(winsock,"%i pending descriptors\n", num_pending );
TRACE("%i pending descriptors\n", num_pending );
for( num_posted = dwEvent = 0 ; psop; psop = psop->next )
{
@ -2128,7 +2128,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending,
* Reenabling calls turn them back on.
*/
TRACE(winsock,"\tchecking psop = 0x%08x\n", (unsigned) psop );
TRACE("\tchecking psop = 0x%08x\n", (unsigned) psop );
num_pending--;
@ -2204,7 +2204,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending,
if( PostMessageA( psop->hWnd, psop->uMsg, (WPARAM)WS_PTR2HANDLE(psop->pws),
(LPARAM)WSAMAKESELECTREPLY( WS_FD_WRITE, 0 ) ) )
{
TRACE(winsock, "\t hwnd %04x - %04x, %08x\n",
TRACE("\t hwnd %04x - %04x, %08x\n",
psop->hWnd, psop->uMsg, (unsigned)MAKELONG(WS_FD_WRITE, 0) );
FD_CLR( fd, &event_set[EVENT_IO_WRITE] );
num_posted++;
@ -2266,7 +2266,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending,
if( bPost )
{
TRACE(winsock, "\t hwnd %04x - %04x, %08x\n",
TRACE("\t hwnd %04x - %04x, %08x\n",
psop->hWnd, psop->uMsg, (unsigned)dwEvent );
PostMessageA( psop->hWnd, psop->uMsg,
(WPARAM)WS_PTR2HANDLE(psop->pws), (LPARAM)dwEvent );
@ -2277,7 +2277,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending,
if( num_pending <= 0 ) break;
}
TRACE(winsock, "\tdone, %i posted events\n", num_posted );
TRACE("\tdone, %i posted events\n", num_posted );
return ( num_posted ) ? TRUE : FALSE;
}
@ -2286,7 +2286,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent)
ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s);
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): %04x, hWnd %04x, uMsg %08x, event %08x\n",
TRACE("(%08x): %04x, hWnd %04x, uMsg %08x, event %08x\n",
(unsigned)pwsi, (SOCKET16)s, (HWND16)hWnd, uMsg, (unsigned)lEvent );
if( _check_ws(pwsi, pws) )
{
@ -2307,7 +2307,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent)
if( pws->flags & (WS_FD_CONNECT | WS_FD_WRITE) )
EVENT_DeleteIO( pws->fd, EVENT_IO_WRITE );
TRACE(winsock,"\tremoving psop = 0x%08x\n", (unsigned) psop );
TRACE("\tremoving psop = 0x%08x\n", (unsigned) psop );
WS_FREE( pws->psop );
pws->flags &= ~(WS_FD_RAW | WS_FD_ACCEPT | WS_FD_CONNECT |
@ -2346,7 +2346,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent)
/* TODO: handle WS_FD_ACCEPT right away if the socket is readable */
TRACE(winsock,"\tcreating psop = 0x%08x\n", (unsigned)psop );
TRACE("\tcreating psop = 0x%08x\n", (unsigned)psop );
return 0; /* success */
}
@ -2371,7 +2371,7 @@ INT16 WINAPI __WSAFDIsSet16(SOCKET16 s, ws_fd_set16 *set)
{
int i = set->fd_count;
TRACE(winsock, "(%d,%8lx(%i))\n", s,(unsigned long)set, i);
TRACE("(%d,%8lx(%i))\n", s,(unsigned long)set, i);
while (i--)
if (set->fd_array[i] == s) return 1;
@ -2385,7 +2385,7 @@ INT WINAPI __WSAFDIsSet(SOCKET s, ws_fd_set32 *set)
{
int i = set->fd_count;
TRACE(winsock, "(%d,%8lx(%i))\n", s,(unsigned long)set, i);
TRACE("(%d,%8lx(%i))\n", s,(unsigned long)set, i);
while (i--)
if (set->fd_array[i] == s) return 1;
@ -2405,7 +2405,7 @@ BOOL WINAPI WSAIsBlocking(void)
* Note: It is allowed to call this function without prior WSAStartup().
*/
TRACE(winsock, "\n");
TRACE("\n");
return FALSE;
}
@ -2416,7 +2416,7 @@ INT WINAPI WSACancelBlockingCall(void)
{
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x)\n", (unsigned)pwsi);
TRACE("(%08x)\n", (unsigned)pwsi);
if( pwsi ) return 0;
return SOCKET_ERROR;
@ -2431,7 +2431,7 @@ FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc)
FARPROC16 prev;
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): hook %08x\n",
TRACE("(%08x): hook %08x\n",
(unsigned)pwsi, (unsigned) lpBlockFunc);
if( pwsi )
{
@ -2452,7 +2452,7 @@ FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc)
FARPROC prev;
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x): hook %08x\n",
TRACE("(%08x): hook %08x\n",
(unsigned)pwsi, (unsigned) lpBlockFunc);
if( pwsi ) {
prev = (FARPROC)pwsi->blocking_hook;
@ -2471,7 +2471,7 @@ INT16 WINAPI WSAUnhookBlockingHook16(void)
{
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x)\n", (unsigned)pwsi);
TRACE("(%08x)\n", (unsigned)pwsi);
if( pwsi ) return (INT16)(pwsi->blocking_hook = 0);
return SOCKET_ERROR;
}
@ -2484,7 +2484,7 @@ INT WINAPI WSAUnhookBlockingHook(void)
{
LPWSINFO pwsi = wsi_find(GetCurrentTask());
TRACE(winsock, "(%08x)\n", (unsigned)pwsi);
TRACE("(%08x)\n", (unsigned)pwsi);
if( pwsi )
{
pwsi->blocking_hook = 0;
@ -2534,11 +2534,11 @@ DWORD WINAPI WsControl(DWORD protocoll,DWORD action,
char type= *(unsigned char*)(inbuf+15); /* 0x2: don't fragment*/
#endif
FIXME(winsock,"(ICMP_ECHO) to 0x%08x stub \n", addr);
FIXME("(ICMP_ECHO) to 0x%08x stub \n", addr);
break;
}
default:
FIXME(winsock,"(%lx,%lx,%p,%p,%p,%p) stub\n",
FIXME("(%lx,%lx,%p,%p,%p,%p) stub\n",
protocoll,action,inbuf,inbuflen,outbuf,outbuflen);
}
return FALSE;
@ -2548,7 +2548,7 @@ DWORD WINAPI WsControl(DWORD protocoll,DWORD action,
*/
void WINAPI WS_s_perror(LPCSTR message)
{
FIXME(winsock,"(%s): stub\n",message);
FIXME("(%s): stub\n",message);
return;
}
@ -2731,9 +2731,9 @@ UINT16 wsaErrno(void)
{
int loc_errno = errno;
#ifdef HAVE_STRERROR
WARN(winsock, "errno %d, (%s).\n", loc_errno, strerror(loc_errno));
WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno));
#else
WARN(winsock, "errno %d\n", loc_errno);
WARN("errno %d\n", loc_errno);
#endif
switch(loc_errno)
@ -2796,7 +2796,7 @@ UINT16 wsaErrno(void)
/* just in case we ever get here and there are no problems */
case 0: return 0;
default:
WARN(winsock, "Unknown errno %d!\n", loc_errno);
WARN("Unknown errno %d!\n", loc_errno);
return WSAEOPNOTSUPP;
}
}
@ -2805,7 +2805,7 @@ UINT16 wsaHerrno(void)
{
int loc_errno = h_errno;
WARN(winsock, "h_errno %d.\n", loc_errno);
WARN("h_errno %d.\n", loc_errno);
switch(loc_errno)
{
@ -2816,7 +2816,7 @@ UINT16 wsaHerrno(void)
case 0: return 0;
default:
WARN(winsock,"Unknown h_errno %d!\n", loc_errno);
WARN("Unknown h_errno %d!\n", loc_errno);
return WSAEOPNOTSUPP;
}
}

28
misc/winsock_async.c
View File

@ -67,7 +67,7 @@
#include "task.h"
#include "message.h"
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(winsock)
@ -372,7 +372,7 @@ static HANDLE16 __WSAsyncDBQuery(
HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr,
INT16 len, INT16 type, SEGPTR sbuf, INT16 buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, addr %08x[%i]\n",
TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n",
hWnd, uMsg, (unsigned)addr , len );
return __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,(void*)sbuf,buflen,AQ_NUMBER|AQ_WIN16|AQ_GETHOST);
}
@ -383,7 +383,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr,
HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr,
INT len, INT type, LPSTR sbuf, INT buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, addr %08x[%i]\n",
TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n",
hWnd, uMsg, (unsigned)addr , len );
return __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,sbuf,buflen,AQ_NUMBER|AQ_WIN32|AQ_GETHOST);
}
@ -394,7 +394,7 @@ HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr,
HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
SEGPTR sbuf, INT16 buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, host %s, buffer %i\n", hWnd, uMsg, (name)?name:"<null>", (int)buflen );
TRACE("hwnd %04x, msg %04x, host %s, buffer %i\n", hWnd, uMsg, (name)?name:"<null>", (int)buflen );
return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,(void*)sbuf,buflen,AQ_NAME|AQ_WIN16|AQ_GETHOST);
}
@ -405,7 +405,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name,
LPSTR sbuf, INT buflen)
{
TRACE(winsock, "hwnd %04x, msg %08x, host %s, buffer %i\n",
TRACE("hwnd %04x, msg %08x, host %s, buffer %i\n",
(HWND16)hWnd, uMsg, (name)?name:"<null>", (int)buflen );
return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen,AQ_NAME|AQ_WIN32|AQ_GETHOST);
}
@ -416,7 +416,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name,
HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
SEGPTR sbuf, INT16 buflen)
{
TRACE(winsock, "hwnd %04x, msg %08x, protocol %s\n",
TRACE("hwnd %04x, msg %08x, protocol %s\n",
(HWND16)hWnd, uMsg, (name)?name:"<null>" );
return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,(void*)sbuf,buflen,AQ_GETPROTO|AQ_NAME|AQ_WIN16);
}
@ -427,7 +427,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name,
LPSTR sbuf, INT buflen)
{
TRACE(winsock, "hwnd %04x, msg %08x, protocol %s\n",
TRACE("hwnd %04x, msg %08x, protocol %s\n",
(HWND16)hWnd, uMsg, (name)?name:"<null>" );
return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen,AQ_GETPROTO|AQ_NAME|AQ_WIN32);
}
@ -439,7 +439,7 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name,
HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number,
SEGPTR sbuf, INT16 buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number );
TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number );
return __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,(void*)sbuf,buflen,AQ_GETPROTO|AQ_NUMBER|AQ_WIN16);
}
@ -449,7 +449,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number,
HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number,
LPSTR sbuf, INT buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number );
TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number );
return __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,sbuf,buflen,AQ_GETPROTO|AQ_NUMBER|AQ_WIN32);
}
@ -460,7 +460,7 @@ HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number,
HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
LPCSTR proto, SEGPTR sbuf, INT16 buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, name %s, proto %s\n",
TRACE("hwnd %04x, msg %04x, name %s, proto %s\n",
hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>" );
return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,(void*)sbuf,buflen,AQ_GETSERV|AQ_NAME|AQ_WIN16);
@ -472,7 +472,7 @@ HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name,
LPCSTR proto, LPSTR sbuf, INT buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, name %s, proto %s\n",
TRACE("hwnd %04x, msg %04x, name %s, proto %s\n",
hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>" );
return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,sbuf,buflen,AQ_GETSERV|AQ_NAME|AQ_WIN32);
}
@ -483,7 +483,7 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name,
HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port,
LPCSTR proto, SEGPTR sbuf, INT16 buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, port %i, proto %s\n",
TRACE("hwnd %04x, msg %04x, port %i, proto %s\n",
hWnd, uMsg, port, (proto)?proto:"<null>" );
return __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,(void*)sbuf,buflen,AQ_GETSERV|AQ_NUMBER|AQ_WIN16);
}
@ -494,7 +494,7 @@ HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port,
HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port,
LPCSTR proto, LPSTR sbuf, INT buflen)
{
TRACE(winsock, "hwnd %04x, msg %04x, port %i, proto %s\n",
TRACE("hwnd %04x, msg %04x, port %i, proto %s\n",
hWnd, uMsg, port, (proto)?proto:"<null>" );
return __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,sbuf,buflen,AQ_GETSERV|AQ_NUMBER|AQ_WIN32);
}
@ -504,7 +504,7 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port,
*/
INT WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle)
{
FIXME(winsock, "(%08x),stub\n", hAsyncTaskHandle);
FIXME("(%08x),stub\n", hAsyncTaskHandle);
return 0;
}

18
misc/wsprintf.c
View File

@ -12,7 +12,7 @@
#include "stackframe.h"
#include "module.h"
#include "global.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(string)
@ -448,7 +448,7 @@ INT WINAPI wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec,
maxlen -= len;
}
*p = 0;
TRACE(string,"%s\n",buffer);
TRACE("%s\n",buffer);
return (maxlen > 1) ? (INT)(p - buffer) : -1;
}
@ -533,7 +533,7 @@ INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec,
*/
INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, LPCVOID args )
{
TRACE(string,"for %p got:\n",buffer);
TRACE("for %p got:\n",buffer);
return wvsnprintf16( buffer, 0xffff, spec, args );
}
@ -543,7 +543,7 @@ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, LPCVOID args )
*/
INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args )
{
TRACE(string,"for %p got:\n",buffer);
TRACE("for %p got:\n",buffer);
return wvsnprintfA( buffer, 0xffffffff, spec, args );
}
@ -553,7 +553,7 @@ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args )
*/
INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args )
{
TRACE(string,"for %p got:\n",buffer);
TRACE("for %p got:\n",buffer);
return wvsnprintfW( buffer, 0xffffffff, spec, args );
}
@ -567,7 +567,7 @@ INT16 WINAPIV wsprintf16( LPSTR buffer, LPCSTR spec, ... )
va_list valist;
INT16 res;
TRACE(string,"for %p got:\n",buffer);
TRACE("for %p got:\n",buffer);
va_start( valist, spec );
/* Note: we call the 32-bit version, because the args are 32-bit */
res = (INT16)wvsnprintfA( buffer, 0xffffffff, spec, valist );
@ -585,7 +585,7 @@ INT16 WINAPIV WIN16_wsprintf16(void)
VA_START16( valist );
buffer = VA_ARG16( valist, SEGPTR );
spec = VA_ARG16( valist, SEGPTR );
TRACE(string,"got:\n");
TRACE("got:\n");
res = wvsnprintf16( (LPSTR)PTR_SEG_TO_LIN(buffer), 0xffff,
(LPCSTR)PTR_SEG_TO_LIN(spec), valist );
VA_END16( valist );
@ -601,7 +601,7 @@ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... )
va_list valist;
INT res;
TRACE(string,"for %p got:\n",buffer);
TRACE("for %p got:\n",buffer);
va_start( valist, spec );
res = wvsnprintfA( buffer, 0xffffffff, spec, valist );
va_end( valist );
@ -617,7 +617,7 @@ INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... )
va_list valist;
INT res;
TRACE(string,"wsprintfW for %p\n",buffer);
TRACE("wsprintfW for %p\n",buffer);
va_start( valist, spec );
res = wvsnprintfW( buffer, 0xffffffff, spec, valist );
va_end( valist );

8
misc/xmalloc.c
View File

@ -16,7 +16,7 @@
#include <stdlib.h>
#include <string.h>
#include "xmalloc.h"
#include "debug.h"
#include "debugtools.h"
void *xmalloc( int size )
{
@ -25,7 +25,7 @@ void *xmalloc( int size )
res = malloc (size ? size : 1);
if (res == NULL)
{
MSG("Virtual memory exhausted.\n");
MESSAGE("Virtual memory exhausted.\n");
exit (1);
}
memset(res,0,size);
@ -47,7 +47,7 @@ void *xrealloc( void *ptr, int size )
void *res = realloc (ptr, size);
if ((res == NULL) && size)
{
MSG("Virtual memory exhausted.\n");
MESSAGE("Virtual memory exhausted.\n");
exit (1);
}
return res;
@ -59,7 +59,7 @@ char *xstrdup( const char *str )
char *res = strdup( str );
if (!res)
{
MSG("Virtual memory exhausted.\n");
MESSAGE("Virtual memory exhausted.\n");
exit (1);
}
return res;

16
miscemu/emulate.c
View File

@ -1,6 +1,6 @@
#include <stdlib.h>
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -29,7 +29,7 @@ struct Win87EmInfoStruct
void WINAPI WIN87_fpmath( CONTEXT86 *context )
{
TRACE(int, "(cs:eip=%x:%lx es=%x bx=%04x ax=%04x dx==%04x)\n",
TRACE("(cs:eip=%x:%lx es=%x bx=%04x ax=%04x dx==%04x)\n",
(WORD)CS_reg(context), EIP_reg(context),
(WORD)ES_reg(context), BX_reg(context),
AX_reg(context), DX_reg(context) );
@ -70,7 +70,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context )
*/
__asm__ __volatile__("frndint");
__asm__ __volatile__("fist %0;wait" : "=m" (dw) : : "memory");
TRACE(int,"On top of stack is %ld\n",dw);
TRACE("On top of stack is %ld\n",dw);
}
break;
@ -84,7 +84,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context )
*/
/* FIXME: could someone who really understands asm() fix this please? --AJ */
/* __asm__("fistp %0;wait" : "=m" (dw) : : "memory"); */
TRACE(int,"On top of stack was %ld\n",dw);
TRACE("On top of stack was %ld\n",dw);
AX_reg(context) = LOWORD(dw);
DX_reg(context) = HIWORD(dw);
}
@ -109,7 +109,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context )
break;
default: /* error. Say that loud and clear */
FIXME(int,"unhandled switch %d\n",BX_reg(context));
FIXME("unhandled switch %d\n",BX_reg(context));
AX_reg(context) = DX_reg(context) = 0xFFFF;
break;
}
@ -119,18 +119,18 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context )
void WINAPI WIN87_WinEm87Info(struct Win87EmInfoStruct *pWIS,
int cbWin87EmInfoStruct)
{
TRACE(int, "(%p,%d)\n",pWIS,cbWin87EmInfoStruct);
TRACE("(%p,%d)\n",pWIS,cbWin87EmInfoStruct);
}
void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea,
int cbWin87EmSaveArea)
{
TRACE(int, "(%p,%d)\n",
TRACE("(%p,%d)\n",
pWin87EmSaveArea,cbWin87EmSaveArea);
}
void WINAPI WIN87_WinEm87Save(void *pWin87EmSaveArea, int cbWin87EmSaveArea)
{
TRACE(int, "(%p,%d)\n",
TRACE("(%p,%d)\n",
pWin87EmSaveArea,cbWin87EmSaveArea);
}

14
miscemu/main.c
View File

@ -18,7 +18,7 @@
#include "task.h"
#include "stackframe.h"
#include "wine/exception.h"
#include "debug.h"
#include "debugtools.h"
static int MAIN_argc;
static char **MAIN_argv;
@ -100,12 +100,12 @@ void MAIN_EmulatorRun( void )
{
if ((handle = WinExec( MAIN_argv[i], SW_SHOWNORMAL )) < 32)
{
MSG("wine: can't exec '%s': ", MAIN_argv[i]);
MESSAGE("wine: can't exec '%s': ", MAIN_argv[i]);
switch (handle)
{
case 2: MSG("file not found\n" ); break;
case 11: MSG("invalid exe file\n" ); break;
default: MSG("error=%d\n", handle ); break;
case 2: MESSAGE("file not found\n" ); break;
case 11: MESSAGE("invalid exe file\n" ); break;
default: MESSAGE("error=%d\n", handle ); break;
}
}
else tasks++;
@ -113,7 +113,7 @@ void MAIN_EmulatorRun( void )
if (!tasks)
{
MSG("wine: no executable file found.\n" );
MESSAGE("wine: no executable file found.\n" );
ExitProcess( 0 );
}
@ -177,6 +177,6 @@ int main( int argc, char *argv[] )
/* Switch stacks and jump to MAIN_EmulatorRun */
CALL32_Init( &IF1632_CallLargeStack, MAIN_EmulatorRun, NtCurrentTeb()->stack_top );
MSG( "main: Should never happen: returned from CALL32_Init()\n" );
MESSAGE( "main: Should never happen: returned from CALL32_Init()\n" );
return 0;
}

2
msdos/devices.c
View File

@ -10,7 +10,7 @@
#include "msdos.h"
#include "miscemu.h"
#include "dosexe.h"
#include "debug.h"
#include "debugtools.h"
#include "pshpack1.h"

40
msdos/dosconf.c
View File

@ -12,7 +12,7 @@
#include <ctype.h>
#include "winbase.h"
#include "msdos.h"
#include "debug.h"
#include "debugtools.h"
#include "options.h"
#include "file.h"
@ -133,7 +133,7 @@ static int DOSCONF_Device(char **confline)
/* FIXME: get DEVICEHIGH parameters if avail ? */
}
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
TRACE(profile, "Loading device '%s'\n", *confline);
TRACE("Loading device '%s'\n", *confline);
#if 0
DOSMOD_LoadDevice(*confline, loadhigh);
#endif
@ -160,7 +160,7 @@ static int DOSCONF_Dos(char **confline)
else (*confline)++;
DOSCONF_JumpToEntry(confline, ',');
}
TRACE(profile, "DOSCONF_Dos: HIGH is %d, UMB is %d\n",
TRACE("DOSCONF_Dos: HIGH is %d, UMB is %d\n",
(DOSCONF_config.flags & DOSCONF_MEM_HIGH) != 0, (DOSCONF_config.flags & DOSCONF_MEM_UMB) != 0);
return 1;
}
@ -172,10 +172,10 @@ static int DOSCONF_Fcbs(char **confline)
DOSCONF_config.fcbs = atoi(*confline);
if (DOSCONF_config.fcbs > 255)
{
MSG("The FCBS value in the config.sys file is too high ! Setting to 255.\n");
MESSAGE("The FCBS value in the config.sys file is too high ! Setting to 255.\n");
DOSCONF_config.fcbs = 255;
}
TRACE(profile, "DOSCONF_Fcbs returning %d\n", DOSCONF_config.fcbs);
TRACE("DOSCONF_Fcbs returning %d\n", DOSCONF_config.fcbs);
return 1;
}
@ -185,7 +185,7 @@ static int DOSCONF_Break(char **confline)
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
if (!(strcasecmp(*confline, "ON")))
DOSCONF_config.brk_flag = 1;
TRACE(profile, "BREAK is %d\n", DOSCONF_config.brk_flag);
TRACE("BREAK is %d\n", DOSCONF_config.brk_flag);
return 1;
}
@ -196,15 +196,15 @@ static int DOSCONF_Files(char **confline)
DOSCONF_config.files = atoi(*confline);
if (DOSCONF_config.files > 255)
{
MSG("The FILES value in the config.sys file is too high ! Setting to 255.\n");
MESSAGE("The FILES value in the config.sys file is too high ! Setting to 255.\n");
DOSCONF_config.files = 255;
}
if (DOSCONF_config.files < 8)
{
MSG("The FILES value in the config.sys file is too low ! Setting to 8.\n");
MESSAGE("The FILES value in the config.sys file is too low ! Setting to 8.\n");
DOSCONF_config.files = 8;
}
TRACE(profile, "DOSCONF_Files returning %d\n", DOSCONF_config.files);
TRACE("DOSCONF_Files returning %d\n", DOSCONF_config.files);
return 1;
}
@ -216,7 +216,7 @@ static int DOSCONF_Install(char **confline)
*confline += 7; /* strlen("INSTALL") */
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
TRACE(profile, "Installing '%s'\n", *confline);
TRACE("Installing '%s'\n", *confline);
#if 0
DOSMOD_Install(*confline, loadhigh);
#endif
@ -228,7 +228,7 @@ static int DOSCONF_Lastdrive(char **confline)
*confline += 9; /* strlen("LASTDRIVE") */
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
DOSCONF_config.lastdrive = toupper(**confline);
TRACE(profile, "Lastdrive %c\n", DOSCONF_config.lastdrive);
TRACE("Lastdrive %c\n", DOSCONF_config.lastdrive);
return 1;
}
@ -236,7 +236,7 @@ static int DOSCONF_Country(char **confline)
{
*confline += 7; /* strlen("COUNTRY") */
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
TRACE(profile, "Country '%s'\n", *confline);
TRACE("Country '%s'\n", *confline);
if (DOSCONF_config.country == NULL)
DOSCONF_config.country = malloc(strlen(*confline) + 1);
strcpy(DOSCONF_config.country, *confline);
@ -249,7 +249,7 @@ static int DOSCONF_Numlock(char **confline)
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
if (!(strcasecmp(*confline, "ON")))
DOSCONF_config.flags |= DOSCONF_NUMLOCK;
TRACE(profile, "NUMLOCK is %d\n", (DOSCONF_config.flags & DOSCONF_NUMLOCK) != 0);
TRACE("NUMLOCK is %d\n", (DOSCONF_config.flags & DOSCONF_NUMLOCK) != 0);
return 1;
}
@ -266,7 +266,7 @@ static int DOSCONF_Switches(char **confline)
DOSCONF_config.flags |= DOSCONF_KEYB_CONV;
}
while ((p = strtok(NULL, "/")));
TRACE(profile, "'Force conventional keyboard' is %d\n",
TRACE("'Force conventional keyboard' is %d\n",
(DOSCONF_config.flags & DOSCONF_KEYB_CONV) != 0);
return 1;
}
@ -275,7 +275,7 @@ static int DOSCONF_Shell(char **confline)
{
*confline += 5; /* strlen("SHELL") */
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
TRACE(profile, "Shell '%s'\n", *confline);
TRACE("Shell '%s'\n", *confline);
if (DOSCONF_config.shell == NULL)
DOSCONF_config.shell = malloc(strlen(*confline) + 1);
strcpy(DOSCONF_config.shell, *confline);
@ -289,7 +289,7 @@ static int DOSCONF_Stacks(char **confline)
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
DOSCONF_config.stacks_nr = atoi(strtok(*confline, ","));
DOSCONF_config.stacks_sz = atoi((strtok(NULL, ",")));
TRACE(profile, "%d stacks of size %d\n",
TRACE("%d stacks of size %d\n",
DOSCONF_config.stacks_nr, DOSCONF_config.stacks_sz);
return 1;
}
@ -304,7 +304,7 @@ static int DOSCONF_Buffers(char **confline)
DOSCONF_config.buf = atoi(p);
if ((p = strtok(NULL, ",")))
DOSCONF_config.buf2 = atoi(p);
TRACE(profile, "%d primary buffers, %d secondary buffers\n",
TRACE("%d primary buffers, %d secondary buffers\n",
DOSCONF_config.buf, DOSCONF_config.buf2);
return 1;
}
@ -352,7 +352,7 @@ static int DOSCONF_Include(char **confline)
if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
fgetpos(cfg_fd, &oldpos);
fseek(cfg_fd, 0, SEEK_SET);
TRACE(profile, "Including menu '%s'\n", *confline);
TRACE("Including menu '%s'\n", *confline);
temp = malloc(strlen(*confline) + 1);
strcpy(temp, *confline);
DOSCONF_Parse(temp);
@ -403,7 +403,7 @@ static void DOSCONF_Parse(char *menuname)
if (!(strncasecmp(p, tag_entries[i].tag_name,
strlen(tag_entries[i].tag_name))))
{
TRACE(profile, "tag '%s'\n", tag_entries[i].tag_name);
TRACE("tag '%s'\n", tag_entries[i].tag_name);
if (tag_entries[i].tag_handler != NULL)
tag_entries[i].tag_handler(&p);
break;
@ -435,7 +435,7 @@ int DOSCONF_ReadConfig(void)
}
else
{
MSG("Couldn't open config.sys file given as \"%s\" in" \
MESSAGE("Couldn't open config.sys file given as \"%s\" in" \
" wine.conf or .winerc, section [wine] !\n", filename);
ret = 0;
}

136
msdos/dpmi.c
View File

@ -20,7 +20,7 @@
#include "selectors.h"
#include "process.h"
#include "callback.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int31)
@ -86,7 +86,7 @@ DPMI_xalloc(int len) {
* try non-linear
*/
if (!xflag && (lastvalloced<oldlastv)) { /* wrapped */
FIXME(int31,"failed to allocate lineary growing memory (%d bytes), using non-linear growing...\n",len);
FIXME("failed to allocate lineary growing memory (%d bytes), using non-linear growing...\n",len);
xflag++;
}
/* if we even fail to allocate something in the next
@ -95,7 +95,7 @@ DPMI_xalloc(int len) {
if ((xflag==1) && (lastvalloced >= oldlastv))
xflag++;
if ((xflag==2) && (lastvalloced < oldlastv)) {
FIXME(int31,"failed to allocate any memory of %d bytes!\n",len);
FIXME("failed to allocate any memory of %d bytes!\n",len);
return NULL;
}
}
@ -119,11 +119,11 @@ DPMI_xrealloc(LPVOID ptr,int newsize) {
newptr = DPMI_xalloc(newsize);
if (ptr) {
if (!VirtualQuery(ptr,&mbi,sizeof(mbi))) {
FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr);
FIXME("realloc of DPMI_xallocd region %p?\n",ptr);
return NULL;
}
if (mbi.State == MEM_FREE) {
FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr);
FIXME("realloc of DPMI_xallocd region %p?\n",ptr);
return NULL;
}
/* We do not shrink allocated memory. most reallocs
@ -203,7 +203,7 @@ static void DPMI_CallRMCBProc( CONTEXT86 *context, RMCB *rmcb, WORD flag )
INT_SetRealModeContext((REALMODECALL *)PTR_SEG_OFF_TO_LIN( rmcb->regs_sel, rmcb->regs_ofs ), context);
ss = SELECTOR_AllocBlock( DOSMEM_MemoryBase(0) + (DWORD)(SS_reg(context)<<4), 0x10000, SEGMENT_DATA, FALSE, FALSE );
FIXME(int31,"untested!\n");
FIXME("untested!\n");
/* The called proc ends with an IRET, and takes these parameters:
* DS:ESI = pointer to real-mode SS:SP
@ -246,7 +246,7 @@ static void DPMI_CallRMCBProc( CONTEXT86 *context, RMCB *rmcb, WORD flag )
SELECTOR_FreeBlock(ss, 1);
INT_GetRealModeContext((REALMODECALL*)PTR_SEG_OFF_TO_LIN( es, edi ), context);
#else
ERR(int31,"RMCBs only implemented for i386\n");
ERR("RMCBs only implemented for i386\n");
#endif
}
}
@ -273,9 +273,9 @@ int DPMI_CallRMProc( CONTEXT86 *context, LPWORD stack, int args, int iret )
GlobalUnlock16( GetCurrentTask() );
TRACE(int31, "EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
TRACE("EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
EAX_reg(context), EBX_reg(context), ECX_reg(context), EDX_reg(context) );
TRACE(int31, "ESI=%08lx EDI=%08lx ES=%04lx DS=%04lx CS:IP=%04lx:%04x, %d WORD arguments, %s\n",
TRACE("ESI=%08lx EDI=%08lx ES=%04lx DS=%04lx CS:IP=%04lx:%04x, %d WORD arguments, %s\n",
ESI_reg(context), EDI_reg(context), ES_reg(context), DS_reg(context),
CS_reg(context), IP_reg(context), args, iret?"IRET":"FAR" );
@ -313,10 +313,10 @@ callrmproc_again:
#ifdef MZ_SUPPORTED
if (!(CurrRMCB || pModule->lpDosTask)) {
FIXME(int31,"DPMI real-mode call using DOS VM task system, not fully tested!\n");
TRACE(int31,"creating VM86 task\n");
FIXME("DPMI real-mode call using DOS VM task system, not fully tested!\n");
TRACE("creating VM86 task\n");
if (!MZ_InitTask( MZ_AllocDPMITask( pModule->self ) )) {
ERR(int31,"could not setup VM86 task\n");
ERR("could not setup VM86 task\n");
return 1;
}
}
@ -327,7 +327,7 @@ callrmproc_again:
SP_reg(context) = 64-2;
stack16 += 32-1;
if (!addr) {
ERR(int31,"could not allocate default stack\n");
ERR("could not allocate default stack\n");
return 1;
}
} else {
@ -377,9 +377,9 @@ callrmproc_again:
CS_reg(context) = DPMI_wrap_seg;
IP_reg(context) = 2;
#endif
TRACE(int31,"entering real mode...\n");
TRACE("entering real mode...\n");
DOSVM_Enter( context );
TRACE(int31,"returned from real-mode call\n");
TRACE("returned from real-mode call\n");
#else
addr = CTX_SEG_OFF_TO_LIN(context, CS_reg(context), EIP_reg(context));
sel = SELECTOR_AllocBlock( addr, 0x10000, SEGMENT_CODE, FALSE, FALSE );
@ -423,10 +423,10 @@ static void CallRMInt( CONTEXT86 *context )
if (INT_RealModeInterrupt( LOWORD(rm_int)/4, &realmode_ctx ))
SET_CFLAG(context);
if (EFL_reg(context)&1) {
FIXME(int31,"%02x: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
FIXME("%02x: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
BL_reg(context), EAX_reg(&realmode_ctx), EBX_reg(&realmode_ctx),
ECX_reg(&realmode_ctx), EDX_reg(&realmode_ctx));
FIXME(int31," ESI=%08lx EDI=%08lx DS=%04lx ES=%04lx\n",
FIXME(" ESI=%08lx EDI=%08lx DS=%04lx ES=%04lx\n",
ESI_reg(&realmode_ctx), EDI_reg(&realmode_ctx),
DS_reg(&realmode_ctx), ES_reg(&realmode_ctx) );
}
@ -440,9 +440,9 @@ static void CallRMProc( CONTEXT86 *context, int iret )
REALMODECALL *p = (REALMODECALL *)PTR_SEG_OFF_TO_LIN( ES_reg(context), DI_reg(context) );
CONTEXT86 context16;
TRACE(int31, "RealModeCall: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
TRACE("RealModeCall: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n",
p->eax, p->ebx, p->ecx, p->edx);
TRACE(int31, " ESI=%08lx EDI=%08lx ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n",
TRACE(" ESI=%08lx EDI=%08lx ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n",
p->esi, p->edi, p->es, p->ds, p->cs, p->ip, CX_reg(context), iret?"IRET":"FAR" );
if (!(p->cs) && !(p->ip)) { /* remove this check
@ -464,7 +464,7 @@ static void WINAPI WINE_UNUSED RMCallbackProc( RMCB *rmcb )
register structure available - this is easily fixed by going through
a Win16 register relay instead of calling RMCallbackProc "directly",
but I won't bother at this time. */
FIXME(int31,"not properly supported on your architecture!\n");
FIXME("not properly supported on your architecture!\n");
}
static RMCB *DPMI_AllocRMCB( void )
@ -510,7 +510,7 @@ static void AllocRMCB( CONTEXT86 *context )
{
RMCB *NewRMCB = DPMI_AllocRMCB();
TRACE(int31, "Function to call: %04x:%04x\n", (WORD)DS_reg(context), SI_reg(context) );
TRACE("Function to call: %04x:%04x\n", (WORD)DS_reg(context), SI_reg(context) );
if (NewRMCB)
{
@ -571,7 +571,7 @@ static int DPMI_FreeRMCB( DWORD address )
static void FreeRMCB( CONTEXT86 *context )
{
FIXME(int31, "callback address: %04x:%04x\n",
FIXME("callback address: %04x:%04x\n",
CX_reg(context), DX_reg(context));
if (DPMI_FreeRMCB(MAKELONG(DX_reg(context), CX_reg(context)))) {
@ -628,7 +628,7 @@ static void StartPM( CONTEXT86 *context, LPDOSTASK lpDosTask )
FS_reg(&pm_ctx) = 0;
GS_reg(&pm_ctx) = 0;
TRACE(int31,"DOS program is now entering protected mode\n");
TRACE("DOS program is now entering protected mode\n");
Callbacks->CallRegisterShortProc(&pm_ctx, 0);
/* in the current state of affairs, we won't ever actually return here... */
@ -653,7 +653,7 @@ void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context )
if (!lpDosTask) {
/* we could probably start a DPMI-only dosmod task here, but I doubt
anything other than real DOS apps want to call raw mode switch */
ERR(int31,"attempting raw mode switch without DOS task!\n");
ERR("attempting raw mode switch without DOS task!\n");
ExitProcess(1);
}
/* initialize real-mode context as per spec */
@ -670,7 +670,7 @@ void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context )
EFL_reg(&rm_ctx) = EFL_sig(context); /* at least we need the IF flag */
/* enter real mode again */
TRACE(int31,"re-entering real mode at %04lx:%04lx\n",
TRACE("re-entering real mode at %04lx:%04lx\n",
CS_reg(&rm_ctx),EIP_reg(&rm_ctx));
ret = DOSVM_Enter( &rm_ctx );
/* when the real-mode stuff call its mode switch address,
@ -693,14 +693,14 @@ void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context )
GS_sig(context) = 0;
/* Return to new address and hope that we didn't mess up */
TRACE(int31,"re-entering protected mode at %04x:%08lx\n",
TRACE("re-entering protected mode at %04x:%08lx\n",
CS_sig(context), EIP_sig(context));
}
#else
void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context )
{
ERR(int31,"don't even think about DPMI raw mode switch without DOS support!\n");
ERR("don't even think about DPMI raw mode switch without DOS support!\n");
ExitProcess(1);
}
#endif
@ -739,7 +739,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
#ifdef MZ_SUPPORTED
if (ISV86(context) && lpDosTask) {
/* Called from real mode, check if it's our wrapper */
TRACE(int31,"called from real mode\n");
TRACE("called from real mode\n");
if (CS_reg(context)==lpDosTask->dpmi_seg) {
/* This is the protected mode switch */
StartPM(context,lpDosTask);
@ -770,18 +770,18 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
switch(AX_reg(context))
{
case 0x0000: /* Allocate LDT descriptors */
TRACE(int31,"allocate LDT descriptors (%d)\n",CX_reg(context));
TRACE("allocate LDT descriptors (%d)\n",CX_reg(context));
if (!(AX_reg(context) = AllocSelectorArray16( CX_reg(context) )))
{
TRACE(int31,"failed\n");
TRACE("failed\n");
AX_reg(context) = 0x8011; /* descriptor unavailable */
SET_CFLAG(context);
}
TRACE(int31,"success, array starts at 0x%04x\n",AX_reg(context));
TRACE("success, array starts at 0x%04x\n",AX_reg(context));
break;
case 0x0001: /* Free LDT descriptor */
TRACE(int31,"free LDT descriptor (0x%04x)\n",BX_reg(context));
TRACE("free LDT descriptor (0x%04x)\n",BX_reg(context));
if (FreeSelector16( BX_reg(context) ))
{
AX_reg(context) = 0x8022; /* invalid selector */
@ -799,7 +799,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0002: /* Real mode segment to descriptor */
TRACE(int31,"real mode segment to descriptor (0x%04x)\n",BX_reg(context));
TRACE("real mode segment to descriptor (0x%04x)\n",BX_reg(context));
{
WORD entryPoint = 0; /* KERNEL entry point for descriptor */
switch(BX_reg(context))
@ -825,22 +825,22 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0003: /* Get next selector increment */
TRACE(int31,"get selector increment (__AHINCR)\n");
TRACE("get selector increment (__AHINCR)\n");
AX_reg(context) = __AHINCR;
break;
case 0x0004: /* Lock selector (not supported) */
FIXME(int31,"lock selector not supported\n");
FIXME("lock selector not supported\n");
AX_reg(context) = 0; /* FIXME: is this a correct return value? */
break;
case 0x0005: /* Unlock selector (not supported) */
FIXME(int31,"unlock selector not supported\n");
FIXME("unlock selector not supported\n");
AX_reg(context) = 0; /* FIXME: is this a correct return value? */
break;
case 0x0006: /* Get selector base address */
TRACE(int31,"get selector base address (0x%04x)\n",BX_reg(context));
TRACE("get selector base address (0x%04x)\n",BX_reg(context));
if (!(dw = GetSelectorBase( BX_reg(context) )))
{
AX_reg(context) = 0x8022; /* invalid selector */
@ -860,7 +860,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0007: /* Set selector base address */
TRACE(int31, "set selector base address (0x%04x,0x%08lx)\n",
TRACE("set selector base address (0x%04x,0x%08lx)\n",
BX_reg(context),
W32S_APP2WINE(MAKELONG(DX_reg(context),CX_reg(context)), offset));
dw = W32S_APP2WINE(MAKELONG(DX_reg(context), CX_reg(context)), offset);
@ -874,7 +874,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0008: /* Set selector limit */
TRACE(int31,"set selector limit (0x%04x,0x%08lx)\n",BX_reg(context),MAKELONG(DX_reg(context),CX_reg(context)));
TRACE("set selector limit (0x%04x,0x%08lx)\n",BX_reg(context),MAKELONG(DX_reg(context),CX_reg(context)));
dw = MAKELONG( DX_reg(context), CX_reg(context) );
#ifdef MZ_SUPPORTED
if (lpDosTask) {
@ -902,12 +902,12 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0009: /* Set selector access rights */
TRACE(int31,"set selector access rights(0x%04x,0x%04x)\n",BX_reg(context),CX_reg(context));
TRACE("set selector access rights(0x%04x,0x%04x)\n",BX_reg(context),CX_reg(context));
SelectorAccessRights16( BX_reg(context), 1, CX_reg(context) );
break;
case 0x000a: /* Allocate selector alias */
TRACE(int31,"allocate selector alias (0x%04x)\n",BX_reg(context));
TRACE("allocate selector alias (0x%04x)\n",BX_reg(context));
if (!(AX_reg(context) = AllocCStoDSAlias16( BX_reg(context) )))
{
AX_reg(context) = 0x8011; /* descriptor unavailable */
@ -916,7 +916,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x000b: /* Get descriptor */
TRACE(int31,"get descriptor (0x%04x)\n",BX_reg(context));
TRACE("get descriptor (0x%04x)\n",BX_reg(context));
{
ldt_entry entry;
LDT_GetEntry( SELECTOR_TO_ENTRY( BX_reg(context) ), &entry );
@ -935,7 +935,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x000c: /* Set descriptor */
TRACE(int31,"set descriptor (0x%04x)\n",BX_reg(context));
TRACE("set descriptor (0x%04x)\n",BX_reg(context));
{
ldt_entry entry;
LDT_BytesToEntry( PTR_SEG_OFF_TO_LIN( ES_reg(context),
@ -958,12 +958,12 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x000d: /* Allocate specific LDT descriptor */
FIXME(int31,"allocate descriptor (0x%04x), stub!\n",BX_reg(context));
FIXME("allocate descriptor (0x%04x), stub!\n",BX_reg(context));
AX_reg(context) = 0x8011; /* descriptor unavailable */
SET_CFLAG(context);
break;
case 0x0100: /* Allocate DOS memory block */
TRACE(int31,"allocate DOS memory block (0x%x paragraphs)\n",BX_reg(context));
TRACE("allocate DOS memory block (0x%x paragraphs)\n",BX_reg(context));
dw = GlobalDOSAlloc16((DWORD)BX_reg(context)<<4);
if (dw) {
AX_reg(context) = HIWORD(dw);
@ -975,7 +975,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
}
break;
case 0x0101: /* Free DOS memory block */
TRACE(int31,"free DOS memory block (0x%04x)\n",DX_reg(context));
TRACE("free DOS memory block (0x%04x)\n",DX_reg(context));
dw = GlobalDOSFree16(DX_reg(context));
if (!dw) {
AX_reg(context) = 0x0009; /* memory block address invalid */
@ -983,23 +983,23 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
}
break;
case 0x0200: /* get real mode interrupt vector */
FIXME(int31,"get realmode interupt vector(0x%02x) unimplemented.\n",
FIXME("get realmode interupt vector(0x%02x) unimplemented.\n",
BL_reg(context));
SET_CFLAG(context);
break;
case 0x0201: /* set real mode interrupt vector */
FIXME(int31, "set realmode interupt vector(0x%02x,0x%04x:0x%04x) unimplemented\n", BL_reg(context),CX_reg(context),DX_reg(context));
FIXME("set realmode interupt vector(0x%02x,0x%04x:0x%04x) unimplemented\n", BL_reg(context),CX_reg(context),DX_reg(context));
SET_CFLAG(context);
break;
case 0x0204: /* Get protected mode interrupt vector */
TRACE(int31,"get protected mode interrupt handler (0x%02x), stub!\n",BL_reg(context));
TRACE("get protected mode interrupt handler (0x%02x), stub!\n",BL_reg(context));
dw = (DWORD)INT_GetPMHandler( BL_reg(context) );
CX_reg(context) = HIWORD(dw);
DX_reg(context) = LOWORD(dw);
break;
case 0x0205: /* Set protected mode interrupt vector */
TRACE(int31,"set protected mode interrupt handler (0x%02x,%p), stub!\n",
TRACE("set protected mode interrupt handler (0x%02x,%p), stub!\n",
BL_reg(context),PTR_SEG_OFF_TO_LIN(CX_reg(context),DX_reg(context)));
INT_SetPMHandler( BL_reg(context),
(FARPROC16)PTR_SEG_OFF_TO_SEGPTR( CX_reg(context),
@ -1027,20 +1027,20 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0305: /* Get State Save/Restore Addresses */
TRACE(int31,"get state save/restore addresses\n");
TRACE("get state save/restore addresses\n");
/* we probably won't need this kind of state saving */
AX_reg(context) = 0;
/* real mode: just point to the lret */
BX_reg(context) = DPMI_wrap_seg;
ECX_reg(context) = 2;
/* protected mode: don't have any handler yet... */
FIXME(int31,"no protected-mode dummy state save/restore handler yet\n");
FIXME("no protected-mode dummy state save/restore handler yet\n");
SI_reg(context) = 0;
EDI_reg(context) = 0;
break;
case 0x0306: /* Get Raw Mode Switch Addresses */
TRACE(int31,"get raw mode switch addresses\n");
TRACE("get raw mode switch addresses\n");
if (lpDosTask) {
/* real mode, point to standard DPMI return wrapper */
BX_reg(context) = DPMI_wrap_seg;
@ -1049,13 +1049,13 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
SI_reg(context) = lpDosTask->dpmi_sel;
EDI_reg(context) = 8; /* offset of the INT 0x31 call */
} else {
ERR(int31,"win app attempting to get raw mode switch!\n");
ERR("win app attempting to get raw mode switch!\n");
AX_reg(context) = 0x8001; /* unsupported function */
SET_CFLAG(context);
}
break;
case 0x0400: /* Get DPMI version */
TRACE(int31,"get DPMI version\n");
TRACE("get DPMI version\n");
{
SYSTEM_INFO si;
@ -1067,7 +1067,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
}
case 0x0500: /* Get free memory information */
TRACE(int31,"get free memory information\n");
TRACE("get free memory information\n");
{
MEMMANINFO mmi;
@ -1081,7 +1081,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
}
case 0x0501: /* Allocate memory block */
TRACE(int31,"allocate memory block (%ld)\n",MAKELONG(CX_reg(context),BX_reg(context)));
TRACE("allocate memory block (%ld)\n",MAKELONG(CX_reg(context),BX_reg(context)));
if (!(ptr = (BYTE *)DPMI_xalloc(MAKELONG(CX_reg(context), BX_reg(context)))))
{
AX_reg(context) = 0x8012; /* linear memory not available */
@ -1093,14 +1093,14 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0502: /* Free memory block */
TRACE(int31, "free memory block (0x%08lx)\n",
TRACE("free memory block (0x%08lx)\n",
W32S_APP2WINE(MAKELONG(DI_reg(context),SI_reg(context)), offset));
DPMI_xfree( (void *)W32S_APP2WINE(MAKELONG(DI_reg(context),
SI_reg(context)), offset) );
break;
case 0x0503: /* Resize memory block */
TRACE(int31, "resize memory block (0x%08lx,%ld)\n",
TRACE("resize memory block (0x%08lx,%ld)\n",
W32S_APP2WINE(MAKELONG(DI_reg(context),SI_reg(context)), offset),
MAKELONG(CX_reg(context),BX_reg(context)));
if (!(ptr = (BYTE *)DPMI_xrealloc(
@ -1116,41 +1116,41 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break;
case 0x0507: /* Modify page attributes */
FIXME(int31,"modify page attributes unimplemented\n");
FIXME("modify page attributes unimplemented\n");
break; /* Just ignore it */
case 0x0600: /* Lock linear region */
FIXME(int31,"lock linear region unimplemented\n");
FIXME("lock linear region unimplemented\n");
break; /* Just ignore it */
case 0x0601: /* Unlock linear region */
FIXME(int31,"unlock linear region unimplemented\n");
FIXME("unlock linear region unimplemented\n");
break; /* Just ignore it */
case 0x0602: /* Unlock real-mode region */
FIXME(int31,"unlock realmode region unimplemented\n");
FIXME("unlock realmode region unimplemented\n");
break; /* Just ignore it */
case 0x0603: /* Lock real-mode region */
FIXME(int31,"lock realmode region unimplemented\n");
FIXME("lock realmode region unimplemented\n");
break; /* Just ignore it */
case 0x0604: /* Get page size */
TRACE(int31,"get pagesize\n");
TRACE("get pagesize\n");
BX_reg(context) = 0;
CX_reg(context) = VIRTUAL_GetPageSize();
break;
case 0x0702: /* Mark page as demand-paging candidate */
FIXME(int31,"mark page as demand-paging candidate\n");
FIXME("mark page as demand-paging candidate\n");
break; /* Just ignore it */
case 0x0703: /* Discard page contents */
FIXME(int31,"discard page contents\n");
FIXME("discard page contents\n");
break; /* Just ignore it */
case 0x0800: /* Physical address mapping */
FIXME(int31,"map real to linear (0x%08lx)\n",MAKELONG(CX_reg(context),BX_reg(context)));
FIXME("map real to linear (0x%08lx)\n",MAKELONG(CX_reg(context),BX_reg(context)));
if(!(ptr=DOSMEM_MapRealToLinear(MAKELONG(CX_reg(context),BX_reg(context)))))
{
AX_reg(context) = 0x8021;

4
msdos/int09.c
View File

@ -7,7 +7,7 @@
#include "winuser.h"
#include "miscemu.h"
#include "input.h"
#include "debug.h"
#include "debugtools.h"
#include "dosexe.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -32,7 +32,7 @@ void WINAPI INT_Int09Handler( CONTEXT86 *context )
/* as in TranslateMessage, windows/input.c */
cnt = ToAscii(vkey, scan&0x7f, QueueKeyStateTable, (LPWORD)ch, 0);
if (cnt==1) {
FIXME(int,"enter character %c into console input, not implemented\n",ch[0]);
FIXME("enter character %c into console input, not implemented\n",ch[0]);
}
}
DOSVM_PIC_ioport_out(0x20, 0x20); /* send EOI */

234
msdos/int10.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h>
#include "miscemu.h"
#include "vga.h"
#include "debug.h"
#include "debugtools.h"
#include "console.h"
DEFAULT_DEBUG_CHANNEL(int10)
@ -101,12 +101,12 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context )
switch(AH_reg(context)) {
case 0x00: /* GET SuperVGA INFORMATION */
FIXME(int10, "Vesa Get SuperVGA Info STUB!\n");
FIXME("Vesa Get SuperVGA Info STUB!\n");
AL_reg(context) = 0x4f;
AH_reg(context) = 0x01; /* 0x01=failed 0x00=succesful */
break;
case 0x01: /* GET SuperVGA MODE INFORMATION */
FIXME(int10, "VESA GET SuperVGA Mode Information - Not supported\n");
FIXME("VESA GET SuperVGA Mode Information - Not supported\n");
AL_reg(context) = 0x4f;
AH_reg(context) = 0x01; /* 0x00 = successful 0x01 = failed */
break;
@ -116,7 +116,7 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context )
case 0x00: /* 40x25 */
case 0x01:
VGA_Exit();
TRACE(int10, "Set VESA Text Mode - 0x0%x\n",
TRACE("Set VESA Text Mode - 0x0%x\n",
BX_reg(context));
CONSOLE_ResizeScreen(40, 25);
CONSOLE_ClearScreen();
@ -126,129 +126,129 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context )
case 0x03:
case 0x07:
VGA_Exit();
TRACE(int10, "Set VESA Text Mode - 0x0%x\n",
TRACE("Set VESA Text Mode - 0x0%x\n",
BX_reg(context));
CONSOLE_ResizeScreen(80, 25);
CONSOLE_ClearScreen();
DOSMEM_BiosData()->VideoColumns = 80;
break;
case 0x0D:
TRACE(int10, "Setting VESA 320x200 16-color mode\n");
TRACE("Setting VESA 320x200 16-color mode\n");
VGA_SetMode(320,200,4);
break;
case 0x0E:
TRACE(int10, "Setting VESA 640x200 16-color mode\n");
TRACE("Setting VESA 640x200 16-color mode\n");
VGA_SetMode(640,200,4);
break;
case 0x10:
TRACE(int10, "Setting VESA 640x350 16-color mode\n");
TRACE("Setting VESA 640x350 16-color mode\n");
VGA_SetMode(640,350,4);
break;
case 0x12:
TRACE(int10, "Setting VESA 640x480 16-color mode\n");
TRACE("Setting VESA 640x480 16-color mode\n");
VGA_SetMode(640,480,4);
break;
case 0x13:
TRACE(int10, "Setting VESA 320x200 256-color mode\n");
TRACE("Setting VESA 320x200 256-color mode\n");
VGA_SetMode(320,200,8);
break;
/* VBE Modes */
case 0x100:
TRACE(int10, "Setting VESA 640x400 256-color mode\n");
TRACE("Setting VESA 640x400 256-color mode\n");
VGA_SetMode(640,400,8);
break;
case 0x101:
TRACE(int10, "Setting VESA 640x480 256-color mode\n");
TRACE("Setting VESA 640x480 256-color mode\n");
VGA_SetMode(640,480,8);
break;
case 0x102:
TRACE(int10, "Setting VESA 800x600 16-color mode\n");
TRACE("Setting VESA 800x600 16-color mode\n");
VGA_SetMode(800,600,4);
break;
case 0x103:
TRACE(int10, "Setting VESA 800x600 256-color mode\n");
TRACE("Setting VESA 800x600 256-color mode\n");
VGA_SetMode(800,600,8);
break;
case 0x104:
TRACE(int10, "Setting VESA 1024x768 16-color mode\n");
TRACE("Setting VESA 1024x768 16-color mode\n");
VGA_SetMode(1024,768,4);
break;
case 0x105:
TRACE(int10, "Setting VESA 1024x768 256-color mode\n");
TRACE("Setting VESA 1024x768 256-color mode\n");
VGA_SetMode(1024,768,8);
break;
case 0x106:
TRACE(int10, "Setting VESA 1280x1024 16-color mode\n");
TRACE("Setting VESA 1280x1024 16-color mode\n");
VGA_SetMode(1280,1024,4);
break;
case 0x107:
TRACE(int10, "Setting VESA 1280x1024 256-color mode\n");
TRACE("Setting VESA 1280x1024 256-color mode\n");
VGA_SetMode(1280,1024,8);
break;
/* 108h - 10Ch are text modes and im lazy so :p */
/* VBE v1.2+ */
case 0x10D:
TRACE(int10, "Setting VESA 320x200 15bpp\n");
TRACE("Setting VESA 320x200 15bpp\n");
VGA_SetMode(320,200,15);
break;
case 0x10E:
TRACE(int10, "Setting VESA 320x200 16bpp\n");
TRACE("Setting VESA 320x200 16bpp\n");
VGA_SetMode(320,200,16);
break;
case 0x10F:
TRACE(int10, "Setting VESA 320x200 24bpp\n");
TRACE("Setting VESA 320x200 24bpp\n");
VGA_SetMode(320,200,24);
break;
case 0x110:
TRACE(int10, "Setting VESA 640x480 15bpp\n");
TRACE("Setting VESA 640x480 15bpp\n");
VGA_SetMode(640,480,15);
break;
case 0x111:
TRACE(int10, "Setting VESA 640x480 16bpp\n");
TRACE("Setting VESA 640x480 16bpp\n");
VGA_SetMode(640,480,16);
break;
case 0x112:
TRACE(int10, "Setting VESA 640x480 24bpp\n");
TRACE("Setting VESA 640x480 24bpp\n");
VGA_SetMode(640,480,24);
break;
case 0x113:
TRACE(int10, "Setting VESA 800x600 15bpp\n");
TRACE("Setting VESA 800x600 15bpp\n");
VGA_SetMode(800,600,15);
break;
case 0x114:
TRACE(int10, "Setting VESA 800x600 16bpp\n");
TRACE("Setting VESA 800x600 16bpp\n");
VGA_SetMode(800,600,16);
break;
case 0x115:
TRACE(int10, "Setting VESA 800x600 24bpp\n");
TRACE("Setting VESA 800x600 24bpp\n");
VGA_SetMode(800,600,24);
break;
case 0x116:
TRACE(int10, "Setting VESA 1024x768 15bpp\n");
TRACE("Setting VESA 1024x768 15bpp\n");
VGA_SetMode(1024,768,15);
break;
case 0x117:
TRACE(int10, "Setting VESA 1024x768 16bpp\n");
TRACE("Setting VESA 1024x768 16bpp\n");
VGA_SetMode(1024,768,16);
break;
case 0x118:
TRACE(int10, "Setting VESA 1024x768 24bpp\n");
TRACE("Setting VESA 1024x768 24bpp\n");
VGA_SetMode(1024,768,24);
break;
case 0x119:
TRACE(int10, "Setting VESA 1280x1024 15bpp\n");
TRACE("Setting VESA 1280x1024 15bpp\n");
VGA_SetMode(1280,1024,15);
break;
case 0x11A:
TRACE(int10, "Setting VESA 1280x1024 16bpp\n");
TRACE("Setting VESA 1280x1024 16bpp\n");
VGA_SetMode(1280,1024,16);
break;
case 0x11B:
TRACE(int10, "Setting VESA 1280x1024 24bpp\n");
TRACE("Setting VESA 1280x1024 24bpp\n");
VGA_SetMode(1280,1024,24);
break;
default:
FIXME(int10,"VESA Set Video Mode (0x%x) - Not Supported\n", BX_reg(context));
FIXME("VESA Set Video Mode (0x%x) - Not Supported\n", BX_reg(context));
}
DOSMEM_BiosData()->VideoMode = BX_reg(context);
AL_reg(context) = 0x4f;
@ -260,43 +260,43 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context )
BX_reg(context) = DOSMEM_BiosData()->VideoMode;
break;
case 0x04: /* VESA SuperVGA BIOS - SAVE/RESTORE SuperVGA VIDEO STATE */
ERR(int10,"VESA SAVE/RESTORE Video State - Not Implemented\n");
ERR("VESA SAVE/RESTORE Video State - Not Implemented\n");
/* AL_reg(context) = 0x4f; = supported so dont set since not implemented */
/* maby we should do this instead ? */
/* AH_reg(context = 0x01; not implemented so just fail */
break;
case 0x05: /* VESA SuperVGA BIOS - CPU VIDEO MEMORY CONTROL */
ERR(int10,"VESA CPU VIDEO MEMORY CONTROL\n");
ERR("VESA CPU VIDEO MEMORY CONTROL\n");
/* AL_reg(context) = 0x4f; = supported so dont set since not implemented */
/* maby we should do this instead ? */
/* AH_reg(context = 0x001; not implemented so just fail */
break;
case 0x06: /* VESA GET/SET LOGICAL SCAN LINE LENGTH */
ERR(int10,"VESA GET/SET LOGICAL SCAN LINE LENGTH - Not Implemented\n");
ERR("VESA GET/SET LOGICAL SCAN LINE LENGTH - Not Implemented\n");
/* AL_reg(context) = 0x4f; = supported so dont set since not implemented */
/* maby we should do this instead ? */
/* AH_reg(context = 0x001; not implemented so just fail */
break;
case 0x07: /* GET/SET DISPLAY START */
ERR(int10,"VESA GET/SET DISPLAY START - Not Implemented\n");
ERR("VESA GET/SET DISPLAY START - Not Implemented\n");
/* AL_reg(context) = 0x4f; = supported so dont set since not implemented */
/* maby we should do this instead ? */
/* AH_reg(context = 0x001; not implemented so just fail */
break;
case 0x08: /* GET/SET DAC PALETTE CONTROL */
ERR(int10,"VESA GET/SET DAC PALETTE CONTROL- Not Implemented\n");
ERR("VESA GET/SET DAC PALETTE CONTROL- Not Implemented\n");
/* AL_reg(context) = 0x4f; = supported so dont set since not implemented */
/* maby we should do this instead ? */
/* AH_reg(context = 0x001; not implemented so just fail */
break;
case 0x09: /* SET PALETTE ENTRIES */
FIXME(int10, "VESA Set palette entries - not implemented\n");
FIXME("VESA Set palette entries - not implemented\n");
break;
case 0xff: /* Turn VESA ON/OFF */
/* i dont know what to do */
break;
default:
FIXME(int10,"VESA Function (0x%x) - Not Supported\n", AH_reg(context));
FIXME("VESA Function (0x%x) - Not Supported\n", AH_reg(context));
break;
}
}
@ -318,7 +318,7 @@ else {
case 0x00: /* 40x25 */
case 0x01:
VGA_Exit();
TRACE(int10, "Set Video Mode - Set to Text - 0x0%x\n",
TRACE("Set Video Mode - Set to Text - 0x0%x\n",
AL_reg(context));
CONSOLE_ResizeScreen(40, 25);
CONSOLE_ClearScreen();
@ -328,41 +328,41 @@ else {
case 0x03:
case 0x07:
VGA_Exit();
TRACE(int10, "Set Video Mode - Set to Text - 0x0%x\n",
TRACE("Set Video Mode - Set to Text - 0x0%x\n",
AL_reg(context));
CONSOLE_ResizeScreen(80, 25);
CONSOLE_ClearScreen();
DOSMEM_BiosData()->VideoColumns = 80;
break;
case 0x0D:
TRACE(int10, "Setting VGA 320x200 16-color mode\n");
TRACE("Setting VGA 320x200 16-color mode\n");
VGA_SetMode(320,200,4);
break;
case 0x0E:
TRACE(int10, "Setting VGA 640x200 16-color mode\n");
TRACE("Setting VGA 640x200 16-color mode\n");
VGA_SetMode(640,200,4);
break;
case 0x10:
TRACE(int10, "Setting VGA 640x350 16-color mode\n");
TRACE("Setting VGA 640x350 16-color mode\n");
VGA_SetMode(640,350,4);
break;
case 0x12:
TRACE(int10, "Setting VGA 640x480 16-color mode\n");
TRACE("Setting VGA 640x480 16-color mode\n");
VGA_SetMode(640,480,4);
break;
case 0x13:
TRACE(int10, "Setting VGA 320x200 256-color mode\n");
TRACE("Setting VGA 320x200 256-color mode\n");
VGA_SetMode(320,200,8);
break;
default:
FIXME(int10, "Set Video Mode (0x%x) - Not Supported\n",
FIXME("Set Video Mode (0x%x) - Not Supported\n",
AL_reg(context));
}
DOSMEM_BiosData()->VideoMode = AL_reg(context);
break;
case 0x01: /* SET CURSOR SHAPE */
FIXME(int10, "Set Cursor Shape - Not Supported\n");
FIXME("Set Cursor Shape - Not Supported\n");
break;
case 0x02: /* SET CURSOR POSITION */
@ -371,13 +371,13 @@ else {
/* DL = Column */ /* 0 is top */
if (BH_reg(context))
{
FIXME(int10, "Set Cursor Position: Cannot set to page %d\n",
FIXME("Set Cursor Position: Cannot set to page %d\n",
BH_reg(context));
}
else
{
CONSOLE_MoveCursor(DH_reg(context), DL_reg(context));
TRACE(int10, "Set Cursor Position: %d %d\n", DH_reg(context),
TRACE("Set Cursor Position: %d %d\n", DH_reg(context),
DL_reg(context));
}
break;
@ -386,7 +386,7 @@ else {
{
CHAR row, col;
FIXME(int10, "Get cursor position and size - partially supported\n");
FIXME("Get cursor position and size - partially supported\n");
CX_reg(context) = 0x0a0b; /* Bogus cursor data */
CONSOLE_GetCursorPosition(&row, &col);
DH_reg(context) = row;
@ -395,12 +395,12 @@ else {
break;
case 0x04: /* READ LIGHT PEN POSITION */
FIXME(int10, "Read Light Pen Position - Not Supported\n");
FIXME("Read Light Pen Position - Not Supported\n");
AH_reg(context) = 0x00; /* Not down */
break;
case 0x05: /* SELECT ACTIVE DISPLAY PAGE */
FIXME(int10, "Select Active Display Page - Not Supported\n");
FIXME("Select Active Display Page - Not Supported\n");
break;
case 0x06: /* SCROLL UP WINDOW */
@ -411,7 +411,7 @@ else {
scroll_window(SCROLL_UP, AL_reg(context), CH_reg(context),
CL_reg(context), DH_reg(context), DL_reg(context),
BH_reg(context));
TRACE(int10, "Scroll Up Window %d\n", AL_reg(context));
TRACE("Scroll Up Window %d\n", AL_reg(context));
break;
case 0x07: /* SCROLL DOWN WINDOW */
@ -422,7 +422,7 @@ else {
scroll_window(SCROLL_DOWN, AL_reg(context), CH_reg(context),
CL_reg(context), DH_reg(context), DL_reg(context),
BH_reg(context));
TRACE(int10, "Scroll Down Window %d\n", AL_reg(context));
TRACE("Scroll Down Window %d\n", AL_reg(context));
break;
case 0x08: /* READ CHARACTER AND ATTRIBUTE AT CURSOR POSITION */
@ -432,14 +432,14 @@ else {
int bg, fg, attr;
if (BH_reg(context)) /* Write to different page */
{
FIXME(int10, "Read character and attribute at cursor position -"
FIXME("Read character and attribute at cursor position -"
" Can't read from non-0 page\n");
AL_reg(context) = ' '; /* That page is blank */
AH_reg(context) = 7;
}
else
{
TRACE(int10,
TRACE(
"Read Character and Attribute at Cursor Position\n");
CONSOLE_GetCharacterAtCursor(&ch, &fg, &bg, &attr);
AL_reg(context) = ch;
@ -457,10 +457,10 @@ else {
write_char_attribute_at_cursor(AL_reg(context), BH_reg(context),
BL_reg(context), CX_reg(context));
if (CX_reg(context) > 1)
TRACE(int10, "Write Character and Attribute at Cursor Position "
TRACE("Write Character and Attribute at Cursor Position "
"(Rep. %d) %c\n", CX_reg(context), AL_reg(context));
else
TRACE(int10, "Write Character and Attribute at Cursor"
TRACE("Write Character and Attribute at Cursor"
"Position: %c\n", AL_reg(context));
break;
@ -468,7 +468,7 @@ else {
/* AL = Character to display. */
/* BH = Page Number */ /* We can't write to non-0 pages, yet. */
/* CX = Times to Write Char */
TRACE(int10, "Write Character at Cursor\n");
TRACE("Write Character at Cursor\n");
write_char_attribute_at_cursor(AL_reg(context), BH_reg(context),
0, CX_reg(context));
break;
@ -485,16 +485,16 @@ else {
apparantly, the foreground or attribute of the background
with this call, so we should check first to see what the
foreground already is... FIXME */
TRACE(int10, "Set Background/Border Color: %d\n",
TRACE("Set Background/Border Color: %d\n",
BL_reg(context));
CONSOLE_SetBackgroundColor(color_palette[0],
color_palette[BL_reg(context)]);
break;
case 0x01: /* SET PALETTE */
FIXME(int10, "Set Palette - Not Supported\n");
FIXME("Set Palette - Not Supported\n");
break;
default:
FIXME(int10, "INT 10 AH = 0x0b BH = 0x%x - Unknown\n",
FIXME("INT 10 AH = 0x0b BH = 0x%x - Unknown\n",
BH_reg(context));
break;
}
@ -502,21 +502,21 @@ else {
case 0x0c: /* WRITE GRAPHICS PIXEL */
/* Not in graphics mode, can ignore w/o error */
FIXME(int10, "Write Graphics Pixel - Not Supported\n");
FIXME("Write Graphics Pixel - Not Supported\n");
break;
case 0x0d: /* READ GRAPHICS PIXEL */
/* Not in graphics mode, can ignore w/o error */
FIXME(int10, "Read Graphics Pixel - Not Supported\n");
FIXME("Read Graphics Pixel - Not Supported\n");
break;
case 0x0e: /* TELETYPE OUTPUT */
TRACE(int10, "Teletype Output\n");
TRACE("Teletype Output\n");
CONSOLE_Write(AL_reg(context), 0, 0, 0);
break;
case 0x0f: /* GET CURRENT VIDEO MODE */
TRACE(int10, "Get current video mode\n");
TRACE("Get current video mode\n");
/* Note: This should not be a constant value. */
AL_reg(context) = DOSMEM_BiosData()->VideoMode;
AH_reg(context) = DOSMEM_BiosData()->VideoColumns;
@ -526,59 +526,59 @@ else {
case 0x10:
switch AL_reg(context) {
case 0x00: /* SET SINGLE PALETTE REGISTER */
FIXME(int10, "Set Single Palette Register - Not Supported\n");
FIXME("Set Single Palette Register - Not Supported\n");
break;
case 0x01: /* SET BORDER (OVERSCAN) */
/* Text terminals have no overscan */
TRACE(int10, "Set Border (Overscan) - Ignored\n");
TRACE("Set Border (Overscan) - Ignored\n");
break;
case 0x02: /* SET ALL PALETTE REGISTERS */
FIXME(int10, "Set all palette registers - Not Supported\n");
FIXME("Set all palette registers - Not Supported\n");
break;
case 0x03: /* TOGGLE INTENSITY/BLINKING BIT */
FIXME(int10, "Toggle Intensity/Blinking Bit - Not Supported\n");
FIXME("Toggle Intensity/Blinking Bit - Not Supported\n");
break;
case 0x07: /* GET INDIVIDUAL PALETTE REGISTER */
FIXME(int10, "Get Individual Palette Register - Not Supported\n");
FIXME("Get Individual Palette Register - Not Supported\n");
break;
case 0x08: /* READ OVERSCAN (BORDER COLOR) REGISTER */
FIXME(int10,
FIXME(
"Read Overscan (Border Color) Register - Not Supported\n");
break;
case 0x09: /* READ ALL PALETTE REGISTERS AND OVERSCAN REGISTER */
FIXME(int10,
FIXME(
"Read All Palette Registers and Overscan Register "
" - Not Supported\n");
break;
case 0x10: /* SET INDIVIDUAL DAC REGISTER */
FIXME(int10, "Set Individual DAC register - Not Supported\n");
FIXME("Set Individual DAC register - Not Supported\n");
break;
case 0x12: /* SET BLOCK OF DAC REGISTERS */
FIXME(int10, "Set Block of DAC registers - Not Supported\n");
FIXME("Set Block of DAC registers - Not Supported\n");
break;
case 0x13: /* SELECT VIDEO DAC COLOR PAGE */
FIXME(int10, "Select video DAC color page - Not Supported\n");
FIXME("Select video DAC color page - Not Supported\n");
break;
case 0x15: /* READ INDIVIDUAL DAC REGISTER */
FIXME(int10, "Read individual DAC register - Not Supported\n");
FIXME("Read individual DAC register - Not Supported\n");
break;
case 0x17: /* READ BLOCK OF DAC REGISTERS */
FIXME(int10, "Read block of DAC registers - Not Supported\n");
FIXME("Read block of DAC registers - Not Supported\n");
break;
case 0x18: /* SET PEL MASK */
FIXME(int10, "Set PEL mask - Not Supported\n");
FIXME("Set PEL mask - Not Supported\n");
break;
case 0x19: /* READ PEL MASK */
FIXME(int10, "Read PEL mask - Not Supported\n");
FIXME("Read PEL mask - Not Supported\n");
break;
case 0x1a: /* GET VIDEO DAC COLOR PAGE STATE */
FIXME(int10, "Get video DAC color page state - Not Supported\n");
FIXME("Get video DAC color page state - Not Supported\n");
break;
case 0x1b: /* PERFORM GRAY-SCALE SUMMING */
FIXME(int10, "Perform Gray-scale summing - Not Supported\n");
FIXME("Perform Gray-scale summing - Not Supported\n");
break;
default:
FIXME(int10, "INT 10 AH = 0x10 AL = 0x%x - Unknown\n",
FIXME("INT 10 AH = 0x10 AL = 0x%x - Unknown\n",
AL_reg(context));
break;
}
@ -590,45 +590,45 @@ else {
switch AL_reg(context) {
case 0x00: /* LOAD USER SPECIFIED PATTERNS */
case 0x10:
FIXME(int10, "Load User Specified Patterns - Not Supported\n");
FIXME("Load User Specified Patterns - Not Supported\n");
break;
case 0x01: /* LOAD ROM MONOCHROME PATTERNS */
case 0x11:
FIXME(int10, "Load ROM Monochrome Patterns - Not Supported\n");
FIXME("Load ROM Monochrome Patterns - Not Supported\n");
break;
case 0x02: /* LOAD ROM 8x8 DOUBLE-DOT PATTERNS */
case 0x12:
FIXME(int10,
FIXME(
"Load ROM 8x8 Double Dot Patterns - Not Supported\n");
break;
case 0x03: /* SET BLOCK SPECIFIER */
FIXME(int10, "Set Block Specifier - Not Supported\n");
FIXME("Set Block Specifier - Not Supported\n");
break;
case 0x04: /* LOAD ROM 8x16 CHARACTER SET */
case 0x14:
FIXME(int10, "Load ROM 8x16 Character Set - Not Supported\n");
FIXME("Load ROM 8x16 Character Set - Not Supported\n");
break;
case 0x20: /* SET USER 8x16 GRAPHICS CHARS */
FIXME(int10, "Set User 8x16 Graphics Chars - Not Supported\n");
FIXME("Set User 8x16 Graphics Chars - Not Supported\n");
break;
case 0x21: /* SET USER GRAPICS CHARACTERS */
FIXME(int10, "Set User Graphics Characters - Not Supported\n");
FIXME("Set User Graphics Characters - Not Supported\n");
break;
case 0x22: /* SET ROM 8x14 GRAPHICS CHARS */
FIXME(int10, "Set ROM 8x14 Graphics Chars - Not Supported\n");
FIXME("Set ROM 8x14 Graphics Chars - Not Supported\n");
break;
case 0x23: /* SET ROM 8x8 DBL DOT CHARS */
FIXME(int10,
FIXME(
"Set ROM 8x8 Dbl Dot Chars (Graphics) - Not Supported\n");
break;
case 0x24: /* LOAD 8x16 GRAPHIC CHARS */
FIXME(int10, "Load 8x16 Graphic Chars - Not Supported\n");
FIXME("Load 8x16 Graphic Chars - Not Supported\n");
break;
case 0x30: /* GET FONT INFORMATION */
FIXME(int10, "Get Font Information - Not Supported\n");
FIXME("Get Font Information - Not Supported\n");
break;
default:
FIXME(int10, "INT 10 AH = 0x11 AL = 0x%x - Unknown\n",
FIXME("INT 10 AH = 0x11 AL = 0x%x - Unknown\n",
AL_reg(context));
break;
}
@ -637,7 +637,7 @@ else {
case 0x12: /* ALTERNATE FUNCTION SELECT */
switch BL_reg(context) {
case 0x10: /* GET EGA INFO */
TRACE(int10, "EGA info requested\n");
TRACE("EGA info requested\n");
BH_reg(context) = 0x00; /* Color screen */
BL_reg(context) =
DOSMEM_BiosData()->ModeOptions >> 5; /* EGA memory size */
@ -645,33 +645,33 @@ else {
DOSMEM_BiosData()->FeatureBitsSwitches;
break;
case 0x20: /* ALTERNATE PRTSC */
FIXME(int10, "Install Alternate Print Screen - Not Supported\n");
FIXME("Install Alternate Print Screen - Not Supported\n");
break;
case 0x30: /* SELECT VERTICAL RESOULTION */
FIXME(int10, "Select vertical resolution - not supported\n");
FIXME("Select vertical resolution - not supported\n");
break;
case 0x31: /* ENABLE/DISABLE DEFAULT PALETTE LOADING */
FIXME(int10, "Default palette loading - not supported\n");
FIXME("Default palette loading - not supported\n");
DOSMEM_BiosData()->VGASettings =
(DOSMEM_BiosData()->VGASettings & 0xf7) |
((AL_reg(context) == 1) << 3);
break;
case 0x32: /* ENABLE/DISABLE VIDEO ADDRERSSING */
FIXME(int10, "Video Addressing - Not Supported\n");
FIXME("Video Addressing - Not Supported\n");
break;
case 0x33: /* ENABLE/DISABLE GRAY SCALE SUMMING */
FIXME(int10, "Gray Scale Summing - Not Supported\n");
FIXME("Gray Scale Summing - Not Supported\n");
break;
case 0x34: /* ENABLE/DISABLE CURSOR EMULATION */
TRACE(int10, "Set cursor emulation to %d\n", AL_reg(context));
TRACE("Set cursor emulation to %d\n", AL_reg(context));
DOSMEM_BiosData()->ModeOptions =
(DOSMEM_BiosData()->ModeOptions & 0xfe)|(AL_reg(context) == 1);
break;
case 0x36: /* VIDEO ADDRESS CONTROL */
FIXME(int10, "Video Address Control - Not Supported\n");
FIXME("Video Address Control - Not Supported\n");
break;
default:
FIXME(int10, "INT 10 AH = 0x11 AL = 0x%x - Unknown\n",
FIXME("INT 10 AH = 0x11 AL = 0x%x - Unknown\n",
AL_reg(context));
break;
}
@ -679,29 +679,29 @@ else {
case 0x13: /* WRITE STRING */
/* This one does not imply that string be at cursor. */
FIXME(int10, "Write String - Not Supported\n");
FIXME("Write String - Not Supported\n");
break;
case 0x1a:
switch AL_reg(context) {
case 0x00: /* GET DISPLAY COMBINATION CODE */
TRACE(int10, "Get Display Combination Code\n");
TRACE("Get Display Combination Code\n");
AX_reg(context) = 0x001a;
BL_reg(context) = 0x08; /* VGA w/ color analog display */
BH_reg(context) = 0x00; /* No secondary hardware */
break;
case 0x01: /* SET DISPLAY COMBINATION CODE */
FIXME(int10, "Set Display Combination Code - Not Supported\n");
FIXME("Set Display Combination Code - Not Supported\n");
break;
default:
FIXME(int10, "INT 10 AH = 0x1a AL = 0x%x - Unknown\n",
FIXME("INT 10 AH = 0x1a AL = 0x%x - Unknown\n",
AL_reg(context));
break;
}
break;
case 0x1b: /* FUNCTIONALITY/STATE INFORMATION */
FIXME(int10, "Get functionality/state information - partially implemented\n");
FIXME("Get functionality/state information - partially implemented\n");
if (BX_reg(context) == 0x0)
{
AL_reg(context) = 0x1b;
@ -714,7 +714,7 @@ else {
break;
case 0x1c: /* SAVE/RESTORE VIDEO STATE */
FIXME(int10, "Save/Restore Video State - Not Supported\n");
FIXME("Save/Restore Video State - Not Supported\n");
break;
case 0x4f: /* Get SuperVGA INFORMATION */
@ -723,7 +723,7 @@ else {
CTX_SEG_OFF_TO_LIN(context, ES_reg(context), EDI_reg(context));
/* BOOL16 vesa20 = (*(DWORD *)p == *(DWORD *)"VBE2"); */
TRACE(int10, "Get SuperVGA information\n");
TRACE("Get SuperVGA information\n");
AH_reg(context) = 0;
*(DWORD *)p = *(DWORD *)"VESA";
*(WORD *)(p+0x04) = 0x0200; /* VESA 2.0 */
@ -732,7 +732,7 @@ else {
}
break;
default:
FIXME(int10, "Unknown - 0x%x\n", AH_reg(context));
FIXME("Unknown - 0x%x\n", AH_reg(context));
INT_BARF( context, 0x10 );
}
}
@ -751,14 +751,14 @@ static void write_char_attribute_at_cursor(char output, char page_num,
if (page_num) /* Only support one text page right now */
{
FIXME(int10, "Cannot write to alternate page %d", page_num);
FIXME("Cannot write to alternate page %d", page_num);
return;
}
conv_text_mode_attributes(attribute, &fg_color, &bg_color,
&wattribute);
TRACE(int10, "Fore: %d Back: %d\n", fg_color, bg_color);
TRACE("Fore: %d Back: %d\n", fg_color, bg_color);
CONSOLE_GetCursorPosition(&x, &y);

2
msdos/int11.c
View File

@ -6,7 +6,7 @@
#include "miscemu.h"
#include "msdos.h"
#include "drive.h"
#include "debug.h"
#include "debugtools.h"
/**********************************************************************
* INT_Int11Handler

4
msdos/int13.c
View File

@ -13,7 +13,7 @@
#endif
#include "miscemu.h"
/* #define DEBUG_INT */
#include "debug.h"
#include "debugtools.h"
#include "drive.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -79,7 +79,7 @@ void WINAPI INT_Int13Handler( CONTEXT86 *context )
if ( (floppy_fd = DRIVE_OpenDevice( drive_nr, O_NONBLOCK)) == -1)
{
WARN(int, "(GET DRIVE PARAMETERS): Can't determine floppy geometry !\n");
WARN("(GET DRIVE PARAMETERS): Can't determine floppy geometry !\n");
BX_reg(context) = 0;
CX_reg(context) = 0;
DH_reg(context) = 0;

10
msdos/int15.c
View File

@ -4,7 +4,7 @@
#include <stdlib.h>
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -40,10 +40,10 @@ void WINAPI INT_Int15Handler( CONTEXT86 *context )
switch(BH_reg(context))
{
case 0x00:
FIXME(int, "Disable Pointing Device - not implemented\n");
FIXME("Disable Pointing Device - not implemented\n");
break;
case 0x01:
FIXME(int, "Enable Pointing Device - not implemented\n");
FIXME("Enable Pointing Device - not implemented\n");
break;
default:
INT_BARF( context, 0x15 );
@ -53,11 +53,11 @@ void WINAPI INT_Int15Handler( CONTEXT86 *context )
break;
case 0x02: /* Set Sampling Rate */
/* BH = sampling rate */
FIXME(int, "Set Sampling Rate - not implemented\n");
FIXME("Set Sampling Rate - not implemented\n");
AH_reg(context) = 0x00; /* successful */
break;
case 0x04: /* Get Pointing Device Type */
FIXME(int, "Get Pointing Device Type - not implemented\n");
FIXME("Get Pointing Device Type - not implemented\n");
BH_reg(context) = 0x01;/*Device id FIXME what is it suposed to be?*/
break;
default:

22
msdos/int16.c
View File

@ -10,7 +10,7 @@
#include "module.h"
#include "console.h"
#include "wincon.h"
#include "debug.h"
#include "debugtools.h"
#include "winuser.h"
#include "miscemu.h"
@ -34,7 +34,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
case 0x00: /* Get Keystroke */
/* Returns: AH = Scan code
AL = ASCII character */
TRACE(int16, "Get Keystroke\n");
TRACE("Get Keystroke\n");
CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context));
break;
@ -42,7 +42,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
/* Returns: ZF set if no keystroke */
/* AH = Scan code */
/* AL = ASCII character */
TRACE(int16, "Check for Keystroke\n");
TRACE("Check for Keystroke\n");
if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context)))
{
SET_ZFLAG(context);
@ -72,25 +72,25 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
AL_reg(context) |= 0x40;
if (GetAsyncKeyState(VK_INSERT))
AL_reg(context) |= 0x80;
TRACE(int16, "Get Shift Flags: returning 0x%02x\n", AL_reg(context));
TRACE("Get Shift Flags: returning 0x%02x\n", AL_reg(context));
break;
case 0x03: /* Set Typematic Rate and Delay */
FIXME(int16, "Set Typematic Rate and Delay - Not Supported\n");
FIXME("Set Typematic Rate and Delay - Not Supported\n");
break;
case 0x09: /* Get Keyboard Functionality */
FIXME(int16, "Get Keyboard Functionality - Not Supported\n");
FIXME("Get Keyboard Functionality - Not Supported\n");
/* As a temporary measure, say that "nothing" is supported... */
AL_reg(context) = 0;
break;
case 0x0a: /* Get Keyboard ID */
FIXME(int16, "Get Keyboard ID - Not Supported\n");
FIXME("Get Keyboard ID - Not Supported\n");
break;
case 0x10: /* Get Enhanced Keystroke */
TRACE(int16, "Get Enhanced Keystroke - Partially supported\n");
TRACE("Get Enhanced Keystroke - Partially supported\n");
/* Returns: AH = Scan code
AL = ASCII character */
CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context));
@ -101,7 +101,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
/* Returns: ZF set if no keystroke */
/* AH = Scan code */
/* AL = ASCII character */
TRACE(int16, "Check for Enhanced Keystroke - Partially supported\n");
TRACE("Check for Enhanced Keystroke - Partially supported\n");
if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context)))
{
SET_ZFLAG(context);
@ -113,11 +113,11 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context )
break;
case 0x12: /* Get Extended Shift States */
FIXME(int16, "Get Extended Shift States - Not Supported\n");
FIXME("Get Extended Shift States - Not Supported\n");
break;
default:
FIXME(int16, "Unknown INT 16 function - 0x%x\n", AH_reg(context));
FIXME("Unknown INT 16 function - 0x%x\n", AH_reg(context));
break;
}

6
msdos/int17.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h>
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
#include "msdos.h"
#include "drive.h"
#include "winnt.h"
@ -22,11 +22,11 @@ void WINAPI INT_Int17Handler( CONTEXT86 *context )
switch( AH_reg(context) )
{
case 0x01: /* PRINTER - INITIALIZE */
FIXME(int17, "Initialize Printer - Not Supported\n");
FIXME("Initialize Printer - Not Supported\n");
AH_reg(context) = 0; /* time out */
break;
case 0x02: /* PRINTER - GET STATUS */
FIXME(int17, "Get Printer Status - Not Supported\n");
FIXME("Get Printer Status - Not Supported\n");
break;
default:
AH_reg(context) = 0; /* time out */

4
msdos/int19.c
View File

@ -4,7 +4,7 @@
#include <stdlib.h>
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int19)
@ -16,5 +16,5 @@ DEFAULT_DEBUG_CHANNEL(int19)
*/
void WINAPI INT_Int19Handler( CONTEXT86 *context )
{
WARN(int19, "Attempted Reboot\n");
WARN("Attempted Reboot\n");
}

4
msdos/int1a.c
View File

@ -7,7 +7,7 @@
#include <stdlib.h>
#include "options.h"
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -58,7 +58,7 @@ void WINAPI INT_Int1aHandler( CONTEXT86 *context )
CX_reg(context) = HIWORD(ticks);
DX_reg(context) = LOWORD(ticks);
AX_reg(context) = 0; /* No midnight rollover */
TRACE(int,"int1a: AH=00 -- ticks=%ld\n", ticks);
TRACE("int1a: AH=00 -- ticks=%ld\n", ticks);
break;
case 0x02:

2
msdos/int20.c
View File

@ -6,7 +6,7 @@
#include "winbase.h"
#include "miscemu.h"
/* #define DEBUG_INT */
#include "debug.h"
#include "debugtools.h"
#include "task.h"
/**********************************************************************

296
msdos/int21.c
View File

File diff suppressed because it is too large Load Diff

4
msdos/int25.c
View File

@ -10,7 +10,7 @@
#include "ldt.h"
#include "miscemu.h"
#include "drive.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -44,7 +44,7 @@ void WINAPI INT_Int25Handler( CONTEXT86 *context )
begin = DX_reg(context);
length = CX_reg(context);
}
TRACE(int, "int25: abs diskread, drive %d, sector %ld, "
TRACE("int25: abs diskread, drive %d, sector %ld, "
"count %ld, buffer %p\n",
AL_reg(context), begin, length, dataptr);

4
msdos/int26.c
View File

@ -9,7 +9,7 @@
#include "ldt.h"
#include "miscemu.h"
#include "drive.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -43,7 +43,7 @@ void WINAPI INT_Int26Handler( CONTEXT86 *context )
length = CX_reg(context);
}
TRACE(int,"int26: abs diskwrite, drive %d, sector %ld, "
TRACE("int26: abs diskwrite, drive %d, sector %ld, "
"count %ld, buffer %p\n",
AL_reg(context), begin, length, dataptr );

2
msdos/int2a.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h>
#include "msdos.h"
#include "miscemu.h"
#include "debug.h"
#include "debugtools.h"
/**********************************************************************
* INT_Int2aHandler

90
msdos/int2f.c
View File

@ -21,7 +21,7 @@
#include "dosexe.h"
#include "heap.h"
/* #define DEBUG_INT */
#include "debug.h"
#include "debugtools.h"
#include "cdrom.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -39,7 +39,7 @@ static void MSCDEX_Handler( CONTEXT86 *context );
*/
void WINAPI INT_Int2fHandler( CONTEXT86 *context )
{
TRACE(int,"Subfunction 0x%X\n", AX_reg(context));
TRACE("Subfunction 0x%X\n", AX_reg(context));
switch(AH_reg(context))
{
@ -87,7 +87,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context )
DI_reg(context) = 0x0000;
break;
case 0x08:
FIXME(int, "No real-mode handler for errors yet! (bye!)");
FIXME("No real-mode handler for errors yet! (bye!)");
break;
default:
INT_BARF(context, 0x2f);
@ -115,7 +115,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context )
switch (AL_reg(context))
{
case 0x00: /* XMS v2+ installation check */
WARN(int,"XMS is not fully implemented\n");
WARN("XMS is not fully implemented\n");
AL_reg(context) = 0x80;
break;
case 0x10: /* XMS v2+ get driver address */
@ -137,7 +137,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context )
INT_BARF( context, 0x2f );
}
#else
FIXME(int,"check for XMS (not supported)\n");
FIXME("check for XMS (not supported)\n");
AL_reg(context) = 0x42; /* != 0x80 */
#endif
break;
@ -184,7 +184,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context )
case 0x03:
case 0x04:
case 0x05:
FIXME(int,"Task Switcher - not implemented\n");
FIXME("Task Switcher - not implemented\n");
break;
default:
INT_BARF( context, 0x2f );
@ -248,7 +248,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context )
case 0x01: /* Quarterdeck RPCI - QEMM/QRAM - PCL-838.EXE functions */
if(BX_reg(context) == 0x5145 && CX_reg(context) == 0x4D4D
&& DX_reg(context) == 0x3432)
TRACE(int, "Check for QEMM v5.0+ (not installed)\n");
TRACE("Check for QEMM v5.0+ (not installed)\n");
break;
default:
INT_BARF( context, 0x2f );
@ -272,7 +272,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context )
case 0x01: /* Quarterdeck QDPMI.SYS - DESQview */
if(BX_reg(context) == 0x4450 && CX_reg(context) == 0x4d49
&& DX_reg(context) == 0x8f4f)
TRACE(int, "Check for QDPMI.SYS (not installed)\n");
TRACE("Check for QDPMI.SYS (not installed)\n");
break;
default:
INT_BARF( context, 0x2f );
@ -315,7 +315,7 @@ static void do_int2f_16( CONTEXT86 *context )
case 0x11: /* Get Shell Parameters - (SHELL= in CONFIG.SYS) */
/* We can mock this up. But not today... */
FIXME(int, "Get Shell Parameters\n");
FIXME("Get Shell Parameters\n");
break;
case 0x80: /* Release time-slice */
@ -344,7 +344,7 @@ static void do_int2f_16( CONTEXT86 *context )
VXD_BASE + BX_reg(context) );
if (!addr) /* not supported */
{
ERR(int, "Accessing unknown VxD %04x - Expect a failure now.\n",
ERR("Accessing unknown VxD %04x - Expect a failure now.\n",
BX_reg(context) );
}
ES_reg(context) = SELECTOROF(addr);
@ -437,7 +437,7 @@ static void MSCDEX_Dump(char* pfx, BYTE* req, int dorealmode)
}
break;
}
TRACE(int, "%s\n", buf);
TRACE("%s\n", buf);
}
#else
#define MSCDEX_Dump(pfx, req, drm)
@ -466,7 +466,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
break;
}
}
TRACE(int, "Installation check: %d cdroms, starting at %d\n", count, drive);
TRACE("Installation check: %d cdroms, starting at %d\n", count, drive);
BX_reg(context) = count;
CX_reg(context) = (drive < MAX_DOS_DRIVES) ? drive : 0;
break;
@ -478,7 +478,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
case 0x0C: /* get version */
BX_reg(context) = 0x020a;
TRACE(int, "Version number => %04x\n", BX_reg(context));
TRACE("Version number => %04x\n", BX_reg(context));
break;
case 0x0D: /* get drive letters */
@ -487,7 +487,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
for (drive = 0; drive < MAX_DOS_DRIVES; drive++) {
if (DRIVE_GetType(drive) == TYPE_CDROM) *p++ = drive;
}
TRACE(int, "Get drive letters\n");
TRACE("Get drive letters\n");
break;
case 0x10: /* direct driver acces */
@ -504,8 +504,8 @@ static void MSCDEX_Handler(CONTEXT86* context)
if (!driver_request) {
/* FIXME - to be deleted ?? */
ERR(int, "ES:BX==0 ! SEGFAULT ?\n");
ERR(int, "-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n",
ERR("ES:BX==0 ! SEGFAULT ?\n");
ERR("-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n",
BX_reg(context), ES_reg(context), DS_reg(context), CX_reg(context));
driver_request[4] |= 0x80;
driver_request[3] = 5; /* bad request length */
@ -517,14 +517,14 @@ static void MSCDEX_Handler(CONTEXT86* context)
*/
if (wcda.unixdev <= 0)
CDAUDIO_Open(&wcda);
TRACE(int, "CDROM device driver -> command <%d>\n", (unsigned char)driver_request[2]);
TRACE("CDROM device driver -> command <%d>\n", (unsigned char)driver_request[2]);
for (drive = 0;
drive < MAX_DOS_DRIVES && DRIVE_GetType(drive) != TYPE_CDROM;
drive++);
/* drive contains the first CD ROM */
if (CX_reg(context) != drive) {
WARN(int, "Request made doesn't match a CD ROM drive (%d/%d)\n", CX_reg(context), drive);
WARN("Request made doesn't match a CD ROM drive (%d/%d)\n", CX_reg(context), drive);
driver_request[4] |= 0x80;
driver_request[3] = 1; /* unknown unit */
return;
@ -542,7 +542,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
DOSMEM_MapRealToLinear(MAKELONG(PTR_AT(driver_request, 14, WORD), PTR_AT(driver_request, 16, WORD))) :
PTR_SEG_OFF_TO_LIN(PTR_AT(driver_request, 16, WORD), PTR_AT(driver_request, 14, WORD));
TRACE(int, " --> IOCTL INPUT <%d>\n", io_stru[0]);
TRACE(" --> IOCTL INPUT <%d>\n", io_stru[0]);
switch (io_stru[0]) {
#if 0
case 0: /* Get device Header */
@ -580,10 +580,10 @@ static void MSCDEX_Handler(CONTEXT86* context)
MSCDEX_StoreMSF(wcda.dwCurFrame, io_stru + 2);
break;
default:
ERR(int, "CDRom-Driver: Unsupported addressing mode !!\n");
ERR("CDRom-Driver: Unsupported addressing mode !!\n");
Error = 0x0c;
}
TRACE(int, " ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD));
TRACE(" ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD));
break;
case 4: /* Audio channel info */
@ -595,7 +595,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
io_stru[6] = 0;
io_stru[7] = 3;
io_stru[8] = 0;
TRACE(int, " ----> AUDIO CHANNEL INFO\n");
TRACE(" ----> AUDIO CHANNEL INFO\n");
break;
case 6: /* device status */
@ -616,18 +616,18 @@ static void MSCDEX_Handler(CONTEXT86* context)
*/
if (wcda.cdaMode == WINE_CDA_OPEN)
io_stru[1] |= 1;
TRACE(int, " ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD));
TRACE(" ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD));
break;
case 8: /* Volume size */
PTR_AT(io_stru, 1, DWORD) = wcda.dwTotalLen;
TRACE(int, " ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD));
TRACE(" ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD));
break;
case 9: /* media changed ? */
/* answers don't know... -1/1 for yes/no would be better */
io_stru[1] = 0; /* FIXME? 1? */
TRACE(int, " ----> MEDIA CHANGED <%d>\n", io_stru[1]);
TRACE(" ----> MEDIA CHANGED <%d>\n", io_stru[1]);
break;
case 10: /* audio disk info */
@ -635,7 +635,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
io_stru[2] = wcda.nLastTrack; /* ending track */
MSCDEX_StoreMSF(wcda.dwTotalLen, io_stru + 3);
TRACE(int, " ----> AUDIO DISK INFO <%d-%d/%08lx>\n",
TRACE(" ----> AUDIO DISK INFO <%d-%d/%08lx>\n",
io_stru[1], io_stru[2], PTR_AT(io_stru, 3, DWORD));
break;
@ -649,7 +649,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
PTR_AT(io_stru, 2, DWORD) = 0;
io_stru[6] = 0;
}
TRACE(int, " ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n",
TRACE(" ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n",
io_stru[1], PTR_AT(io_stru, 2, DWORD), io_stru[6]);
break;
@ -674,7 +674,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
io_stru[10] = bTmp[0];
io_stru[11] = 0;
}
TRACE(int, "Q-Channel info: Ctrl/adr=%02x TNO=%02x X=%02x rtt=%02x:%02x:%02x rtd=%02x:%02x:%02x (cf=%08lx, tp=%08lx)\n",
TRACE("Q-Channel info: Ctrl/adr=%02x TNO=%02x X=%02x rtt=%02x:%02x:%02x rtd=%02x:%02x:%02x (cf=%08lx, tp=%08lx)\n",
io_stru[ 1], io_stru[ 2], io_stru[ 3],
io_stru[ 4], io_stru[ 5], io_stru[ 6],
io_stru[ 8], io_stru[ 9], io_stru[10],
@ -691,12 +691,12 @@ static void MSCDEX_Handler(CONTEXT86* context)
PTR_AT(io_stru, 3, DWORD) = wcda.lpdwTrackPos[0];
PTR_AT(io_stru, 7, DWORD) = wcda.lpdwTrackPos[wcda.nTracks - 1];
}
TRACE(int, "Audio status info: status=%04x startLoc=%ld endLoc=%ld\n",
TRACE("Audio status info: status=%04x startLoc=%ld endLoc=%ld\n",
PTR_AT(io_stru, 1, WORD), PTR_AT(io_stru, 3, DWORD), PTR_AT(io_stru, 7, DWORD));
break;
default:
FIXME(int, "IOCTL INPUT: Unimplemented <%d>!!\n", io_stru[0]);
FIXME("IOCTL INPUT: Unimplemented <%d>!!\n", io_stru[0]);
Error = 0x0c;
break;
}
@ -707,25 +707,25 @@ static void MSCDEX_Handler(CONTEXT86* context)
DOSMEM_MapRealToLinear(MAKELONG(PTR_AT(driver_request, 14, WORD), PTR_AT(driver_request, 16, WORD))) :
PTR_SEG_OFF_TO_LIN(PTR_AT(driver_request, 16, WORD), PTR_AT(driver_request, 14, WORD));
TRACE(int, " --> IOCTL OUTPUT <%d>\n", io_stru[0]);
TRACE(" --> IOCTL OUTPUT <%d>\n", io_stru[0]);
switch (io_stru[0]) {
case 0: /* eject */
CDAUDIO_SetDoor(&wcda, 1);
TRACE(int, " ----> EJECT\n");
TRACE(" ----> EJECT\n");
break;
case 2: /* reset drive */
CDAUDIO_Reset(&wcda);
TRACE(int, " ----> RESET\n");
TRACE(" ----> RESET\n");
break;
case 3: /* Audio Channel Control */
FIXME(int, " ----> AUDIO CHANNEL CONTROL (NIY)\n");
FIXME(" ----> AUDIO CHANNEL CONTROL (NIY)\n");
break;
case 5: /* close tray */
CDAUDIO_SetDoor(&wcda, 0);
TRACE(int, " ----> CLOSE TRAY\n");
TRACE(" ----> CLOSE TRAY\n");
break;
default:
FIXME(int, " IOCTL OUPUT: Unimplemented <%d>!!\n", io_stru[0]);
FIXME(" IOCTL OUPUT: Unimplemented <%d>!!\n", io_stru[0]);
Error = 0x0c;
break;
}
@ -737,7 +737,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
at = PTR_AT(driver_request, 20, DWORD);
TRACE(int, " --> SEEK AUDIO mode :<0x%02X>, [%ld]\n",
TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%ld]\n",
(BYTE)driver_request[13], at);
switch (driver_request[13]) {
@ -753,7 +753,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
CDAUDIO_Seek(&wcda, at);
break;
default:
ERR(int, "Unsupported address mode !!\n");
ERR("Unsupported address mode !!\n");
Error = 0x0c;
break;
}
@ -767,7 +767,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
beg = end = PTR_AT(driver_request, 14, DWORD);
end += PTR_AT(driver_request, 18, DWORD);
TRACE(int, " --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n",
TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n",
(BYTE)driver_request[13], beg, end);
switch (driver_request[13]) {
@ -786,7 +786,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
CDAUDIO_Play(&wcda, beg, end);
break;
default:
ERR(int, "Unsupported address mode !!\n");
ERR("Unsupported address mode !!\n");
Error = 0x0c;
break;
}
@ -796,20 +796,20 @@ static void MSCDEX_Handler(CONTEXT86* context)
case 133:
if (wcda.cdaMode == WINE_CDA_PLAY) {
CDAUDIO_Pause(&wcda, 1);
TRACE(int, " --> STOP AUDIO (Paused)\n");
TRACE(" --> STOP AUDIO (Paused)\n");
} else {
CDAUDIO_Stop(&wcda);
TRACE(int, " --> STOP AUDIO (Stopped)\n");
TRACE(" --> STOP AUDIO (Stopped)\n");
}
break;
case 136:
TRACE(int, " --> RESUME AUDIO\n");
TRACE(" --> RESUME AUDIO\n");
CDAUDIO_Pause(&wcda, 0);
break;
default:
FIXME(int, " ioctl uninplemented <%d>\n", driver_request[2]);
FIXME(" ioctl uninplemented <%d>\n", driver_request[2]);
Error = 0x0c;
}
@ -829,7 +829,7 @@ static void MSCDEX_Handler(CONTEXT86* context)
}
break;
default:
FIXME(int, "Unimplemented MSCDEX function 0x%02X.\n", AL_reg(context));
FIXME("Unimplemented MSCDEX function 0x%02X.\n", AL_reg(context));
break;
}
}

8
msdos/int33.c
View File

@ -6,7 +6,7 @@
#include "winuser.h"
#include "miscemu.h"
#include "dosexe.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(int)
@ -27,20 +27,20 @@ void WINAPI INT_Int33Handler( CONTEXT86 *context )
switch (AX_reg(context)) {
case 0x00:
TRACE(int,"Reset mouse driver and request status\n");
TRACE("Reset mouse driver and request status\n");
AX_reg(context) = 0xFFFF; /* installed */
BX_reg(context) = 3; /* # of buttons */
sys = calloc(1,sizeof(MOUSESYSTEM));
DOSVM_SetSystemData(0x33, sys);
break;
case 0x03:
TRACE(int,"Return mouse position and button status\n");
TRACE("Return mouse position and button status\n");
BX_reg(context) = sys->but;
CX_reg(context) = sys->x;
DX_reg(context) = sys->y;
break;
case 0x0C: /* Define interrupt subroutine */
TRACE(int,"Define mouse interrupt subroutine\n");
TRACE("Define mouse interrupt subroutine\n");
sys->callmask = CX_reg(context);
sys->callback = (FARPROC16)PTR_SEG_OFF_TO_SEGPTR(ES_reg(context), DX_reg(context));
break;

Some files were not shown because too many files have changed in this diff Show More