June 2011 - Wine-Commits - list.winehq.org

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10RasterizerState iface.
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: 54ac05a87146b278b8d93c658aae3ac1303f1a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ac05a87146b278b8d93c658… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 11:22:49 2011 +0200 d3d10core: COM cleanup for the ID3D10RasterizerState iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/state.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 6be41cf..32d485d 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -227,7 +227,7 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DE /* ID3D10RasterizerState */ struct d3d10_rasterizer_state { - const struct ID3D10RasterizerStateVtbl *vtbl; + ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9dae3aa..3523fe0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1026,7 +1026,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device } TRACE("Created rasterizer state %p.\n", object); - *rasterizer_state = (ID3D10RasterizerState *)object; + *rasterizer_state = &object->ID3D10RasterizerState_iface; return S_OK; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 6fc7f17..4e77b1d 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -256,6 +256,11 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) return S_OK; } +static inline struct d3d10_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_rasterizer_state, ID3D10RasterizerState_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10RasterizerState *iface, @@ -280,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface; + struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -290,7 +295,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface; + struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -361,7 +366,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) { - state->vtbl = &d3d10_rasterizer_state_vtbl; + state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; return S_OK;

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in status tests.
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: 6ed2208e726f69bce1d0a8dfa9df1e33a010882e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed2208e726f69bce1d0a8dfa… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Wed Jun 1 15:50:26 2011 +0200 comctl32/tests: Removed sign comparison warning in status tests. --- dlls/comctl32/tests/status.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 8509674..0eaae59 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -40,8 +40,8 @@ static WNDPROC g_status_wndproc; static RECT g_rcCreated; static HWND g_hMainWnd; static int g_wmsize_count = 0; -static DWORD g_ysize; -static DWORD g_dpisize; +static INT g_ysize; +static INT g_dpisize; static int g_wmdrawitm_ctr; static WNDPROC g_wndproc_saved; @@ -120,7 +120,7 @@ static int CALLBACK check_height_font_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTMET static const int sizes[] = { 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 20, 22, 28, 36, 48, 72}; DWORD i; - DWORD y; + INT y; LPSTR facename = (CHAR *)enumlf->elfFullName; /* on win9x, enumlf->elfFullName is only valid for truetype fonts */ @@ -260,6 +260,7 @@ static void test_status_control(void) HICON hIcon; char ch; char chstr[10] = "Inval id"; + COLORREF crColor = RGB(0,0,0); hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0); @@ -343,14 +344,14 @@ static void test_status_control(void) } /* Set background color */ - r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0)); - ok(r == CLR_DEFAULT || - broken(r == 0), /* win95 */ - "Expected %d, got %d\n", CLR_DEFAULT, r); - r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT); - ok(r == RGB(255,0,0) || - broken(r == 0), /* win95 */ - "Expected %d, got %d\n", RGB(255,0,0), r); + crColor = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0)); + ok(crColor == CLR_DEFAULT || + broken(crColor == RGB(0,0,0)), /* win95 */ + "Expected 0x%.8x, got 0x%.8x\n", CLR_DEFAULT, crColor); + crColor = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT); + ok(crColor == RGB(255,0,0) || + broken(crColor == RGB(0,0,0)), /* win95 */ + "Expected 0x%.8x, got 0x%.8x\n", RGB(255,0,0), crColor); /* Add an icon to the status bar */ hIcon = LoadIcon(NULL, IDI_QUESTION);

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10DepthStencilState iface.
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: 815470e68b7a1fe75291a69b79297f59e046ff6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=815470e68b7a1fe75291a69b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 11:21:30 2011 +0200 d3d10core: COM cleanup for the ID3D10DepthStencilState iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/state.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index d3be62b..6be41cf 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -218,7 +218,7 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ struct d3d10_depthstencil_state { - const struct ID3D10DepthStencilStateVtbl *vtbl; + ID3D10DepthStencilState ID3D10DepthStencilState_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bec59ce..9dae3aa 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -997,7 +997,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi } TRACE("Created depthstencil state %p.\n", object); - *depth_stencil_state = (ID3D10DepthStencilState *)object; + *depth_stencil_state = &object->ID3D10DepthStencilState_iface; return S_OK; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 5051f11..6fc7f17 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -140,6 +140,11 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) return S_OK; } +static inline struct d3d10_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_depthstencil_state, ID3D10DepthStencilState_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10DepthStencilState *iface, @@ -164,7 +169,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10D static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStencilState *iface) { - struct d3d10_depthstencil_state *This = (struct d3d10_depthstencil_state *)iface; + struct d3d10_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -174,7 +179,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStenci static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStencilState *iface) { - struct d3d10_depthstencil_state *This = (struct d3d10_depthstencil_state *)iface; + struct d3d10_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -245,7 +250,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) { - state->vtbl = &d3d10_depthstencil_state_vtbl; + state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; state->refcount = 1; return S_OK;

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10EffectType iface.
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: e6b29add014be21d1132376cc7a6d31183a13d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b29add014be21d1132376cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 11:19:38 2011 +0200 d3d10: COM cleanup for the ID3D10EffectType iface. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 61 ++++++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 20871ae..5cf1a24 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -93,7 +93,7 @@ struct d3d10_effect_shader_variable /* ID3D10EffectType */ struct d3d10_effect_type { - const struct ID3D10EffectTypeVtbl *vtbl; + ID3D10EffectType ID3D10EffectType_iface; char *name; D3D10_SHADER_VARIABLE_TYPE basetype; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a51d6c3..81384af 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -60,7 +60,7 @@ static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl}; static struct d3d10_effect_pass null_pass = {&d3d10_effect_pass_vtbl}; -static struct d3d10_effect_type null_type = {&d3d10_effect_type_vtbl}; +static struct d3d10_effect_type null_type = {{&d3d10_effect_type_vtbl}}; static struct d3d10_effect_variable null_local_buffer = {(const ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, &null_local_buffer, &null_type}; static struct d3d10_effect_variable null_variable = {&d3d10_effect_variable_vtbl, @@ -95,12 +95,12 @@ static char anonymous_name[] = "$Anonymous"; static char anonymous_vertexshader_name[] = "vertexshader"; static char anonymous_pixelshader_name[] = "pixelshader"; static char anonymous_geometryshader_name[] = "geometryshader"; -static struct d3d10_effect_type anonymous_vs_type = {&d3d10_effect_type_vtbl, anonymous_vertexshader_name, - D3D10_SVT_VERTEXSHADER, D3D10_SVC_OBJECT}; -static struct d3d10_effect_type anonymous_ps_type = {&d3d10_effect_type_vtbl, anonymous_pixelshader_name, - D3D10_SVT_PIXELSHADER, D3D10_SVC_OBJECT}; -static struct d3d10_effect_type anonymous_gs_type = {&d3d10_effect_type_vtbl, anonymous_geometryshader_name, - D3D10_SVT_GEOMETRYSHADER, D3D10_SVC_OBJECT}; +static struct d3d10_effect_type anonymous_vs_type = {{&d3d10_effect_type_vtbl}, + anonymous_vertexshader_name, D3D10_SVT_VERTEXSHADER, D3D10_SVC_OBJECT}; +static struct d3d10_effect_type anonymous_ps_type = {{&d3d10_effect_type_vtbl}, + anonymous_pixelshader_name, D3D10_SVT_PIXELSHADER, D3D10_SVC_OBJECT}; +static struct d3d10_effect_type anonymous_gs_type = {{&d3d10_effect_type_vtbl}, + anonymous_geometryshader_name, D3D10_SVT_GEOMETRYSHADER, D3D10_SVC_OBJECT}; static struct d3d10_effect_variable anonymous_vs = {(const ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl, &null_local_buffer, &anonymous_vs_type, &null_shader_variable, anonymous_name}; static struct d3d10_effect_variable anonymous_ps = {(const ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl, @@ -524,7 +524,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con } /* create a copy of the original type with some minor changes */ - t->elementtype->vtbl = &d3d10_effect_type_vtbl; + t->elementtype->ID3D10EffectType_iface.lpVtbl = &d3d10_effect_type_vtbl; t->elementtype->effect = t->effect; if (!copy_name(t->name, &t->elementtype->name)) @@ -591,7 +591,7 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, cons return NULL; } - type->vtbl = &d3d10_effect_type_vtbl; + type->ID3D10EffectType_iface.lpVtbl = &d3d10_effect_type_vtbl; type->id = offset; type->effect = effect; hr = parse_fx10_type(type, data + offset, data); @@ -867,7 +867,7 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ t->type_class = D3D10_SVC_OBJECT; - t->vtbl = &d3d10_effect_type_vtbl; + t->ID3D10EffectType_iface.lpVtbl = &d3d10_effect_type_vtbl; v->type = t; v->effect = e; @@ -1315,7 +1315,7 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch ERR("Failed to allocate local buffer type memory.\n"); return E_OUTOFMEMORY; } - l->type->vtbl = &d3d10_effect_type_vtbl; + l->type->ID3D10EffectType_iface.lpVtbl = &d3d10_effect_type_vtbl; l->type->type_class = D3D10_SVC_OBJECT; l->type->effect = l->effect; @@ -2673,7 +2673,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_variable_GetType TRACE("iface %p\n", iface); - return (ID3D10EffectType *)This->type; + return &This->type->ID3D10EffectType_iface; } static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVariable *iface, @@ -6187,16 +6187,23 @@ static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variabl /* ID3D10EffectType methods */ +static inline struct d3d10_effect_type *impl_from_ID3D10EffectType(ID3D10EffectType *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_type, ID3D10EffectType_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_type_IsValid(ID3D10EffectType *iface) { + struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface); + TRACE("iface %p\n", iface); - return (struct d3d10_effect_type *)iface != &null_type; + return This != &null_type; } static HRESULT STDMETHODCALLTYPE d3d10_effect_type_GetDesc(ID3D10EffectType *iface, D3D10_EFFECT_TYPE_DESC *desc) { - struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -6229,7 +6236,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_type_GetDesc(ID3D10EffectType *ifa static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeByIndex(ID3D10EffectType *iface, UINT index) { - struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface); struct d3d10_effect_type *t; TRACE("iface %p, index %u\n", iface, index); @@ -6237,20 +6244,20 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy if (index >= This->member_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectType *)&null_type; + return &null_type.ID3D10EffectType_iface; } t = (&This->members[index])->type; TRACE("Returning member %p, %s\n", t, debugstr_a(t->name)); - return (ID3D10EffectType *)t; + return &t->ID3D10EffectType_iface; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeByName(ID3D10EffectType *iface, LPCSTR name) { - struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface); unsigned int i; TRACE("iface %p, name %s\n", iface, debugstr_a(name)); @@ -6258,7 +6265,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy if (!name) { WARN("Invalid name specified\n"); - return (ID3D10EffectType *)&null_type; + return &null_type.ID3D10EffectType_iface; } for (i = 0; i < This->member_count; ++i) @@ -6270,20 +6277,20 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy if (!strcmp(typem->name, name)) { TRACE("Returning type %p.\n", typem->type); - return (ID3D10EffectType *)typem->type; + return &typem->type->ID3D10EffectType_iface; } } } WARN("Invalid name specified\n"); - return (ID3D10EffectType *)&null_type; + return &null_type.ID3D10EffectType_iface; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeBySemantic(ID3D10EffectType *iface, LPCSTR semantic) { - struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface); unsigned int i; TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); @@ -6291,7 +6298,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy if (!semantic) { WARN("Invalid semantic specified\n"); - return (ID3D10EffectType *)&null_type; + return &null_type.ID3D10EffectType_iface; } for (i = 0; i < This->member_count; ++i) @@ -6303,19 +6310,19 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy if (!strcmp(typem->semantic, semantic)) { TRACE("Returning type %p.\n", typem->type); - return (ID3D10EffectType *)typem->type; + return &typem->type->ID3D10EffectType_iface; } } } WARN("Invalid semantic specified\n"); - return (ID3D10EffectType *)&null_type; + return &null_type.ID3D10EffectType_iface; } static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType *iface, UINT index) { - struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface); struct d3d10_effect_type_member *typem; TRACE("iface %p, index %u\n", iface, index); @@ -6335,7 +6342,7 @@ static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberSemantic(ID3D10EffectType *iface, UINT index) { - struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface); struct d3d10_effect_type_member *typem; TRACE("iface %p, index %u\n", iface, index);

