August 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Do not convert range_rect.X twice.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 7a1ccd8abe04a2eeb27f9215ff910a6e45688d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1ccd8abe04a2eeb27f9215f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 15:42:47 2012 +0900 gdiplus: Do not convert range_rect.X twice. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5e76927..0056a2f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4909,7 +4909,7 @@ static GpStatus measure_ranges_callback(HDC hdc, GetTextExtentExPointW(hdc, string + index, range_end - index, INT_MAX, NULL, NULL, &range_size); - range_rect.Width = (bounds->X + range_size.cx - range_rect.X) / args->rel_width; + range_rect.Width = (bounds->X + range_size.cx) / args->rel_width - range_rect.X; stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion); if (stat != Ok)

1 0

Dmitry Timoshkov : gdiplus: Make GdipMeasureCharacterRanges use common font transformation code.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 4e2959ab9b87cfeaec232f3b7aecc04e6cd3d0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2959ab9b87cfeaec232f3b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 15:43:45 2012 +0900 gdiplus: Make GdipMeasureCharacterRanges use common font transformation code. --- dlls/gdiplus/graphics.c | 10 +++++----- dlls/gdiplus/tests/graphics.c | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0056a2f..a0c130e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4927,8 +4927,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, { GpStatus stat; int i; - LOGFONTW lfw; - HFONT oldfont; + HFONT gdifont, oldfont; struct measure_ranges_args args; HDC hdc, temp_hdc=NULL; GpPointF pt[3]; @@ -4971,8 +4970,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; - get_log_fontW(font, graphics, &lfw); - oldfont = SelectObject(hdc, CreateFontIndirectW(&lfw)); + get_font_hfont(graphics, font, &gdifont); + oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) { @@ -4986,7 +4985,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, measure_ranges_callback, &args); - DeleteObject(SelectObject(hdc, oldfont)); + SelectObject(hdc, oldfont); + DeleteObject(gdifont); if (temp_hdc) DeleteDC(temp_hdc); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 913d895..1cd847d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3828,9 +3828,13 @@ static void test_font_height_scaling(void) win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); continue; } + /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ + if (height < 1.0) expectf_(height, rect.Height, height / 15.0); + else todo_wine - expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 25.0); + expectf_(height, rect.Height, height / 15.0); + expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 15.0); } }

1 0

