July 2011 - Wine-commits - list.winehq.org

Austin English : dbghelp: Add stubs for SymEnumSourceLines/ SymEnumSourceLinesW.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 13d86cc0a3c92b622d405d630753413fe797d71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d86cc0a3c92b622d405d630… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 16 12:33:29 2011 -0500 dbghelp: Add stubs for SymEnumSourceLines/SymEnumSourceLinesW. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/source.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index ddb9d33..7678e53 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -46,8 +46,8 @@ @ stub SymEnumSourceFileTokens @ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) @ stdcall SymEnumSourceFilesW(ptr int64 wstr ptr ptr) -@ stub SymEnumSourceLines -@ stub SymEnumSourceLinesW +@ stdcall SymEnumSourceLines(ptr int64 str str long long ptr ptr) +@ stdcall SymEnumSourceLinesW(ptr int64 wstr wstr long long ptr ptr) @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr int64 str ptr ptr) @ stub SymEnumSymbolsForAddr diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 3bed023..693ba78 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -309,6 +309,38 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, } /****************************************************************** + * SymEnumSourceLines (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSourceLines(HANDLE hProcess, ULONG64 base, PCSTR obj, + PCSTR file, DWORD line, DWORD flags, + PSYM_ENUMLINES_CALLBACK EnumLinesCallback, + PVOID UserContext) +{ + FIXME("%p %s %s %s %u %u %p %p: stub!\n", + hProcess, wine_dbgstr_longlong(base), debugstr_a(obj), debugstr_a(file), + line, flags, EnumLinesCallback, UserContext); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/****************************************************************** + * SymEnumSourceLinesW(DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSourceLinesW(HANDLE hProcess, ULONG64 base, PCWSTR obj, + PCWSTR file, DWORD line, DWORD flags, + PSYM_ENUMLINES_CALLBACKW EnumLinesCallback, + PVOID UserContext) +{ + FIXME("%p %s %s %s %u %u %p %p: stub!\n", + hProcess, wine_dbgstr_longlong(base), debugstr_w(obj), debugstr_w(file), + line, flags, EnumLinesCallback, UserContext); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/****************************************************************** * SymGetSourceFileToken (DBGHELP.@) * */

1 0

Francois Gouget : wineoss.drv: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: a53e011021f776abdcec6d901498b80c2b6943b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53e011021f776abdcec6d901… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 17 10:15:09 2011 +0200 wineoss.drv: Add a trailing '\n' to a TRACE() call. --- dlls/wineoss.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 32e9354..ac684f7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -299,7 +299,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, else fd = open(ai.devnode, O_RDONLY, 0); if(fd < 0){ - WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)", + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", ai.devnode, errno, strerror(errno)); continue; }

1 0

