wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Jacek Caban : mshtml: Added support for pure IDispatch event handlers.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 089d54f1f4248d18bfce089aec90a1517b9a4b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=089d54f1f4248d18bfce089ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 24 21:37:52 2010 +0100 mshtml: Added support for pure IDispatch event handlers. --- dlls/mshtml/dispex.c | 17 ++++++++------- dlls/mshtml/tests/events.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4019a3c..ca09313 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -400,18 +400,19 @@ HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp) VARIANT res; HRESULT hres; - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { - FIXME("Could not get IDispatchEx interface: %08x\n", hres); - return hres; - } - VariantInit(&res); memset(&ei, 0, sizeof(ei)); - hres = IDispatchEx_InvokeEx(dispex, 0, GetUserDefaultLCID(), DISPATCH_METHOD, dp, &res, &ei, NULL); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, 0, GetUserDefaultLCID(), DISPATCH_METHOD, dp, &res, &ei, NULL); + IDispatchEx_Release(dispex); + }else { + TRACE("Could not get IDispatchEx interface: %08x\n", hres); + hres = IDispatch_Invoke(disp, 0, &IID_NULL, GetUserDefaultLCID(), DISPATCH_METHOD, + dp, &res, &ei, NULL); + } - IDispatchEx_Release(dispex); VariantClear(&res); return hres; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 84bfae2..81e7cab 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -63,6 +63,7 @@ DEFINE_EXPECT(div_onclick); DEFINE_EXPECT(div_onclick_attached); DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); +DEFINE_EXPECT(div_onclick_disp); DEFINE_EXPECT(iframe_onreadystatechange_loading); DEFINE_EXPECT(iframe_onreadystatechange_interactive); DEFINE_EXPECT(iframe_onreadystatechange_complete); @@ -690,6 +691,23 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, return S_OK; } +static HRESULT WINAPI Dispatch_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { + return E_NOINTERFACE; + }else { + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + return S_OK; +} + static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) { return 2; @@ -1015,6 +1033,32 @@ static IDispatchExVtbl timeoutFuncVtbl = { static IDispatchEx timeoutFunc = { &timeoutFuncVtbl }; +static HRESULT WINAPI div_onclick_disp_Invoke(IDispatchEx *iface, DISPID id, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, UINT *puArgErr) +{ + CHECK_EXPECT(div_onclick_disp); + + test_attached_event_args(id, wFlags, pdp, pvarRes, pei); + + ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); + ok(!puArgErr, "puArgErr = %p\n", puArgErr); + + return S_OK; +} + +static IDispatchExVtbl div_onclick_dispVtbl = { + Dispatch_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + div_onclick_disp_Invoke, +}; + +static IDispatchEx div_onclick_disp = { &div_onclick_dispVtbl }; + static void pump_msgs(BOOL *b) { MSG msg; @@ -1163,8 +1207,10 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_disp); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); @@ -1174,6 +1220,7 @@ static void test_onclick(IHTMLDocument2 *doc) ok(hres == S_OK, "click failed: %08x\n", hres); CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_disp); CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick);

1 0