André Hentschel : winedbg: Add load word operators to Thumb2 disassembler.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 054d930bb74ade91054e52f1765dd41e3bc7f862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054d930bb74ade91054e52f17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 23 23:39:55 2012 +0200 winedbg: Add load word operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 2f1021e..26d4fbb 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -760,6 +760,56 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_ldrword(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 23) & 0x01; + WORD op2 = (inst >> 6) & 0x3f; + int offset; + + if (get_nibble(inst, 4) == 0x0f) + { + offset = inst & 0x0fff; + + if (!op1) offset *= -1; + offset += 3; + + dbg_printf("\n\tldr\t%s, ", tbl_regs[get_nibble(inst, 3)]); + db_printsym(addr->Offset + offset); + return 0; + } + + if (!op1 && !op2) + { + dbg_printf("\n\tldr\t%s, [%s, %s, LSL #%u]", tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], (inst >> 4) & 0x3); + return 0; + } + + if (!op1 && (op2 & 0x3c) == 0x38) + { + dbg_printf("\n\tldrt\t%s, [%s, #%u]", tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 4)], inst & 0xff); + return 0; + } + + dbg_printf("\n\tldr\t%s, [%s", tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)]); + + if (op1) + { + dbg_printf(", #%u]", inst & 0x0fff); + return 0; + } + + offset = inst & 0xff; + if (!(inst & 0x0200)) offset *= -1; + + if (!(inst & 0x0400) && (inst & 0x0100)) dbg_printf("], #%i", offset); + else if (inst & 0x0400) dbg_printf(", #%i]%s", offset, (inst & 0x0100)?"!":""); + else return inst; + + return 0; +} + static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) { WORD opc1 = (inst >> 21) & 0x07; @@ -842,8 +892,8 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000c0, 0xfb000000, thumb2_disasm_mul }, { 0xff8000f0, 0xfb800000, thumb2_disasm_longmuldiv }, { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, - { 0xef100010, 0xee100010, thumb2_disasm_coprocmov1 }, - { 0xef100010, 0xee000010, thumb2_disasm_coprocmov1 }, + { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, + { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0x00000000, 0x00000000, NULL } };

1 0

Michael Stefaniuc : dsound: Cleanup IKsPrivatePropertySetImpl_Create().
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 1555aebf1e54ada0123e8da9faa206176b5301ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1555aebf1e54ada0123e8da9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 24 01:47:14 2012 +0200 dsound: Cleanup IKsPrivatePropertySetImpl_Create(). --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/propset.c | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index f5199fd..9c550eb 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -724,7 +724,7 @@ static IClassFactoryImpl DSOUND_CF[] = { { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, DSOUND_CaptureCreate }, { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, DSOUND_CaptureCreate8 }, { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, DSOUND_FullDuplexCreate }, - { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, IKsPrivatePropertySetImpl_Create }, { { NULL }, NULL, NULL } }; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index f8e5ca6..0d2cf75 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -254,7 +254,7 @@ struct IDirectSoundCaptureBufferImpl int nrofnotifies; }; -HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, IKsPropertySet **piks) DECLSPEC_HIDDEN; +HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; /******************************************************************************* */ diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 242b237..eb4c195 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -619,23 +619,24 @@ static const IKsPropertySetVtbl ikspvt = { IKsPrivatePropertySetImpl_QuerySupport }; -HRESULT IKsPrivatePropertySetImpl_Create( - REFIID riid, - IKsPropertySet **piks) +HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) { IKsPrivatePropertySetImpl *iks; - TRACE("(%s, %p)\n", debugstr_guid(riid), piks); + HRESULT hr; + + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IKsPropertySet)) { - *piks = 0; - return E_NOINTERFACE; + iks = HeapAlloc(GetProcessHeap(), 0, sizeof(*iks)); + if (!iks) { + WARN("out of memory\n"); + return DSERR_OUTOFMEMORY; } - iks = HeapAlloc(GetProcessHeap(),0,sizeof(*iks)); iks->ref = 1; iks->IKsPropertySet_iface.lpVtbl = &ikspvt; - *piks = &iks->IKsPropertySet_iface; - return S_OK; + hr = IKsPropertySet_QueryInterface(&iks->IKsPropertySet_iface, riid, ppv); + IKsPropertySet_Release(&iks->IKsPropertySet_iface); + + return hr; }

1 0