Francois Gouget : winmm: Remove an unused variable in WINMM_GetComponentTypeLineInfo().
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 724b0a928cfd9a3f29952e07bf4224f4b3288e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=724b0a928cfd9a3f29952e07b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 17 10:17:41 2011 +0200 winmm: Remove an unused variable in WINMM_GetComponentTypeLineInfo(). --- dlls/winmm/waveform.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a207e67..48efb0f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3807,10 +3807,6 @@ static UINT WINMM_GetComponentTypeLineInfo(WINMM_MMDevice *mmdevice, static UINT WINMM_GetLineIDLineInfo(WINMM_MMDevice *mmdevice, UINT mmdev_index, MIXERLINEW *info, DWORD flags) { - BOOL is_out = TRUE; - if(mmdevice->in_caps.szPname[0] != '\0') - is_out = FALSE; - if(info->dwLineID == 0xFFFF0000){ info->dwDestination = 0; return WINMM_GetDestinationLineInfo(mmdevice, mmdev_index, info, flags);

1 0

Francois Gouget : winex11.drv: Make copy_image_bits() static.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 3726670098be736de65ad934959c375a05fd5c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3726670098be736de65ad9349… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 17 10:18:00 2011 +0200 winex11.drv: Make copy_image_bits() static. --- dlls/winex11.drv/bitblt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 53f5c63..7a36b8b 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1640,7 +1640,7 @@ static void set_color_info( const ColorShifts *color_shifts, BITMAPINFO *info ) } /* copy the image bits, fixing up alignment and byte swapping as necessary */ - DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, +static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, unsigned int zeropad_mask ) {

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to an ERR() call.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: e0711b195df4373bca20a799348ddf16f9543950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0711b195df4373bca20a7993… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 17 10:18:04 2011 +0200 d3dx9_36: Add a trailing '\n' to an ERR() call. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 717c356..94a291f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -534,7 +534,7 @@ static HRESULT WINAPI ID3DXMeshImpl_ConvertAdjacencyToPointReps(ID3DXMesh *iface /* Should never happen as CreateMesh does not allow meshes with 0 faces */ if (This->numfaces == 0) { - ERR("Number of faces was zero."); + ERR("Number of faces was zero.\n"); hr = D3DERR_INVALIDCALL; goto cleanup; }

1 0

Alexandre Julliard : gdi32: Use the original StretchBlt rectangle if a DC doesn' t have a visible region.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: a64a549b4c644d9dd0a5227419ec246cfceb45a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64a549b4c644d9dd0a522741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 20:15:25 2011 +0200 gdi32: Use the original StretchBlt rectangle if a DC doesn't have a visible region. --- dlls/gdi32/bitblt.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a99efc7..da22507 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -89,8 +89,10 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } - get_clip_box( dc_dst, &clip ); - intersect_rect( &dst->visrect, &rect, &clip ); + if (get_clip_box( dc_dst, &clip )) + intersect_rect( &dst->visrect, &rect, &clip ); + else + dst->visrect = rect; /* get the source visible rectangle */

1 0

Alexandre Julliard : winex11: Don' t access the source rectangle in PutImage until needed.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 55bc21938f5109c8bec7e59acbdcfb55b6fb4748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55bc21938f5109c8bec7e59ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 19:57:31 2011 +0200 winex11: Don't access the source rectangle in PutImage until needed. --- dlls/winex11.drv/bitblt.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 880d71f..73ab7e8 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1802,8 +1802,6 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str struct gdi_image_bits dst_bits; const XPixmapFormatValues *format; const ColorShifts *color_shifts; - int width = rect->right - rect->left; - int height = rect->bottom - rect->top; if (hbitmap) { @@ -1866,6 +1864,9 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str if (!ret) { + int width = rect->right - rect->left; + int height = rect->bottom - rect->top; + image->data = dst_bits.ptr; if (bitmap) {

1 0

Alexandre Julliard : winex11: Avoid overflowing the source rectangle in StretchBlt.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 1e2e45ce665700e74f905da1432fb61014d58289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2e45ce665700e74f905da14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 16:22:57 2011 +0200 winex11: Avoid overflowing the source rectangle in StretchBlt. --- dlls/winex11.drv/bitblt.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 9ecdbc9..53f5c63 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -804,9 +804,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, /* Retrieve a source row */ BITBLT_GetRow( srcImage, rowSrc, (ysrc >> 16) - visRectSrc->top, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, - visRectSrc->right - visRectSrc->left, + visRectSrc->left, visRectSrc->right - visRectSrc->left, dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ @@ -814,9 +812,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, BITBLT_StretchRow( rowSrc, rowDst, visRectDst->left, visRectDst->right - visRectDst->left, xinc, xoff, mode ); - else BITBLT_ShrinkRow( rowSrc, rowDst, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, + else BITBLT_ShrinkRow( rowSrc, rowDst, visRectSrc->left, visRectSrc->right - visRectSrc->left, xinc, xoff, mode ); @@ -863,9 +859,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, /* Retrieve a source row */ BITBLT_GetRow( srcImage, rowSrc, ysrc - visRectSrc->top, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, - visRectSrc->right - visRectSrc->left, + visRectSrc->left, visRectSrc->right - visRectSrc->left, dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ @@ -873,9 +867,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, BITBLT_StretchRow( rowSrc, rowDst, visRectDst->left, visRectDst->right - visRectDst->left, xinc, xoff, mode ); - else BITBLT_ShrinkRow( rowSrc, rowDst, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, + else BITBLT_ShrinkRow( rowSrc, rowDst, visRectSrc->left, visRectSrc->right - visRectSrc->left, xinc, xoff, mode ); @@ -1474,6 +1466,7 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, GC tmpGC; if (IsRectEmpty( &dst->visrect )) return TRUE; + if (IsRectEmpty( &src->visrect )) return TRUE; fStretch = (src->width != dst->width) || (src->height != dst->height);

1 0

Alexandre Julliard : winex11: Simplify a couple of BitBlt operation codes.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 5ce421efbde9f482a4e2634db63467d4b7bfc7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce421efbde9f482a4e2634db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 11:38:20 2011 +0200 winex11: Simplify a couple of BitBlt operation codes. --- dlls/winex11.drv/bitblt.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 73ab7e8..9ecdbc9 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -79,20 +79,20 @@ static const unsigned char BITBLT_Opcodes[256][MAX_OP_LEN] = { OP(PAT,DST,GXand), OP(SRC,DST,GXnor) }, /* 0x13 ~(S|(D&P)) */ { OP(PAT,SRC,GXequiv), OP(SRC,DST,GXnor) }, /* 0x14 ~(D|~(P^S)) */ { OP(PAT,SRC,GXand), OP(SRC,DST,GXnor) }, /* 0x15 ~(D|(P&S)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXnand), - OP(TMP,DST,GXand), OP(SRC,DST,GXxor), + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXnand), + OP(SRC,DST,GXand), OP(TMP,DST,GXxor), OP(PAT,DST,GXxor) }, /* 0x16 P^S^(D&~(P&S) */ { OP(SRC,TMP,GXcopy), OP(SRC,DST,GXxor), OP(PAT,SRC,GXxor), OP(SRC,DST,GXand), OP(TMP,DST,GXequiv) }, /* 0x17 ~S^((S^P)&(S^D))*/ { OP(PAT,SRC,GXxor), OP(PAT,DST,GXxor), OP(SRC,DST,GXand) }, /* 0x18 (S^P)&(D^P) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXnand), - OP(TMP,DST,GXand), OP(SRC,DST,GXequiv) }, /* 0x19 ~S^(D&~(P&S)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXnand), + OP(SRC,DST,GXand), OP(TMP,DST,GXequiv) }, /* 0x19 ~S^(D&~(P&S)) */ { OP(PAT,SRC,GXand), OP(SRC,DST,GXor), OP(PAT,DST,GXxor) }, /* 0x1a P^(D|(S&P)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXxor), - OP(TMP,DST,GXand), OP(SRC,DST,GXequiv) }, /* 0x1b ~S^(D&(P^S)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXxor), + OP(SRC,DST,GXand), OP(TMP,DST,GXequiv) }, /* 0x1b ~S^(D&(P^S)) */ { OP(PAT,DST,GXand), OP(SRC,DST,GXor), OP(PAT,DST,GXxor) }, /* 0x1c P^(S|(D&P)) */ { OP(DST,TMP,GXcopy), OP(PAT,DST,GXxor), @@ -107,13 +107,13 @@ static const unsigned char BITBLT_Opcodes[256][MAX_OP_LEN] = OP(SRC,DST,GXand) }, /* 0x24 (S^P)&(S^D) */ { OP(PAT,SRC,GXnand), OP(SRC,DST,GXand), OP(PAT,DST,GXequiv) }, /* 0x25 ~P^(D&~(S&P)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXand), - OP(TMP,DST,GXor), OP(SRC,DST,GXxor) }, /* 0x26 S^(D|(S&P)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXequiv), - OP(TMP,DST,GXor), OP(SRC,DST,GXxor) }, /* 0x27 S^(D|~(P^S)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXand), + OP(SRC,DST,GXor), OP(TMP,DST,GXxor) }, /* 0x26 S^(D|(S&P)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXequiv), + OP(SRC,DST,GXor), OP(TMP,DST,GXxor) }, /* 0x27 S^(D|~(P^S)) */ { OP(PAT,SRC,GXxor), OP(SRC,DST,GXand) }, /* 0x28 D&(P^S) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXand), - OP(TMP,DST,GXor), OP(SRC,DST,GXxor), + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXand), + OP(SRC,DST,GXor), OP(TMP,DST,GXxor), OP(PAT,DST,GXequiv) }, /* 0x29 ~P^S^(D|(P&S)) */ { OP(PAT,SRC,GXnand), OP(SRC,DST,GXand) }, /* 0x2a D&~(P&S) */ { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXxor), @@ -528,7 +528,7 @@ static int do_bitop( int s, int d, int rop ) int main() { int rop, i, res, src, dst, pat, tmp, dstUsed; - const BYTE *opcode; + const unsigned char *opcode; for (rop = 0; rop < 256; rop++) { @@ -555,9 +555,6 @@ int main() dst = do_bitop( src, dst, *opcode & 0xf ); dstUsed = 1; break; - case OP_ARGS(PAT,TMP): - tmp = do_bitop( pat, tmp, *opcode & 0xf ); - break; case OP_ARGS(PAT,DST): dst = do_bitop( pat, dst, *opcode & 0xf ); dstUsed = 1; @@ -1389,11 +1386,6 @@ static void execute_rop( X11DRV_PDEVICE *physdev, Pixmap src_pixmap, GC gc, XCopyArea( gdi_display, pixmaps[OP_SRC(*opcode)], pixmaps[OP_DST(*opcode)], gc, 0, 0, width, height, 0, 0 ); break; - - case OP_ARGS(PAT,TMP): - if (!pixmaps[TMP] && !null_brush) - pixmaps[TMP] = XCreatePixmap( gdi_display, root_window, width, height, physdev->depth ); - /* fall through */ case OP_ARGS(PAT,DST): case OP_ARGS(PAT,SRC): if (!null_brush)

1 0

Travis Athougies : d3dx9_36: Separate calculation of Bytes.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: c55caea1b3c6435c94e0cf3a1d95c7765e941ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55caea1b3c6435c94e0cf3a1… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jul 14 14:06:48 2011 -0700 d3dx9_36: Separate calculation of Bytes. --- dlls/d3dx9_36/shader.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c3ae172..958c4e8 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -639,6 +639,15 @@ static inline int is_vertex_shader(DWORD version) return (version & 0xFFFF0000) == 0xFFFE0000; } +static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) +{ + if (desc->RegisterSet != D3DXRS_FLOAT4 && desc->RegisterSet != D3DXRS_SAMPLER) + FIXME("Don't know how to calculate Bytes for constants of type %d\n", + desc->RegisterSet); + + return 4 * desc->Elements * desc->Rows * desc->Columns; +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) { @@ -1130,6 +1139,7 @@ static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_co constant->desc.Columns = type->Columns; constant->desc.Elements = type->Elements; constant->desc.StructMembers = type->StructMembers; + constant->desc.Bytes = calc_bytes(&constant->desc); TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n", constant->desc.Class, constant->desc.Type, constant->desc.Elements, @@ -1237,22 +1247,6 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, &object->constants[i]); if (hr != D3D_OK) goto error; - - if (constant_info[i].RegisterSet != D3DXRS_FLOAT4 && - constant_info[i].RegisterSet != D3DXRS_SAMPLER) - FIXME("Don't know how to calculate Bytes for constants of type %d\n", - constant_info[i].RegisterSet); - - /* - * D3DXRS_FLOAT4 and D3DXRS_SAMPLER have a base size of 4 - * (not taking into account dimensions and element count) - */ - object->constants[i].desc.Bytes = 4; - - /* Take into account dimensions and elements */ - object->constants[i].desc.Bytes *= object->constants[i].desc.Elements; - object->constants[i].desc.Bytes *= object->constants[i].desc.Rows * - object->constants[i].desc.Columns; } *constant_table = &object->ID3DXConstantTable_iface;

1 0