1 0

Frédéric Delanoy : taskmgr: No need for translatable string for IDC_MEM_USAGE_HISTORY_GRAPH pushbutton .
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: 0198b3d01ee801c51a5deb0e1738d8a4c5b1c566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0198b3d01ee801c51a5deb0e1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 2 11:31:32 2011 +0200 taskmgr: No need for translatable string for IDC_MEM_USAGE_HISTORY_GRAPH pushbutton. --- programs/taskmgr/En.rc | 2 +- programs/taskmgr/Pl.rc | 2 +- programs/taskmgr/Pt.rc | 2 +- programs/taskmgr/Zh.rc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 08617cc..564f7c4 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -115,7 +115,7 @@ BEGIN WS_EX_CLIENTEDGE PUSHBUTTON "",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,0,WS_EX_CLIENTEDGE - PUSHBUTTON "MEM Usage History",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,0,WS_EX_CLIENTEDGE END diff --git a/programs/taskmgr/Pl.rc b/programs/taskmgr/Pl.rc index fc735c7..caf68ca 100644 --- a/programs/taskmgr/Pl.rc +++ b/programs/taskmgr/Pl.rc @@ -117,7 +117,7 @@ BEGIN WS_EX_CLIENTEDGE PUSHBUTTON "",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,0,WS_EX_CLIENTEDGE - PUSHBUTTON "Historia u�ycia pami�ci",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,0,WS_EX_CLIENTEDGE END diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc index dd6f864..47fb386 100644 --- a/programs/taskmgr/Pt.rc +++ b/programs/taskmgr/Pt.rc @@ -198,7 +198,7 @@ BEGIN WS_EX_CLIENTEDGE PUSHBUTTON "CPU Usage History",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,0,WS_EX_CLIENTEDGE - PUSHBUTTON "MEM Usage History",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,0,WS_EX_CLIENTEDGE END diff --git a/programs/taskmgr/Zh.rc b/programs/taskmgr/Zh.rc index ba2723b..b11837c 100644 --- a/programs/taskmgr/Zh.rc +++ b/programs/taskmgr/Zh.rc @@ -364,7 +364,7 @@ BEGIN WS_EX_CLIENTEDGE PUSHBUTTON "CPU 用量歷史",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,0,WS_EX_CLIENTEDGE - PUSHBUTTON "內存用量歷史",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,0,WS_EX_CLIENTEDGE END

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10Query iface.
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: 2f76274df98ca84b75f7cfdabbb67b084184c929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f76274df98ca84b75f7cfdab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 11:24:44 2011 +0200 d3d10core: COM cleanup for the ID3D10Query iface. --- dlls/d3d10core/async.c | 11 ++++++++--- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 4efde85..3f869a5 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +static inline struct d3d10_query *impl_from_ID3D10Query(ID3D10Query *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) { - struct d3d10_query *This = (struct d3d10_query *)iface; + struct d3d10_query *This = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) { - struct d3d10_query *This = (struct d3d10_query *)iface; + struct d3d10_query *This = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -159,7 +164,7 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = HRESULT d3d10_query_init(struct d3d10_query *query) { - query->vtbl = &d3d10_query_vtbl; + query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; return S_OK; diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 9811315..23c8823 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -245,7 +245,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HID /* ID3D10Query */ struct d3d10_query { - const struct ID3D10QueryVtbl *vtbl; + ID3D10Query ID3D10Query_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 6af93ae..d4e3d1c 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1084,7 +1084,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, } TRACE("Created query %p.\n", object); - *query = (ID3D10Query *)object; + *query = &object->ID3D10Query_iface; return S_OK; }

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10SamplerState iface .
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: db9823e02aebd829b9a98fafb84df4007719dac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9823e02aebd829b9a98fafb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 11:23:54 2011 +0200 d3d10core: COM cleanup for the ID3D10SamplerState iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/state.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 32d485d..9811315 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -236,7 +236,7 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSP /* ID3D10SamplerState */ struct d3d10_sampler_state { - const struct ID3D10SamplerStateVtbl *vtbl; + ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3523fe0..6af93ae 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1055,7 +1055,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i } TRACE("Created sampler state %p.\n", object); - *sampler_state = (ID3D10SamplerState *)object; + *sampler_state = &object->ID3D10SamplerState_iface; return S_OK; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 4e77b1d..edb2030 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -372,6 +372,11 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) return S_OK; } +static inline struct d3d10_sampler_state *impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_sampler_state, ID3D10SamplerState_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_QueryInterface(ID3D10SamplerState *iface, @@ -396,7 +401,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_QueryInterface(ID3D10Sample static ULONG STDMETHODCALLTYPE d3d10_sampler_state_AddRef(ID3D10SamplerState *iface) { - struct d3d10_sampler_state *This = (struct d3d10_sampler_state *)iface; + struct d3d10_sampler_state *This = impl_from_ID3D10SamplerState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -406,7 +411,7 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_AddRef(ID3D10SamplerState *if static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *iface) { - struct d3d10_sampler_state *This = (struct d3d10_sampler_state *)iface; + struct d3d10_sampler_state *This = impl_from_ID3D10SamplerState(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -477,7 +482,7 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) { - state->vtbl = &d3d10_sampler_state_vtbl; + state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; return S_OK;

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in toolbar tests.
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: cf6dae563cb1a2a259bf77199a73c8a1d50ea9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6dae563cb1a2a259bf77199… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Wed Jun 1 13:51:10 2011 +0200 comctl32/tests: Removed sign comparison warning in toolbar tests. --- dlls/comctl32/tests/toolbar.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 6be6769..50c4091 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -64,7 +64,7 @@ static const struct message ttgetdispinfo_parent_seq[] = { #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp)); #define check_button_size(handle, width, height, ...) {\ - DWORD bsize = SendMessageA(handle, TB_GETBUTTONSIZE, 0, 0);\ + LRESULT bsize = SendMessageA(handle, TB_GETBUTTONSIZE, 0, 0);\ ok(bsize == MAKELONG(width, height), "Unexpected button size - got size (%d, %d), expected (%d, %d)\n", LOWORD(bsize), HIWORD(bsize), width, height);\ } @@ -1000,7 +1000,7 @@ static tbsize_alt_result_t tbsize_alt_results[] = { 20, 2, { 107, 2, 207, 102 } } }; -static int tbsize_alt_numtests = 0; +static DWORD tbsize_alt_numtests = 0; #define check_sizes_todo(todomask) { \ RECT rc; \ @@ -1529,7 +1529,7 @@ static void test_setrows(void) { TBBUTTON buttons[9]; HWND hToolbar; - int i; + DWORD i; for (i=0; i<9; i++) MakeButton(buttons+i, 1000+i, TBSTYLE_FLAT | TBSTYLE_CHECKGROUP, 0);

1 0

Alexandre Julliard : msvcrt: Comment out exports with a non-standard comment to prevent make_specfiles from trying to update them .
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: 6143403e910113ea43beb2915764b57bb501ca79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6143403e910113ea43beb2915… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 2 10:44:19 2011 +0200 msvcrt: Comment out exports with a non-standard comment to prevent make_specfiles from trying to update them. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ecdb758..537c5ca 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -384,7 +384,7 @@ @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv -# extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size @ cdecl __clean_type_info_names_internal(ptr) msvcr90.__clean_type_info_names_internal @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcrt.__control87_2 @ stub __create_locale @@ -459,7 +459,7 @@ @ cdecl __p__wenviron() msvcrt.__p__wenviron @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pctype_func() msvcrt.__pctype_func -# extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size +### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ stub __report_gsfailure diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 59dd2f5..d9b451e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -195,7 +195,7 @@ @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv -# extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size @ cdecl __clean_type_info_names_internal(ptr) msvcr90.__clean_type_info_names_internal @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcrt.__control87_2 @ stub __create_locale @@ -283,7 +283,7 @@ @ cdecl __p__winver() msvcrt.__p__winver @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pctype_func() msvcrt.__pctype_func -# extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size +### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ stub __report_gsfailure diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 842dd25..f2b3770 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -192,7 +192,7 @@ @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv -# extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcrt.__control87_2 @ stub __create_locale @@ -275,7 +275,7 @@ @ cdecl __p__wenviron() msvcrt.__p__wenviron @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pctype_func() msvcrt.__pctype_func -# extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size +### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ stub __report_gsfailure

1 0

Piotr Pawłow : wined3d: Set container of swapchain surfaces to WINED3D_CONTAINER_NONE in swapchain_init () error path.
by Alexandre Julliard June 2, 2011

June 2, 2011

Module: wine Branch: master Commit: bc9407a4524c043f654842b3890df4ee51c014c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9407a4524c043f654842b38… Author: Piotr Pawłow <pp(a)siedziba.pl> Date: Wed Jun 1 01:38:24 2011 +0200 wined3d: Set container of swapchain surfaces to WINED3D_CONTAINER_NONE in swapchain_init() error path. --- dlls/wined3d/swapchain.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0b32eca..324a164 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1072,7 +1072,10 @@ err: for (i = 0; i < swapchain->presentParms.BackBufferCount; ++i) { if (swapchain->back_buffers[i]) + { + surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_NONE, NULL); wined3d_surface_decref(swapchain->back_buffers[i]); + } } HeapFree(GetProcessHeap(), 0, swapchain->back_buffers); } @@ -1089,7 +1092,10 @@ err: } if (swapchain->front_buffer) + { + surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); wined3d_surface_decref(swapchain->front_buffer); + } return hr; }

1 0