Jacek Caban : mshtml: Call attached event handlers in reversed order.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 8571bf6f0e148dbd659b63102a7ffec9ea7362f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8571bf6f0e148dbd659b63102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 24 21:37:15 2010 +0100 mshtml: Call attached event handlers in reversed order. --- dlls/mshtml/htmlevent.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d04b2e6..5184391 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -816,7 +816,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, IHTMLEventObj *event_obj, ConnectionPointContainer *cp_container, eventid_t eid, IDispatch *this_obj) { handler_vector_t *handler_vector = NULL; - DWORD i; + int i; HRESULT hres; if(event_target) @@ -845,7 +845,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, IHTMLEventObj *event_obj, V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)event_obj; - for(i=0; i < handler_vector->handler_cnt; i++) { + i = handler_vector->handler_cnt; + while(i--) { if(handler_vector->handlers[i]) { TRACE("%s [%d] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_disp_func(handler_vector->handlers[i], &dp);

1 0

Henri Verbeet : wined3d: Add support for EXT_gpu_shader4 provided sampling functions with explicit derivatives .
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 3d112b6525af5b95fb357221d8c051c88e82eb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d112b6525af5b95fb357221d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 24 21:16:14 2010 +0100 wined3d: Add support for EXT_gpu_shader4 provided sampling functions with explicit derivatives. --- dlls/wined3d/glsl_shader.c | 131 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 101 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d112b6525af5b95fb357…

1 0

Henri Verbeet : wined3d: Store a pointer to the GL info in the shader context.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: f71e84d89c837b6c5c3cce194d157f7e5450b749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71e84d89c837b6c5c3cce194… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 24 21:16:13 2010 +0100 wined3d: Store a pointer to the GL info in the shader context. --- dlls/wined3d/glsl_shader.c | 11 ++++------- dlls/wined3d/shader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 87a0341..1196387 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1194,8 +1194,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * static const char * const hwrastout_reg_names[] = { "gl_Position", "gl_FogFragCoord", "gl_PointSize" }; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); *is_color = FALSE; @@ -1819,9 +1818,7 @@ static void shader_glsl_arith(const struct wined3d_shader_instruction *ins) /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)shader->baseShader.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; glsl_src_param_t src0_param; DWORD write_mask; @@ -2776,7 +2773,7 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; glsl_sample_function_t sample_function; glsl_src_param_t coord_param, dx_param, dy_param; DWORD sample_flags = WINED3D_GLSL_SAMPLE_GRAD; @@ -2810,7 +2807,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; glsl_sample_function_t sample_function; glsl_src_param_t coord_param, lod_param; DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3972ec7..23de4a7 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1100,6 +1100,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe /* Initialize current parsing state. */ ctx.shader = iface; + ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.backend_data = backend_ctx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9db09d0..6c78020 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -549,6 +549,7 @@ typedef struct shader_reg_maps struct wined3d_shader_context { IWineD3DBaseShader *shader; + const struct wined3d_gl_info *gl_info; const struct shader_reg_maps *reg_maps; struct wined3d_shader_buffer *buffer; void *backend_data;

1 0

Henri Verbeet : wined3d: Use the correct GLSL functions for sampling Rect textures with explicit derivatives .
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: c78cce88450afa4dc1644917d4f738568ce66e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78cce88450afa4dc1644917d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 24 21:16:12 2010 +0100 wined3d: Use the correct GLSL functions for sampling Rect textures with explicit derivatives. Also kill the obsolete comment. --- dlls/wined3d/glsl_shader.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae35418..87a0341 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1576,10 +1576,7 @@ static void shader_glsl_get_sample_function(DWORD sampler_type, DWORD flags, gls if(lod) { sample_function->name = projected ? "texture2DRectProjLod" : "texture2DRectLod"; } else if(grad) { - /* What good are texrect grad functions? I don't know, but GL_EXT_gpu_shader4 defines them. - * There is no GL_ARB_shader_texture_lod spec yet, so I don't know if they're defined there - */ - sample_function->name = projected ? "shadow2DRectProjGradARB" : "shadow2DRectGradARB"; + sample_function->name = projected ? "texture2DRectProjGradARB" : "texture2DRectGradARB"; } else { sample_function->name = projected ? "texture2DRectProj" : "texture2DRect"; }

1 0

Henri Verbeet : wined3d: Use the GLSL round() function when available.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 5f4ff65fb4cbfc6226d5aff935a02000a20dad8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4ff65fb4cbfc6226d5aff93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 24 21:16:11 2010 +0100 wined3d: Use the GLSL round() function when available. --- dlls/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7392dc7..ae35418 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1822,6 +1822,9 @@ static void shader_glsl_arith(const struct wined3d_shader_instruction *ins) /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)shader->baseShader.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; glsl_src_param_t src0_param; DWORD write_mask; @@ -1847,12 +1850,26 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { /* We need to *round* to the nearest int here. */ unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); - if (mask_size > 1) { - shader_addline(buffer, "ivec%d(floor(abs(%s) + vec%d(0.5)) * sign(%s)));\n", mask_size, src0_param.param_str, mask_size, src0_param.param_str); - } else { - shader_addline(buffer, "int(floor(abs(%s) + 0.5) * sign(%s)));\n", src0_param.param_str, src0_param.param_str); + + if (gl_info->supported[EXT_GPU_SHADER4]) + { + if (mask_size > 1) + shader_addline(buffer, "ivec%d(round(%s)));\n", mask_size, src0_param.param_str); + else + shader_addline(buffer, "int(round(%s)));\n", src0_param.param_str); } - } else { + else + { + if (mask_size > 1) + shader_addline(buffer, "ivec%d(floor(abs(%s) + vec%d(0.5)) * sign(%s)));\n", + mask_size, src0_param.param_str, mask_size, src0_param.param_str); + else + shader_addline(buffer, "int(floor(abs(%s) + 0.5) * sign(%s)));\n", + src0_param.param_str, src0_param.param_str); + } + } + else + { shader_addline(buffer, "%s);\n", src0_param.param_str); } } @@ -3759,6 +3776,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context */ shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); } + if (gl_info->supported[EXT_GPU_SHADER4]) + { + shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); + } /* Base Declarations */ shader_generate_glsl_declarations(context, buffer, (IWineD3DBaseShader *)This, reg_maps, &priv_ctx); @@ -3846,6 +3867,11 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#version 120\n"); + if (gl_info->supported[EXT_GPU_SHADER4]) + { + shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); + } + memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args;