Rico Schüller : d3dx9: Remove ctab_constant typedef.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 6676a729b4c7dd21aa1dbfd038a4e99b3c506aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6676a729b4c7dd21aa1dbfd03… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:27 2012 +0200 d3dx9: Remove ctab_constant typedef. --- dlls/d3dx9_36/shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e44e618..1cac23c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -616,10 +616,10 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, } -typedef struct ctab_constant { +struct ctab_constant { D3DXCONSTANT_DESC desc; struct ctab_constant *members; -} ctab_constant; +}; static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; @@ -629,7 +629,7 @@ struct ID3DXConstantTableImpl { char *ctab; DWORD size; D3DXCONSTANTTABLE_DESC desc; - ctab_constant *constants; + struct ctab_constant *constants; }; static void free_constant_table(struct ID3DXConstantTableImpl *table) @@ -662,7 +662,7 @@ static inline int is_constant_handle(D3DXHANDLE handle) return !((UINT_PTR)handle >> 16); } -static inline ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +static inline struct ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { return &table->constants[(UINT_PTR)handle - 1]; } @@ -763,7 +763,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable D3DXCONSTANT_DESC *desc, UINT *count) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - ctab_constant *constant_info; + struct ctab_constant *constant_info; TRACE("(%p)->(%p, %p, %p)\n", This, constant, desc, count); @@ -1416,7 +1416,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_SetMatrixTransposePointerArray }; -static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_constant *constant) +static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, struct ctab_constant *constant) { constant->desc.Class = type->Class; constant->desc.Type = type->Type;

1 0

Rico Schüller : d3dx9: Add a fixme for flags in D3DXGetShaderConstantTableEx().
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 096833152445451134d36c84cfa8298eda58af99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096833152445451134d36c84c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:36 2012 +0200 d3dx9: Add a fixme for flags in D3DXGetShaderConstantTableEx(). --- dlls/d3dx9_36/shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1cac23c..8459cd4 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1459,6 +1459,8 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, return D3DERR_INVALIDCALL; } + if (flags) FIXME("Flags (%#x) are not handled, yet!\n", flags); + hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); if (hr != D3D_OK) {

1 0

Rico Schüller : d3dx9: Don' t use an index as variable handle, it's not useable for subvariables.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 8f83681723f0c58c2a1b336f0a23c59c87017b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f83681723f0c58c2a1b336f0… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:46 2012 +0200 d3dx9: Don't use an index as variable handle, it's not useable for subvariables. --- dlls/d3dx9_36/shader.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8459cd4..02727fd 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -657,19 +657,29 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) return 4 * desc->Elements * desc->Rows * desc->Columns; } -static inline int is_constant_handle(D3DXHANDLE handle) +static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) { - return !((UINT_PTR)handle >> 16); + return (struct ctab_constant *)handle; } -static inline struct ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) { - return &table->constants[(UINT_PTR)handle - 1]; + return (D3DXHANDLE)constant; } -static inline D3DXHANDLE handle_from_constant_index(UINT index) +static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { - return (D3DXHANDLE)(DWORD_PTR)(index + 1); + struct ctab_constant *c = constant_from_handle(handle); + UINT i; + + if (!c) return NULL; + + for (i = 0; i < table->desc.Constants; ++i) + { + if (&table->constants[i] == c) return c; + } + + return NULL; } static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, @@ -771,14 +781,14 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable return D3DERR_INVALIDCALL; /* Applications can pass the name of the constant in place of the handle */ - if (!is_constant_handle(constant)) + if (!is_valid_constant(This, constant)) { constant = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); if (!constant) return D3DERR_INVALIDCALL; } - constant_info = constant_from_handle(This, constant); + constant_info = constant_from_handle(constant); if (desc) *desc = constant_info->desc; @@ -822,7 +832,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable * if (index >= This->desc.Constants) return NULL; - return handle_from_constant_index(index); + return handle_from_constant(&This->constants[index]); } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCSTR name) @@ -843,7 +853,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT for (i = 0; i < This->desc.Constants; i++) if (!strcmp(This->constants[i].desc.Name, name)) - return handle_from_constant_index(i); + return handle_from_constant(&This->constants[i]); return NULL; }

1 0

