April 2013 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : kernel32: Add a test to check event, thread, mutex and semaphore states during process termination.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 5690304c9d09325db5fb779cfa8ca7347bcaa7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5690304c9d09325db5fb779cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 17 18:52:38 2013 +0900 kernel32: Add a test to check event, thread, mutex and semaphore states during process termination. --- dlls/kernel32/tests/loader.c | 126 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 110 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5690304c9d09325db5fb7…

1 0

Henri Verbeet : wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsF ().
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 84219f196404a90b34a1ddd75cee9be392e25ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=84219f196404a90b34a1ddd75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 08:47:57 2013 +0200 wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsF(). --- dlls/wined3d/glsl_shader.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 904d6ec..d6540ba 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -582,9 +582,7 @@ static void shader_glsl_load_constantsF(const struct wined3d_shader *shader, con /* Immediate constants are clamped to [-1;1] at shader creation time if needed */ LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - GLint location = constant_locations[lconst->idx]; - /* We found this uniform name in the program - go ahead and send the data */ - if (location != -1) GL_EXTCALL(glUniform4fvARB(location, 1, (const GLfloat *)lconst->value)); + GL_EXTCALL(glUniform4fvARB(constant_locations[lconst->idx], 1, (const GLfloat *)lconst->value)); } checkGLcall("glUniform4fvARB()"); }

1 0