1 0

Henri Verbeet : wined3d: Add support for EXT_gpu_shader4.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 869fc74576a15c59288a56ba96c59f2bd0be1d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=869fc74576a15c59288a56ba9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 24 21:16:10 2010 +0100 wined3d: Add support for EXT_gpu_shader4. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 138 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=869fc74576a15c59288a5…

1 0

Vincent Povirk : ole32: IStorage_Revert has no effect for non-transacted storages.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: da250c9afeed64395349cc2fc116fbe92f9cd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da250c9afeed64395349cc2fc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Jan 24 13:11:51 2010 -0600 ole32: IStorage_Revert has no effect for non-transacted storages. --- dlls/ole32/storage32.c | 4 ++-- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 39ed710..8fe0542 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1796,8 +1796,8 @@ static HRESULT WINAPI StorageImpl_Commit( static HRESULT WINAPI StorageImpl_Revert( IStorage* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TRACE("(%p)\n", iface); + return S_OK; } /************************************************************************* diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index ceca756..e598fe0 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1384,7 +1384,7 @@ static void test_revert(void) ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStorage_Revert(stg); - todo_wine ok(r==S_OK, "IStorage->Revert failed %08x\n", r); + ok(r==S_OK, "IStorage->Revert failed %08x\n", r); r = IStream_Write(stm, "this works\n", 11, NULL); ok(r==S_OK, "IStream_Write should succeed %08x\n", r);

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in pen.c.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: ec8f002919c23dc1ed949f5df68a765879fac6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8f002919c23dc1ed949f5df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:30:26 2009 -0600 gdiplus: Add traces to unimplemented functions in pen.c. --- dlls/gdiplus/pen.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 6299d67..930317c 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -393,6 +393,8 @@ GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) { static int calls; + TRACE("(%p)\n", pen); + if(!pen) return InvalidParameter; @@ -406,6 +408,8 @@ GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrix { static int calls; + TRACE("(%p,%0.2f,%0.2f,%u)\n", pen, sx, sy, order); + if(!pen) return InvalidParameter;

1 0

Vincent Povirk : gdiplus: Always trace pixel formats in hex.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 8be3e5cf29dabacab7b3b27e4a281b00c6fa0e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be3e5cf29dabacab7b3b27e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:22:25 2009 -0600 gdiplus: Always trace pixel formats in hex. --- dlls/gdiplus/image.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9227751..4d6448e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -429,7 +429,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, UINT abs_height; GpRect act_rect; /* actual rect to be used */ - TRACE("%p %p %d %d %p\n", bitmap, rect, flags, format, lockeddata); + TRACE("%p %p %d 0x%x %p\n", bitmap, rect, flags, format, lockeddata); if(!lockeddata || !bitmap) return InvalidParameter; @@ -623,7 +623,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, Rect area; GpStatus stat; - TRACE("(%f,%f,%f,%f,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + TRACE("(%f,%f,%f,%f,0x%x,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); if (!srcBitmap || !dstBitmap || srcBitmap->image.type != ImageTypeBitmap || x < 0 || y < 0 || @@ -681,7 +681,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - TRACE("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + TRACE("(%i,%i,%i,%i,0x%x,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); return GdipCloneBitmapArea(x, y, width, height, format, srcBitmap, dstBitmap); } @@ -1211,7 +1211,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, REAL xres, yres; GpStatus stat; - TRACE("%d %d %d %d %p %p\n", width, height, stride, format, scan0, bitmap); + TRACE("%d %d %d 0x%x %p %p\n", width, height, stride, format, scan0, bitmap); if (!bitmap) return InvalidParameter;

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010