Rico Schüller : d3dx9: Parse structs and sub constants in ID3DXConstantTable.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: b565e8fb4fd33c614088ad21f001a913177c2534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b565e8fb4fd33c614088ad21f… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:50 2012 +0200 d3dx9: Parse structs and sub constants in ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 152 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 130 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 02727fd..69bb40e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -618,7 +618,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, struct ctab_constant { D3DXCONSTANT_DESC desc; - struct ctab_constant *members; + struct ctab_constant *constants; }; static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; @@ -632,9 +632,32 @@ struct ID3DXConstantTableImpl { struct ctab_constant *constants; }; +static void free_constant(struct ctab_constant *constant) +{ + if (constant->constants) + { + UINT i, count = constant->desc.Elements > 1 ? constant->desc.Elements : constant->desc.StructMembers; + + for (i = 0; i < count; ++i) + { + free_constant(&constant->constants[i]); + } + HeapFree(GetProcessHeap(), 0, constant->constants); + } +} + static void free_constant_table(struct ID3DXConstantTableImpl *table) { - HeapFree(GetProcessHeap(), 0, table->constants); + if (table->constants) + { + UINT i; + + for (i = 0; i < table->desc.Constants; ++i) + { + free_constant(&table->constants[i]); + } + HeapFree(GetProcessHeap(), 0, table->constants); + } HeapFree(GetProcessHeap(), 0, table->ctab); } @@ -1426,27 +1449,117 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_SetMatrixTransposePointerArray }; -static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, struct ctab_constant *constant) +static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, struct ctab_constant *constant, + BOOL is_element, WORD index, WORD max, DWORD *offset, DWORD nameoffset, UINT regset) { + const D3DXSHADER_TYPEINFO *type = (LPD3DXSHADER_TYPEINFO)(ctab + typeoffset); + const D3DXSHADER_STRUCTMEMBERINFO *memberinfo = NULL; + HRESULT hr = D3D_OK; + UINT i, count = 0; + WORD size = 0; + + constant->desc.DefaultValue = offset ? ctab + *offset : NULL; constant->desc.Class = type->Class; constant->desc.Type = type->Type; constant->desc.Rows = type->Rows; constant->desc.Columns = type->Columns; - constant->desc.Elements = type->Elements; + constant->desc.Elements = is_element ? 1 : type->Elements; constant->desc.StructMembers = type->StructMembers; - constant->desc.Bytes = calc_bytes(&constant->desc); + constant->desc.Name = ctab + nameoffset; + constant->desc.RegisterSet = regset; + constant->desc.RegisterIndex = index; - TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n", - constant->desc.Class, constant->desc.Type, constant->desc.Rows, - constant->desc.Columns, constant->desc.Elements, constant->desc.StructMembers); + TRACE("name %s, elements %u, index %u, defaultvalue %p\n", constant->desc.Name, + constant->desc.Elements, index, constant->desc.DefaultValue); + TRACE("class %d, type %d, rows %d, columns %d, elements %d, struct_members %d\n", + type->Class, type->Type, type->Rows, type->Columns, type->Elements, type->StructMembers); - if ((constant->desc.Class == D3DXPC_STRUCT) && constant->desc.StructMembers) + if (type->Elements > 1 && !is_element) + { + count = type->Elements; + } + else if ((type->Class == D3DXPC_STRUCT) && type->StructMembers) { - FIXME("Struct not supported yet\n"); - return E_NOTIMPL; + memberinfo = (D3DXSHADER_STRUCTMEMBERINFO*)(ctab + type->StructMemberInfo); + count = type->StructMembers; } + if (count) + { + WORD size_element = 0; + + constant->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*constant->constants) * count); + if (!constant->constants) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto error; + } + + for (i = 0; i < count; ++i) + { + hr = parse_ctab_constant_type(ctab, memberinfo ? memberinfo[i].TypeInfo : typeoffset, + &constant->constants[i], memberinfo == NULL, index + size, max, offset, + memberinfo ? memberinfo[i].Name : nameoffset, regset); + if (hr != D3D_OK) + goto error; + + if (i == 0) size_element = constant->constants[i].desc.RegisterCount; + size += size_element; + } + } + else + { + WORD offsetdiff = 0; + + switch (type->Class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + offsetdiff = 1; + size = 1; + break; + + case D3DXPC_MATRIX_ROWS: + size = is_element ? type->Rows : max(type->Rows, type->Columns); + offsetdiff = type->Rows; + break; + + case D3DXPC_MATRIX_COLUMNS: + size = type->Columns; + offsetdiff = type->Columns; + break; + + case D3DXPC_OBJECT: + size = 1; + break; + + default: + FIXME("Unhandled type class %u\n", type->Class); + break; + } + + /* offset in bytes => offsetdiff * components(4) * sizeof(DWORD) */ + if (offset) *offset += offsetdiff * 4 * 4; + } + + constant->desc.RegisterCount = max(0, min(max - index, size)); + constant->desc.Bytes = calc_bytes(&constant->desc); + return D3D_OK; + +error: + if (constant->constants) + { + for (i = 0; i < count; ++i) + { + free_constant(&constant->constants[i]); + } + HeapFree(GetProcessHeap(), 0, constant->constants); + constant->constants = NULL; + } + + return hr; } HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, @@ -1537,16 +1650,12 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, constant_info = (LPD3DXSHADER_CONSTANTINFO)(object->ctab + ctab_header->ConstantInfo); for (i = 0; i < ctab_header->Constants; i++) { - TRACE("name = %s\n", object->ctab + constant_info[i].Name); - object->constants[i].desc.Name = object->ctab + constant_info[i].Name; - object->constants[i].desc.RegisterSet = constant_info[i].RegisterSet; - object->constants[i].desc.RegisterIndex = constant_info[i].RegisterIndex; - object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; - object->constants[i].desc.DefaultValue = constant_info[i].DefaultValue - ? object->ctab + constant_info[i].DefaultValue : NULL; - - hr = parse_ctab_constant_type((LPD3DXSHADER_TYPEINFO)(object->ctab + constant_info[i].TypeInfo), - &object->constants[i]); + DWORD offset = constant_info[i].DefaultValue; + + hr = parse_ctab_constant_type(object->ctab, constant_info[i].TypeInfo, + &object->constants[i], FALSE, constant_info[i].RegisterIndex, + constant_info[i].RegisterIndex + constant_info[i].RegisterCount, + offset ? &offset : NULL, constant_info[i].Name, constant_info[i].RegisterSet); if (hr != D3D_OK) goto error; } @@ -1556,7 +1665,6 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, return D3D_OK; error: - free_constant_table(object); HeapFree(GetProcessHeap(), 0, object);

1 0

Rico Schüller : d3dx9: Improve is_valid_constant().
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 12788436430dcf5ba6a89f0505be16c016abf52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12788436430dcf5ba6a89f050… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:58 2012 +0200 d3dx9: Improve is_valid_constant(). --- dlls/d3dx9_36/shader.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 69bb40e..c761aef 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -690,6 +690,28 @@ static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) return (D3DXHANDLE)constant; } +static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, struct ctab_constant *constant) +{ + UINT i, count; + + /* all variable have at least elements = 1, but no elements */ + if (!parent->constants) return NULL; + + if (parent->desc.Elements > 1) count = parent->desc.Elements; + else count = parent->desc.StructMembers; + + for (i = 0; i < count; ++i) + { + if (&parent->constants[i] == constant) + return constant; + + if (is_valid_sub_constant(&parent->constants[i], constant)) + return constant; + } + + return NULL; +} + static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { struct ctab_constant *c = constant_from_handle(handle); @@ -699,7 +721,11 @@ static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableI for (i = 0; i < table->desc.Constants; ++i) { - if (&table->constants[i] == c) return c; + if (&table->constants[i] == c) + return c; + + if (is_valid_sub_constant(&table->constants[i], c)) + return c; } return NULL;

1 0

Roman Dadkov : oleaut32: Fix VectorFromBstr call in VARIANT_CoerceArray.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 79ba36aef8a72b5e627680d444f37bd266f94a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ba36aef8a72b5e627680d44… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Thu Aug 23 18:36:46 2012 +0400 oleaut32: Fix VectorFromBstr call in VARIANT_CoerceArray. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2045eab..8a77593 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -526,7 +526,7 @@ static inline HRESULT VARIANT_CoerceArray(VARIANTARG* pd, VARIANTARG* ps, VARTYP return BstrFromVector(V_ARRAY(ps), &V_BSTR(pd)); if (V_VT(ps) == VT_BSTR && vt == (VT_ARRAY|VT_UI1)) - return VectorFromBstr(V_BSTR(ps), &V_ARRAY(ps)); + return VectorFromBstr(V_BSTR(ps), &V_ARRAY(pd)); if (V_VT(ps) == vt) return SafeArrayCopy(V_ARRAY(ps), &V_ARRAY(pd));

1 0