Nikolay Sivov : include: Fix interface definition.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 4bd7954bc6af9092ed710bc916a58bf56da1768e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd7954bc6af9092ed710bc91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 17 09:07:44 2013 +0400 include: Fix interface definition. --- include/dwrite_1.idl | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/dwrite_1.idl b/include/dwrite_1.idl index 138b869..7500546 100644 --- a/include/dwrite_1.idl +++ b/include/dwrite_1.idl @@ -675,7 +675,7 @@ interface IDWriteTextAnalyzer1 : IDWriteTextAnalyzer UINT16 const *clustermap, FLOAT const *advances, DWRITE_GLYPH_OFFSET const *offsets, - /*DWRITE_SHAPING_GLYPH_PROPERTIES const *properties, */ + DWRITE_SHAPING_GLYPH_PROPERTIES const *props, FLOAT *modified_advances, DWRITE_GLYPH_OFFSET *modified_offsets); HRESULT GetBaseline(IDWriteFontFace *face, @@ -698,10 +698,7 @@ interface IDWriteTextAnalyzer1 : IDWriteTextAnalyzer BOOL is_sideways, DWRITE_MATRIX *transform); -/* - * HRESULT GetScriptProperties(DWRITE_SCRIPT_ANALYSIS sa, - * DWRITE_SCRIPT_PROPERTIES *properties); - */ + HRESULT GetScriptProperties(DWRITE_SCRIPT_ANALYSIS sa, DWRITE_SCRIPT_PROPERTIES *props); HRESULT GetTextComplexity(const WCHAR *text, UINT32 len,

1 0

Nikolay Sivov : oledb32: Implement DBTYPE_CY -> DBTYPE_VARIANT conversion.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: d6c6a73738d9349e522043d0a9dd19a6ece7128c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c6a73738d9349e522043d0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 17 08:23:30 2013 +0400 oledb32: Implement DBTYPE_CY -> DBTYPE_VARIANT conversion. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 1710e76..3b3f9df 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -771,6 +771,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_DATE(v) = *(DATE*)src; hr = S_OK; break; + case DBTYPE_CY: + V_VT(v) = VT_CY; + V_CY(v) = *(CY*)src; + hr = S_OK; + break; default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index caba9c4..4f50a77 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2522,6 +2522,7 @@ static void test_converttovar(void) DBLENGTH dst_len; VARIANT dst; HRESULT hr; + CY cy, cy2; DATE date; INT i4; @@ -2573,6 +2574,20 @@ static void test_converttovar(void) ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); ok(V_DATE(&dst) == 123.123, "got %f\n", V_DATE(&dst)); + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; + S(cy).Lo = 1; + S(cy).Hi = 2; + hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_VARIANT, sizeof(cy), &dst_len, &cy, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_CY, "got %d\n", V_VT(&dst)); + + cy2 = V_CY(&dst); + ok(S(cy2).Lo == S(cy).Lo && S(cy2).Hi == S(cy).Hi, "got %d,%d\n", S(cy2).Lo, S(cy2).Hi); + IDataConvert_Release(convert); }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMOBJECT.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 9eae7aed1beb6b23fb7be6df44aa75f96108c5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eae7aed1beb6b23fb7be6df4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 08:48:00 2013 +0200 d3drm: Avoid LPDIRECT3DRMOBJECT. --- dlls/d3drm/d3drm.c | 23 +++++++++-------------- dlls/d3drm/tests/d3drm.c | 2 +- include/d3drm.h | 6 +++--- include/d3drmobj.h | 16 ++++++++-------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 65dea6c..1458a1e 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -392,11 +392,10 @@ static HRESULT WINAPI IDirect3DRMImpl_GetDevices(IDirect3DRM* iface, LPDIRECT3DR return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_GetNamedObject(IDirect3DRM* iface, const char * pName, LPDIRECT3DRMOBJECT * ppObject) +static HRESULT WINAPI IDirect3DRMImpl_GetNamedObject(IDirect3DRM *iface, + const char *name, IDirect3DRMObject **object) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, pName, ppObject); + FIXME("iface %p, name %s, object %p stub!\n", iface, debugstr_a(name), object); return E_NOTIMPL; } @@ -795,12 +794,10 @@ static HRESULT WINAPI IDirect3DRM2Impl_GetDevices(IDirect3DRM2* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_GetNamedObject(IDirect3DRM2* iface, const char * pName, - LPDIRECT3DRMOBJECT * ppObject) +static HRESULT WINAPI IDirect3DRM2Impl_GetNamedObject(IDirect3DRM2 *iface, + const char *name, IDirect3DRMObject **object) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, pName, ppObject); + FIXME("iface %p, name %s, object %p stub!\n", iface, debugstr_a(name), object); return E_NOTIMPL; } @@ -1237,12 +1234,10 @@ static HRESULT WINAPI IDirect3DRM3Impl_GetDevices(IDirect3DRM3* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_GetNamedObject(IDirect3DRM3* iface, const char* Name, - LPDIRECT3DRMOBJECT* Object) +static HRESULT WINAPI IDirect3DRM3Impl_GetNamedObject(IDirect3DRM3 *iface, + const char *name, IDirect3DRMObject **object) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, Name, Object); + FIXME("iface %p, name %s, object %p stub!\n", iface, debugstr_a(name), object); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9110efa..9c3746b 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1335,7 +1335,7 @@ static const GUID* refiids[] = &IID_IDirect3DRMMaterial /* Not taken into account and not notified */ }; -static void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) +static void __cdecl object_load_callback(IDirect3DRMObject *object, REFIID objectguid, LPVOID arg) { ok(object != NULL, "Arg 1 should not be null\n"); ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 is incorrect\n"); diff --git a/include/d3drm.h b/include/d3drm.h index b2c56ac..38438de 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -93,7 +93,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; - STDMETHOD(GetNamedObject)(THIS_ const char *, LPDIRECT3DRMOBJECT *) PURE; + STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(Load)(THIS_ LPVOID, LPVOID, LPIID *, DWORD, D3DRMLOADOPTIONS, D3DRMLOADCALLBACK, LPVOID, D3DRMLOADTEXTURECALLBACK, LPVOID, LPDIRECT3DRMFRAME) PURE; @@ -229,7 +229,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; - STDMETHOD(GetNamedObject)(THIS_ const char *, LPDIRECT3DRMOBJECT *) PURE; + STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(Load)(THIS_ LPVOID, LPVOID, LPIID *, DWORD, D3DRMLOADOPTIONS, D3DRMLOADCALLBACK, LPVOID, D3DRMLOADTEXTURECALLBACK, LPVOID, LPDIRECT3DRMFRAME) PURE; @@ -368,7 +368,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; - STDMETHOD(GetNamedObject)(THIS_ const char *, LPDIRECT3DRMOBJECT *) PURE; + STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(Load)(THIS_ LPVOID, LPVOID, LPIID *, DWORD, D3DRMLOADOPTIONS, D3DRMLOADCALLBACK, LPVOID, D3DRMLOADTEXTURECALLBACK, LPVOID, LPDIRECT3DRMFRAME3) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 01359a4..31d5c9a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -154,7 +154,7 @@ typedef struct IDirect3DRMClippedVisual *LPDIRECT3DRMCLIPPEDVISUAL, **LPLPDIRE Types and structures ******************************************************************** */ -typedef void (__cdecl *D3DRMOBJECTCALLBACK)(LPDIRECT3DRMOBJECT obj, LPVOID arg); +typedef void (__cdecl *D3DRMOBJECTCALLBACK)(struct IDirect3DRMObject *obj, void *arg); typedef void (__cdecl *D3DRMFRAMEMOVECALLBACK)(LPDIRECT3DRMFRAME obj, LPVOID arg, D3DVALUE delta); typedef void (__cdecl *D3DRMFRAME3MOVECALLBACK)(LPDIRECT3DRMFRAME3 obj, LPVOID arg, D3DVALUE delta); typedef void (__cdecl *D3DRMUPDATECALLBACK)(struct IDirect3DRMDevice *device, void *ctx, int count, D3DRECT *rects); @@ -164,7 +164,7 @@ typedef int (__cdecl *D3DRMUSERVISUALCALLBACK)(LPDIRECT3DRMUSERVISUAL obj, LPVOI D3DRMUSERVISUALREASON reason, LPDIRECT3DRMDEVICE dev, LPDIRECT3DRMVIEWPORT view); typedef HRESULT (__cdecl *D3DRMLOADTEXTURECALLBACK)(char *tex_name, void *arg, LPDIRECT3DRMTEXTURE *); typedef HRESULT (__cdecl *D3DRMLOADTEXTURE3CALLBACK)(char *tex_name, void *arg, LPDIRECT3DRMTEXTURE3 *); -typedef void (__cdecl *D3DRMLOADCALLBACK)(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg); +typedef void (__cdecl *D3DRMLOADCALLBACK)(struct IDirect3DRMObject *object, REFIID objectguid, void *arg); typedef HRESULT (__cdecl *D3DRMDOWNSAMPLECALLBACK)(struct IDirect3DRMTexture3 *texture, void *ctx, IDirectDrawSurface *src_surface, IDirectDrawSurface *dst_surface); typedef HRESULT (__cdecl *D3DRMVALIDATIONCALLBACK)(LPDIRECT3DRMTEXTURE3 lpDirect3DRMTexture, LPVOID pArg, @@ -3575,8 +3575,8 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv ) PURE; - STDMETHOD(Apply)(THIS_ LPDIRECT3DRMOBJECT) PURE; - STDMETHOD(ApplyRelative)(THIS_ LPDIRECT3DRMFRAME frame, LPDIRECT3DRMOBJECT) PURE; + STDMETHOD(Apply)(THIS_ IDirect3DRMObject *object) PURE; + STDMETHOD(ApplyRelative)(THIS_ IDirect3DRMFrame *frame, IDirect3DRMObject *object) PURE; }; #undef INTERFACE @@ -4182,7 +4182,7 @@ DECLARE_INTERFACE_(IDirect3DRMObjectArray, IDirect3DRMArray) /*** IDirect3DRMArray methods ***/ STDMETHOD_(DWORD, GetSize)(THIS) PURE; /*** IDirect3DRMObjectArray methods ***/ - STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMOBJECT *) PURE; + STDMETHOD(GetElement)(THIS_ DWORD index, IDirect3DRMObject **element) PURE; }; #undef INTERFACE @@ -4559,12 +4559,12 @@ DECLARE_INTERFACE_(IDirect3DRMInterpolator, IDirect3DRMObject) STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMInterpolator methods ***/ - STDMETHOD(AttachObject)(THIS_ LPDIRECT3DRMOBJECT) PURE; + STDMETHOD(AttachObject)(THIS_ IDirect3DRMObject *object) PURE; STDMETHOD(GetAttachedObjects)(THIS_ LPDIRECT3DRMOBJECTARRAY *) PURE; - STDMETHOD(DetachObject)(THIS_ LPDIRECT3DRMOBJECT) PURE; + STDMETHOD(DetachObject)(THIS_ IDirect3DRMObject *object) PURE; STDMETHOD(SetIndex)(THIS_ D3DVALUE) PURE; STDMETHOD_(D3DVALUE, GetIndex)(THIS) PURE; - STDMETHOD(Interpolate)(THIS_ D3DVALUE, LPDIRECT3DRMOBJECT, D3DRMINTERPOLATIONOPTIONS) PURE; + STDMETHOD(Interpolate)(THIS_ D3DVALUE index, IDirect3DRMObject *object, D3DRMINTERPOLATIONOPTIONS flags) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : wined3d: Introduce a separate debug channel for performance warnings.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: c0a84454c4c5dee39914e480773882d3f90b98cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a84454c4c5dee39914e4807… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 08:47:59 2013 +0200 wined3d: Introduce a separate debug channel for performance warnings. --- dlls/wined3d/device.c | 3 ++- dlls/wined3d/directx.c | 7 ++++--- dlls/wined3d/drawprim.c | 9 +++++---- dlls/wined3d/gl_compat.c | 9 +++++---- dlls/wined3d/surface.c | 5 +++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ae5eae..17c122d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -35,6 +35,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); /* Define the default light parameters as specified by MSDN. */ const struct wined3d_light WINED3D_default_light = @@ -221,7 +222,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s * drawStridedSlow() is needed, including a vertex buffer path. */ if (state->load_base_vertex_index < 0) { - WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); + WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); data.buffer_object = 0; data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d4b993b..3a97ae2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -30,6 +30,7 @@ #include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) @@ -553,7 +554,7 @@ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) if (memcmp(check, pattern, sizeof(check))) { - WARN("PBO test failed, read back data doesn't match original.\n" + WARN_(d3d_perf)("PBO test failed, read back data doesn't match original.\n" "Disabling PBOs. This may result in slower performance.\n"); gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] = FALSE; } @@ -2424,7 +2425,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) } else { - WARN("Driver doesn't guarantee a minimum buffer map alignment.\n"); + WARN_(d3d_perf)("Driver doesn't guarantee a minimum buffer map alignment.\n"); } if (gl_info->supported[NV_REGISTER_COMBINERS]) { @@ -2853,7 +2854,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - WARN("Framebuffer objects not supported, falling back to backbuffer offscreen rendering mode.\n"); + WARN_(d3d_perf)("Framebuffer objects not supported, falling back to backbuffer offscreen rendering mode.\n"); wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; } if (gl_info->supported[EXT_FRAMEBUFFER_BLIT]) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 14cb18f..2e158dd 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -30,6 +30,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); #include <stdio.h> #include <math.h> @@ -102,7 +103,7 @@ static void drawStridedSlow(const struct wined3d_device *device, const struct wi UINT num_untracked_materials; DWORD tex_mask = 0; - TRACE("Using slow vertex array code\n"); + TRACE_(d3d_perf)("Using slow vertex array code\n"); /* Variable Initialization */ if (idxSize) @@ -702,7 +703,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (!warned++) FIXME("Using software emulation because not all material properties could be tracked.\n"); else - WARN("Using software emulation because not all material properties could be tracked.\n"); + WARN_(d3d_perf)("Using software emulation because not all material properties could be tracked.\n"); emulation = TRUE; } else if (context->fog_coord && state->render_states[WINED3D_RS_FOGENABLE]) @@ -715,7 +716,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (!warned++) FIXME("Using software emulation because manual fog coordinates are provided.\n"); else - WARN("Using software emulation because manual fog coordinates are provided.\n"); + WARN_(d3d_perf)("Using software emulation because manual fog coordinates are provided.\n"); emulation = TRUE; } @@ -737,7 +738,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (!warned++) FIXME("Using immediate mode with vertex shaders for half float emulation.\n"); else - WARN("Using immediate mode with vertex shaders for half float emulation.\n"); + WARN_(d3d_perf)("Using immediate mode with vertex shaders for half float emulation.\n"); drawStridedSlowVs(gl_info, state, stream_info, index_count, state->gl_primitive_type, idx_data, idx_size, start_idx); diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index cd22097..4dd9062 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -29,6 +29,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(gl_compat); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); /* Start GL_ARB_multitexture emulation */ static void WINE_GLAPI wine_glMultiTexCoord1fARB(GLenum target, GLfloat s) { @@ -176,7 +177,7 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { if(param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); } else { - WARN("Fog coords activated, but not supported. Using slow emulation\n"); + WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); old_fogcoord_glDisable(GL_FOG); } } else { @@ -197,7 +198,7 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { if(*param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); } else { - WARN("Fog coords activated, but not supported. Using slow emulation\n"); + WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); old_fogcoord_glDisable(GL_FOG); } } else { @@ -218,7 +219,7 @@ static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { if(param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); } else { - WARN("Fog coords activated, but not supported. Using slow emulation\n"); + WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); old_fogcoord_glDisable(GL_FOG); } } else { @@ -239,7 +240,7 @@ static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) { if(*param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); } else { - WARN("Fog coords activated, but not supported. Using slow emulation\n"); + WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); old_fogcoord_glDisable(GL_FOG); } } else { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a3589b1..f7e99ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -31,6 +31,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d); static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, @@ -1551,13 +1552,13 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC * locking them. */ if (dst_surface->flags & SFLAG_CONVERTED) { - WARN("Converted surface, using CPU blit.\n"); + WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); } if (flags & ~simple_blit) { - WARN("Using fallback for complex blit (%#x).\n", flags); + WARN_(d3d_perf)("Using fallback for complex blit (%#x).\n", flags); goto fallback; }

1 0

Henri Verbeet : wined3d: Get rid of the unused WINED3DFMT_FLAG_FOURCC flag.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 42208d083c31fe31300a0d98f827bb1aa29dc04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=42208d083c31fe31300a0d98f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 08:47:58 2013 +0200 wined3d: Get rid of the unused WINED3DFMT_FLAG_FOURCC flag. --- dlls/wined3d/utils.c | 18 +----------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index da8fc7b..92ae892 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -146,19 +146,6 @@ struct wined3d_format_base_flags * resource size. */ static const struct wined3d_format_base_flags format_base_flags[] = { - {WINED3DFMT_UYVY, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_YUY2, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_YV12, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_DXT1, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_DXT2, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_DXT3, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_DXT4, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_DXT5, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_MULTI2_ARGB8, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_G8R8_G8B8, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_R8G8_B8G8, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_INTZ, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_NULL, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_P8_UINT, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_B8G8R8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_FLAG_GETDC}, @@ -170,10 +157,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_B4G4R4X4_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_R8G8B8X8_UNORM, WINED3DFMT_FLAG_GETDC}, - {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_FOURCC | WINED3DFMT_FLAG_BROKEN_PITCH}, - {WINED3DFMT_NVDB, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_NVHU, WINED3DFMT_FLAG_FOURCC}, - {WINED3DFMT_NVHS, WINED3DFMT_FLAG_FOURCC}, + {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_BROKEN_PITCH}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_R32G32_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_R32G32B32_FLOAT, WINED3DFMT_FLAG_FLOAT}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2137585..1ee9b9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2787,7 +2787,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_DEPTH 0x00000004 #define WINED3DFMT_FLAG_STENCIL 0x00000008 #define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 -#define WINED3DFMT_FLAG_FOURCC 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 #define WINED3DFMT_FLAG_GETDC 0x00000100

1 0

Nikolay Sivov : oledb32: Implement DBTYPE_DATE -> DBTYPE_VARIANT conversion .
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 726f50b506fa0440cf1e3c4b3a6ae61841939969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726f50b506fa0440cf1e3c4b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 17 08:11:25 2013 +0400 oledb32: Implement DBTYPE_DATE -> DBTYPE_VARIANT conversion. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index d23c944..1710e76 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -766,6 +766,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = V_BSTR(v) ? S_OK : E_OUTOFMEMORY; break; } + case DBTYPE_DATE: + V_VT(v) = VT_DATE; + V_DATE(v) = *(DATE*)src; + hr = S_OK; + break; default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a2b1366..caba9c4 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2522,6 +2522,7 @@ static void test_converttovar(void) DBLENGTH dst_len; VARIANT dst; HRESULT hr; + DATE date; INT i4; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -2561,6 +2562,17 @@ static void test_converttovar(void) ok(V_VT(&dst) == VT_I4, "got %d\n", V_VT(&dst)); ok(V_I4(&dst) == 123, "got %d\n", V_I4(&dst)); + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; + date = 123.123; + hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_VARIANT, sizeof(date), &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); + ok(V_DATE(&dst) == 123.123, "got %f\n", V_DATE(&dst)); + IDataConvert_Release(convert); }

