wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Christian Costa : d3dxof: Uncomment some traces and use better name for some variables.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: f39547f5a875c7b9ccc11fb8d3c796c21d668143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39547f5a875c7b9ccc11fb8d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 30 23:05:31 2013 +0200 d3dxof: Uncomment some traces and use better name for some variables. --- dlls/d3dxof/parsing.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 2faf7a2..3ad9fa7 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -647,7 +647,6 @@ static WORD parse_TOKEN(parse_buffer * buf) char c; if (!read_bytes(buf, &c, 1)) return TOKEN_NONE; - /*TRACE("char = '%c'\n", is_space(c) ? ' ' : c);*/ if ((c == '#') || (c == '/')) { /* Handle comment (# or //) */ @@ -766,16 +765,14 @@ static WORD parse_TOKEN(parse_buffer * buf) case TOKEN_NAME: { DWORD count; - char strname[100]; + char *name = (char*)buf->value; if (!read_bytes(buf, &count, 4)) return TOKEN_ERROR; - if (!read_bytes(buf, strname, count)) + if (!read_bytes(buf, name, count)) return TOKEN_ERROR; - strname[count] = 0; - /*TRACE("name = %s\n", strname);*/ - - strcpy((char*)buf->value, strname); + name[count] = 0; + TRACE("name = %s\n", name); } break; case TOKEN_INTEGER: @@ -784,7 +781,7 @@ static WORD parse_TOKEN(parse_buffer * buf) if (!read_bytes(buf, &integer, 4)) return TOKEN_ERROR; - /*TRACE("integer = %ld\n", integer);*/ + TRACE("integer = %u\n", integer); *(DWORD*)buf->value = integer; } @@ -799,7 +796,7 @@ static WORD parse_TOKEN(parse_buffer * buf) sprintf(strguid, CLSIDFMT, class_id.Data1, class_id.Data2, class_id.Data3, class_id.Data4[0], class_id.Data4[1], class_id.Data4[2], class_id.Data4[3], class_id.Data4[4], class_id.Data4[5], class_id.Data4[6], class_id.Data4[7]); - /*TRACE("guid = {%s}\n", strguid);*/ + TRACE("guid = %s\n", strguid); *(GUID*)buf->value = class_id; } @@ -808,19 +805,19 @@ static WORD parse_TOKEN(parse_buffer * buf) { DWORD count; WORD tmp_token; - char strname[100]; + char *string = (char*)buf->value; + if (!read_bytes(buf, &count, 4)) return TOKEN_ERROR; - if (!read_bytes(buf, strname, count)) + if (!read_bytes(buf, string, count)) return TOKEN_ERROR; - strname[count] = 0; + string[count] = 0; if (!read_bytes(buf, &tmp_token, 2)) return TOKEN_ERROR; if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON)) ERR("No comma or semicolon (got %d)\n", tmp_token); - /*TRACE("name = %s\n", strname);*/ + TRACE("string = %s\n", string); - strcpy((char*)buf->value, strname); token = TOKEN_LPSTR; } break;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMOBJECTARRAY.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: edf46d91bcd5d14e0729b9661b64bc5f66f6f51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf46d91bcd5d14e0729b9661… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:37 2013 +0200 d3drm: Avoid LPDIRECT3DRMOBJECTARRAY. --- include/d3drmobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 00bdb21..5576701 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -4564,7 +4564,7 @@ DECLARE_INTERFACE_(IDirect3DRMInterpolator, IDirect3DRMObject) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMInterpolator methods ***/ STDMETHOD(AttachObject)(THIS_ IDirect3DRMObject *object) PURE; - STDMETHOD(GetAttachedObjects)(THIS_ LPDIRECT3DRMOBJECTARRAY *) PURE; + STDMETHOD(GetAttachedObjects)(THIS_ IDirect3DRMObjectArray **array) PURE; STDMETHOD(DetachObject)(THIS_ IDirect3DRMObject *object) PURE; STDMETHOD(SetIndex)(THIS_ D3DVALUE) PURE; STDMETHOD_(D3DVALUE, GetIndex)(THIS) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMUSERVISUAL.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 97bc1eb389b99114b7071b7b8d3f932b4d50245a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bc1eb389b99114b7071b7b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:36 2013 +0200 d3drm: Avoid LPDIRECT3DRMUSERVISUAL. --- dlls/d3drm/d3drm.c | 25 +++++++++---------------- include/d3drm.h | 6 +++--- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index df3b9cc..b39db28 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -305,11 +305,10 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateWrap(IDirect3DRM *iface, D3DRMWRAPTY return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRMUSERVISUALCALLBACK cb, LPVOID pArg, LPDIRECT3DRMUSERVISUAL * ppUserVisual) +static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, pArg, ppUserVisual); + FIXME("iface %p, cb %p, ctx %p visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } @@ -677,13 +676,10 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateWrap(IDirect3DRM2 *iface, D3DRMWRAP return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface, - D3DRMUSERVISUALCALLBACK cb, LPVOID pArg, - LPDIRECT3DRMUSERVISUAL * ppUserVisual) +static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2 *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, pArg, ppUserVisual); + FIXME("iface %p, cb %p, ctx %p, visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } @@ -1074,13 +1070,10 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateWrap(IDirect3DRM3 *iface, D3DRMWRAP return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateUserVisual(IDirect3DRM3* iface, - D3DRMUSERVISUALCALLBACK cb, LPVOID arg, - LPDIRECT3DRMUSERVISUAL* UserVisual) +static HRESULT WINAPI IDirect3DRM3Impl_CreateUserVisual(IDirect3DRM3 *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, arg, UserVisual); + FIXME("iface %p, cb %p, ctx %p, visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 4a6ae4c..2a23e51 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -86,7 +86,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HRSRC resource, IDirect3DRMTexture **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; @@ -225,7 +225,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) PURE; @@ -368,7 +368,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture3 **texture) PURE;

1 0

Henri Verbeet : wined3d: Allow textures as swapchain surfaces.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: a3f59cf6188947d4190e5dbfe22215f9c20efa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f59cf6188947d4190e5dbfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:35 2013 +0200 wined3d: Allow textures as swapchain surfaces. --- dlls/wined3d/arb_program_shader.c | 7 +- dlls/wined3d/context.c | 11 +- dlls/wined3d/device.c | 3 +- dlls/wined3d/surface.c | 209 +++++++++++++++++-------------------- dlls/wined3d/swapchain.c | 18 +-- dlls/wined3d/texture.c | 6 +- dlls/wined3d/wined3d_private.h | 25 +---- 7 files changed, 120 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3f59cf6188947d4190e5…

1 0

Henri Verbeet : wined3d: Add base format info for some typeless formats.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 48d470f60c9e2388411f3ed688fb440f439f3d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d470f60c9e2388411f3ed68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:34 2013 +0200 wined3d: Add base format info for some typeless formats. --- dlls/wined3d/utils.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7c4f188..b83a05a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -136,6 +136,17 @@ static const struct wined3d_format_channels formats[] = /* Unsure about them, could not find a Windows driver that supports them */ {WINED3DFMT_R16, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_AL16, 0, 0, 0, 16, 0, 0, 0, 16, 4, 0, 0}, + /* Typeless */ + {WINED3DFMT_R8_TYPELESS, 8, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + {WINED3DFMT_R8G8_TYPELESS, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, + {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, + {WINED3DFMT_R16_TYPELESS, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, + {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, + {WINED3DFMT_R16G16B16A16_TYPELESS, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, + {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, + {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, + {WINED3DFMT_R32G32B32_TYPELESS, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, + {WINED3DFMT_R32G32B32A32_TYPELESS, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, }; struct wined3d_format_base_flags

1 0

Henri Verbeet : wined3d: Allow 32 bpc UINT formats in vertex declarations.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 51bbfa5ced84fccf4a0f2e0ec5b10865ca0087ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bbfa5ced84fccf4a0f2e0ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:33 2013 +0200 wined3d: Allow 32 bpc UINT formats in vertex declarations. --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/utils.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d2fd22c..91e5d1f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4692,6 +4692,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) position_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + position_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT2] = invalid_func; @@ -4710,6 +4711,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) diffuse_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + diffuse_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; /* No 4 component entry points here */ specular_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; @@ -4744,6 +4746,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) specular_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; specular_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; specular_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + specular_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; /* Only 3 component entry points here. Test how others behave. Float4 normals are used * by one of our tests, trying to pass it to the pixel shader, which fails on Windows. @@ -4765,6 +4768,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) normal_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; normal_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; normal_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + normal_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT1] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord1fvARB); multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT2] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord2fvARB); @@ -4790,6 +4794,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_texcoord_func; multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_texcoord_func; } + multi_texcoord_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_texcoord_func; } static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8f27e61..7c4f188 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -120,6 +120,9 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_R16_UINT, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_R32_UINT, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, + {WINED3DFMT_R32G32_UINT, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, + {WINED3DFMT_R32G32B32_UINT, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, + {WINED3DFMT_R32G32B32A32_UINT, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, {WINED3DFMT_R16G16B16A16_SNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -218,7 +221,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, 3, GL_FALSE, sizeof(short int)}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, 3, GL_TRUE, sizeof(short int)}, {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_FLOAT, 2, GL_FALSE, sizeof(GLhalfNV)}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)} + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, 1, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, 2, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, 3, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, 4, GL_FALSE, sizeof(UINT)}, }; struct wined3d_format_texture_info diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c088eb..7a4633b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -901,7 +901,8 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_DEC3N = 14, WINED3D_FFP_EMIT_FLOAT16_2 = 15, WINED3D_FFP_EMIT_FLOAT16_4 = 16, - WINED3D_FFP_EMIT_COUNT = 17 + WINED3D_FFP_EMIT_INVALID = 17, + WINED3D_FFP_EMIT_COUNT = 18 }; struct wined3d_bo_address

1 0

Akihiro Sagawa : kernel32: Don't move fixed memory area in GlobalReAlloc.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 9ab603b0333dceb2373e78afceb0bf3d4b4bb502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab603b0333dceb2373e78afc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:41 2013 +0900 kernel32: Don't move fixed memory area in GlobalReAlloc. --- dlls/kernel32/heap.c | 2 ++ dlls/kernel32/tests/heap.c | 28 ++++++---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e0b86e5..51bd235 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -646,6 +646,8 @@ HGLOBAL WINAPI GlobalReAlloc( if(ISPOINTER(hmem)) { /* reallocate fixed memory */ + if (!(flags & GMEM_MOVEABLE)) + heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; hnew=HeapReAlloc(GetProcessHeap(), heap_flags, hmem, size); } else diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 866abb8..e36336c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -251,17 +251,9 @@ static void test_heap(void) gbl = GlobalAlloc(GMEM_FIXED, init_size); SetLastError(MAGIC_DEAD); hsecond = GlobalReAlloc(gbl, size + init_size, 0); - if (hsecond != gbl) { - todo_wine - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - GlobalFree(hsecond); - } - else { - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - GlobalFree(gbl); - } + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + GlobalFree(gbl); } /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ @@ -418,17 +410,9 @@ static void test_heap(void) gbl = LocalAlloc(LMEM_FIXED, init_size); SetLastError(MAGIC_DEAD); hsecond = LocalReAlloc(gbl, size + init_size, 0); - if (hsecond != gbl) { - todo_wine - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - LocalFree(hsecond); - } - else { - ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); - LocalFree(gbl); - } + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + LocalFree(gbl); } /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */

1 0

Akihiro Sagawa : progman: Use LMEM_MOVEABLE when reallocating memory.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 4874b806f3c77e629f615d1fd048d6b2f739c429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4874b806f3c77e629f615d1fd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:39 2013 +0900 progman: Use LMEM_MOVEABLE when reallocating memory. --- programs/progman/grpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 12d90ae..d49dde3 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -122,7 +122,7 @@ static BOOL GRPFILE_ReadFileToBuffer(LPCSTR path, HLOCAL *phBuffer, { size += len; hNewBuffer = LocalReAlloc(hBuffer, size + MALLOCHUNK + 1, - LMEM_FIXED); + LMEM_MOVEABLE); if (!hNewBuffer) { LocalFree(hBuffer);

1 0

Akihiro Sagawa : ole32: Use LMEM_MOVEABLE when reallocating memory.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 884ead472b0333aabd8597b02d554b14bcd5bff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=884ead472b0333aabd8597b02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:37 2013 +0900 ole32: Use LMEM_MOVEABLE when reallocating memory. --- dlls/ole32/ifs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 2e70e44..8ec6bd8 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -78,7 +78,7 @@ static int SetSpyedBlockTableLength ( DWORD NewLength ) LPVOID *NewSpyedBlocks; if (!Malloc32.SpyedBlocks) NewSpyedBlocks = LocalAlloc(LMEM_ZEROINIT, NewLength * sizeof(PVOID)); - else NewSpyedBlocks = LocalReAlloc(Malloc32.SpyedBlocks, NewLength * sizeof(PVOID), LMEM_ZEROINIT); + else NewSpyedBlocks = LocalReAlloc(Malloc32.SpyedBlocks, NewLength * sizeof(PVOID), LMEM_ZEROINIT | LMEM_MOVEABLE); if (NewSpyedBlocks) { Malloc32.SpyedBlocks = NewSpyedBlocks; Malloc32.SpyedBlockTableLength = NewLength;

1 0

Akihiro Sagawa : kernel32: Add more GlobalReAlloc/LocalReAlloc tests.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 1451aa58a61580e59aea6a44854be9d00e574145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1451aa58a61580e59aea6a448… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 1 22:01:35 2013 +0900 kernel32: Add more GlobalReAlloc/LocalReAlloc tests. --- dlls/kernel32/tests/heap.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 634e14d..866abb8 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -86,6 +86,7 @@ static void test_heap(void) HGLOBAL gbl; HGLOBAL hsecond; SIZE_T size, size2; + const SIZE_T max_size = 1024, init_size = 10; /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -245,6 +246,36 @@ static void test_heap(void) "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } + /* GMEM_FIXED block expands in place only without flags */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = GlobalAlloc(GMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = GlobalReAlloc(gbl, size + init_size, 0); + if (hsecond != gbl) { + todo_wine + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + GlobalFree(hsecond); + } + else { + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + GlobalFree(gbl); + } + } + + /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = GlobalAlloc(GMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = GlobalReAlloc(gbl, size + init_size, GMEM_MOVEABLE); + ok(hsecond != NULL, + "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + mem = GlobalLock(hsecond); + ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + GlobalFree(hsecond); + } + gbl = GlobalAlloc(GMEM_DDESHARE, 100); res = GlobalUnlock(gbl); @@ -382,6 +413,36 @@ static void test_heap(void) "returned %d with %d (expected '0' with ERROR_INVALID_HANDLE)\n", res, GetLastError()); + /* LMEM_FIXED block expands in place only without flags */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = LocalAlloc(LMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = LocalReAlloc(gbl, size + init_size, 0); + if (hsecond != gbl) { + todo_wine + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + LocalFree(hsecond); + } + else { + ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + LocalFree(gbl); + } + } + + /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */ + for (size = 1; size <= max_size; size <<= 1) { + gbl = LocalAlloc(LMEM_FIXED, init_size); + SetLastError(MAGIC_DEAD); + hsecond = LocalReAlloc(gbl, size + init_size, LMEM_MOVEABLE); + ok(hsecond != NULL, + "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + mem = LocalLock(hsecond); + ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + LocalFree(hsecond); + } + /* trying to unlock pointer from LocalAlloc */ gbl = LocalAlloc(LMEM_FIXED, 100); SetLastError(0xdeadbeef);

1 0

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 June 2013