1 0

André Hentschel : Update download page with new Ubuntu information for all languages as good as possible
by Jeremy Newman April 16, 2013

April 16, 2013

Module: website Branch: master Commit: 2da92ee60815b70212186ba4092d9e9243969f3e URL: http://source.winehq.org/git/website.git/?a=commit;h=2da92ee60815b70212186b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 16 22:41:27 2013 +0200 Update download page with new Ubuntu information for all languages as good as possible --- templates/de/download.template | 4 ++-- templates/fr/download.template | 4 ++-- templates/he/download.template | 2 +- templates/pl/download.template | 4 ++-- templates/pt/download.template | 4 ++-- templates/tr/download.template | 4 ++-- templates/zh-cn/download.template | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 7ade0fa..45d0746 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,8 +62,8 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Ubuntu</a> - binär und Quellcode .debs für Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), und Natty (11.04) - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + binär und Quellcode .debs für Ubuntu Precise (12.04), Quantal (12.10), und Raring (13.04) + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/fr/download.template b/templates/fr/download.template index 4f6513b..4b4741e 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -66,8 +66,8 @@ center;">Voyez la <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Paquets Ubuntu</a> - - .deb binaires et sources pour Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10) et Natty (11.04) - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + - .deb binaires et sources pour Ubuntu Precise (12.04), Quantal (12.10), et Raring (13.04) + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/he/download.template b/templates/he/download.template index d92c07b..d7cabac 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -63,7 +63,7 @@ </td> <td> <a href="{$root}/download/deb">הורדת חבילות לאובונטו</a> - קובצי .deb להתקנה בינרית ולהתקנה עם קוד המקור לאובונטו Lucid&rlm; (10.04 LTS) - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/pl/download.template b/templates/pl/download.template index e0dbdc7..ae9b32e 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -60,8 +60,8 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Pobierz paczki dla Ubuntu</a> - - binarne i źródłowe paczki .deb dla Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), i Natty (11.04) - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + - binarne i źródłowe paczki .deb dla Ubuntu Precise (12.04), Quantal (12.10), i Raring (13.04) + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/pt/download.template b/templates/pt/download.template index 0b6ed2c..fd1f61f 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -59,8 +59,8 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Descarregar pacotes para Ubuntu</a> - - .debs binários e do código fonte para Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), e Natty (11.04) - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + - .debs binários e do código fonte para Ubuntu Precise (12.04), Quantal (12.10), e Raring (13.04) + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/tr/download.template b/templates/tr/download.template index e9ccd2d..52b1c79 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -61,8 +61,8 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Ubuntu paketleri indirin</a> - - Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10) ve Natty (11.04) için .debs ikili ve kaynak paketi - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + - Ubuntu Precise (12.04), Quantal (12.10) ve Raring (13.04) için .debs ikili ve kaynak paketi + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 8313e69..3b207fb 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -62,7 +62,7 @@ requested in exchange for hosting the Wine web site. </td> <td> <a href="{$root}/download/ubuntu">下载 Ubuntu 安装包</a> - Ubuntu Oneiric（11.10），和 Precise（12.04）的二进制和源码 .debs - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Stefan Dösinger : wined3d: Enable GL_ARB_texture_rectangle in GLSL ffp fragment shaders.
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: ea69fa943f18c7fa89a1b85b54f1daeb7c1ce08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea69fa943f18c7fa89a1b85b5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 16 14:48:36 2013 +0200 wined3d: Enable GL_ARB_texture_rectangle in GLSL ffp fragment shaders. --- dlls/wined3d/glsl_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3493ff2..904d6ec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5122,6 +5122,9 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf shader_addline(buffer, "#version 120\n"); + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) + shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); + shader_addline(buffer, "vec4 tmp0, tmp1;\n"); shader_addline(buffer, "vec4 ret;\n"); if (tempreg_used || settings->sRGB_write)

1 0