December 2012 - Wine-Commits

Alexandre Julliard : gdi32: Don' t copy unnecessary rows when shrinking in DELETESCANS mode.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 3a4864714dcf515ce1c3271280d68a93591eb3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4864714dcf515ce1c327128… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 17:48:16 2012 +0100 gdi32: Don't copy unnecessary rows when shrinking in DELETESCANS mode. --- dlls/gdi32/dibdrv/bitblt.c | 5 ++--- dlls/gdi32/dibdrv/primitives.c | 10 ++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index e65dcbc..a9c32bf 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1230,12 +1230,11 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit else { int merged_rows = 0; - int faster_mode = mode; while (v_params.length--) { - if (hstretch) faster_mode = merged_rows ? mode : STRETCH_DELETESCANS; - row_fn( &dst_dib, &dst_start, &src_dib, &src_start, &h_params, faster_mode, merged_rows != 0 ); + if (mode != STRETCH_DELETESCANS || !merged_rows) + row_fn( &dst_dib, &dst_start, &src_dib, &src_start, &h_params, mode, merged_rows != 0 ); merged_rows++; if (err > 0) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index d4c9fc3..1569bc0 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5698,7 +5698,7 @@ static void stretch_row_32(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5741,7 +5741,7 @@ static void stretch_row_24(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5788,7 +5788,7 @@ static void stretch_row_16(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5831,7 +5831,7 @@ static void stretch_row_8(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5876,6 +5876,7 @@ static void stretch_row_4(const dib_info *dst_dib, const POINT *dst_start, struct rop_codes codes; BYTE src_val; + if (!keep_dst) mode = STRETCH_DELETESCANS; rop_codes_from_stretch_mode( mode, &codes ); for (width = params->length; width; width--) { @@ -5911,6 +5912,7 @@ static void stretch_row_1(const dib_info *dst_dib, const POINT *dst_start, struct rop_codes codes; BYTE src_val; + if (!keep_dst) mode = STRETCH_DELETESCANS; rop_codes_from_stretch_mode( mode, &codes ); for (width = params->length; width; width--) {

1 0

Aurimas Fišeras : comdlg32: Move and resize controls of the Find dialog to better fit translations.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: ed42609f54252fa510eaf3d356823917e83459e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed42609f54252fa510eaf3d35… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Dec 2 21:31:15 2012 +0200 comdlg32: Move and resize controls of the Find dialog to better fit translations. --- dlls/comdlg32/comdlg32.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 7040fcc..7658e81 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -312,11 +312,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Fi&nd What:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Match &Case", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direction", grp1, 127, 26, 78, 28 - CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Match &Case", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direction", grp1, 147, 21, 58, 38 + CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Find Next", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP

1 0

Alexandre Julliard : gdi32: Avoid binary ROPs when stretching in DELETESCANS mode.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 6f6e919e2bd0c3a721868b6137e1fd72a5b58353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6e919e2bd0c3a721868b613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 17:32:59 2012 +0100 gdi32: Avoid binary ROPs when stretching in DELETESCANS mode. --- dlls/gdi32/dibdrv/primitives.c | 150 ++++++++++++++++++++++++++++++---------- 1 files changed, 112 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index a8270ae..15b333b 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5697,19 +5697,37 @@ static void stretch_row_32(const dib_info *dst_dib, const POINT *dst_start, DWORD *src_ptr = get_pixel_ptr_32( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_32( dst_ptr, *src_ptr, &codes ); - dst_ptr += params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += params->src_inc; - err += params->err_add_1; + *dst_ptr = *src_ptr; + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_32( dst_ptr, *src_ptr, &codes ); + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -5722,21 +5740,41 @@ static void stretch_row_24(const dib_info *dst_dib, const POINT *dst_start, BYTE *src_ptr = get_pixel_ptr_24( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_8( dst_ptr, *src_ptr, &codes ); - do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes ); - do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes ); - dst_ptr += 3 * params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += 3 * params->src_inc; - err += params->err_add_1; + dst_ptr[0] = src_ptr[0]; + dst_ptr[1] = src_ptr[1]; + dst_ptr[2] = src_ptr[2]; + dst_ptr += 3 * params->dst_inc; + if (err > 0) + { + src_ptr += 3 * params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_8( dst_ptr, *src_ptr, &codes ); + do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes ); + do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes ); + dst_ptr += 3 * params->dst_inc; + if (err > 0) + { + src_ptr += 3 * params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -5749,19 +5787,37 @@ static void stretch_row_16(const dib_info *dst_dib, const POINT *dst_start, WORD *src_ptr = get_pixel_ptr_16( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_16( dst_ptr, *src_ptr, &codes ); - dst_ptr += params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += params->src_inc; - err += params->err_add_1; + *dst_ptr = *src_ptr; + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_16( dst_ptr, *src_ptr, &codes ); + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -5774,19 +5830,37 @@ static void stretch_row_8(const dib_info *dst_dib, const POINT *dst_start, BYTE *src_ptr = get_pixel_ptr_8( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_8( dst_ptr, *src_ptr, &codes ); - dst_ptr += params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += params->src_inc; - err += params->err_add_1; + *dst_ptr = *src_ptr; + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_8( dst_ptr, *src_ptr, &codes ); + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXBUFFER.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 36ac98df73a2a514008cea64325cce684977ae73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ac98df73a2a514008cea643… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:17 2012 +0100 d3dx9: Avoid LPD3DXBUFFER. --- dlls/d3dx9_36/core.c | 2 +- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/mesh.c | 4 ++-- dlls/d3dx9_36/tests/asm.c | 4 ++-- include/d3dx9anim.h | 10 ++++++---- include/d3dx9effect.h | 2 +- include/d3dx9mesh.h | 15 ++++++++++----- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 8947970..d322091 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -132,7 +132,7 @@ static HRESULT d3dx9_buffer_init(struct ID3DXBufferImpl *buffer, DWORD size) return D3D_OK; } -HRESULT WINAPI D3DXCreateBuffer(DWORD size, LPD3DXBUFFER *buffer) +HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer) { struct ID3DXBufferImpl *object; HRESULT hr; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ec14f98..1681ea2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4395,7 +4395,7 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_GetLiteral(ID3DXEffectCompiler *if } static HRESULT WINAPI ID3DXEffectCompilerImpl_CompileEffect(ID3DXEffectCompiler *iface, DWORD flags, - LPD3DXBUFFER *effect, LPD3DXBUFFER *error_msgs) + ID3DXBuffer **effect, ID3DXBuffer **error_msgs) { struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b3a1966..ad7bfa7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1628,8 +1628,8 @@ static HRESULT remap_faces_for_attrsort(ID3DXMeshImpl *This, const DWORD *indice return D3D_OK; } -static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, - DWORD *face_remap_out, LPD3DXBUFFER *vertex_remap_out) +static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, const DWORD *adjacency_in, + DWORD *adjacency_out, DWORD *face_remap_out, ID3DXBuffer **vertex_remap_out) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); void *indices = NULL; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 023236d..78335a7 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -123,7 +123,7 @@ static void assembleshader_test(void) { "#error \"wrong include\"\n" }; HRESULT hr; - LPD3DXBUFFER shader, messages; + ID3DXBuffer *shader, *messages; D3DXMACRO defines[] = { { "DEF1", "10 + 15" @@ -347,7 +347,7 @@ static void d3dxpreprocess_test(void) { "#error \"wrong include\"\n" }; HRESULT hr; - LPD3DXBUFFER shader, messages; + ID3DXBuffer *shader, *messages; HRESULT shader_vsh_res; struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index f5e5553..84f80e8 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -268,8 +268,8 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet) UINT num_rotation_keys, UINT num_translation_keys, CONST D3DXKEY_VECTOR3 *scale_keys, CONST D3DXKEY_QUATERNION *rotation_keys, CONST D3DXKEY_VECTOR3 *translation_keys, DWORD *animation_index) PURE; - STDMETHOD(Compress)(THIS_ DWORD flags, FLOAT lossiness, LPD3DXFRAME hierarchy, - LPD3DXBUFFER *compressed_data) PURE; + STDMETHOD(Compress)(THIS_ DWORD flags, float lossiness, D3DXFRAME *hierarchy, + ID3DXBuffer **compressed_data) PURE; STDMETHOD(UnregisterAnimation)(THIS_ UINT index) PURE; }; #undef INTERFACE @@ -295,7 +295,7 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet) /*** ID3DXCompressedAnimationSet methods ***/ STDMETHOD_(D3DXPLAYBACK_TYPE, GetPlaybackType)(THIS) PURE; STDMETHOD_(DOUBLE, GetSourceTicksPerSecond)(THIS) PURE; - STDMETHOD(GetCompressedData)(THIS_ LPD3DXBUFFER *compressed_data) PURE; + STDMETHOD(GetCompressedData)(THIS_ ID3DXBuffer **compressed_data) PURE; STDMETHOD_(UINT, GetNumCallbackKeys)(THIS) PURE; STDMETHOD(GetCallbackKeys)(THIS_ LPD3DXKEY_CALLBACK callback_keys) PURE; }; @@ -388,7 +388,9 @@ HRESULT WINAPI D3DXFrameRegisterNamedMatrices(LPD3DXFRAME, LPD3DXANIMATIONCONTRO UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*); HRESULT WINAPI D3DXCreateKeyframedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, UINT, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXKEYFRAMEDANIMATIONSET*); -HRESULT WINAPI D3DXCreateCompressedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, LPD3DXBUFFER, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXCOMPRESSEDANIMATIONSET*); +HRESULT WINAPI D3DXCreateCompressedAnimationSet(const char *name, double ticks_per_second, + D3DXPLAYBACK_TYPE playback_type, ID3DXBuffer *compressed_data, UINT callback_key_count, + const D3DXKEY_CALLBACK *callback_keys, ID3DXCompressedAnimationSet **animation_set); HRESULT WINAPI D3DXCreateAnimationController(UINT, UINT, UINT, UINT, LPD3DXANIMATIONCONTROLLER*); #ifdef __cplusplus diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 5a04092..0fd27ff 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -353,7 +353,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) /*** ID3DXEffectCompiler methods ***/ STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE parameter, BOOL literal) PURE; STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE parameter, BOOL* literal) PURE; - STDMETHOD(CompileEffect)(THIS_ DWORD flags, LPD3DXBUFFER* effect, LPD3DXBUFFER* error_msgs) PURE; + STDMETHOD(CompileEffect)(THIS_ DWORD flags, ID3DXBuffer **effect, ID3DXBuffer **error_msgs) PURE; STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, const char *target, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_msgs, ID3DXConstantTable **constant_table) PURE; }; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 21261ab..8fee738 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -373,8 +373,8 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; STDMETHOD(Optimize)(THIS_ DWORD flags, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, ID3DXMesh **opt_mesh) PURE; - STDMETHOD(OptimizeInplace)(THIS_ DWORD flags, CONST DWORD* adjacency_in, DWORD* adjacency_out, - DWORD* face_remap, LPD3DXBUFFER* vertex_remap) PURE; + STDMETHOD(OptimizeInplace)(THIS_ DWORD flags, const DWORD *adjacency_in, DWORD *adjacency_out, + DWORD *face_remap, ID3DXBuffer **vertex_remap) PURE; STDMETHOD(SetAttributeTable)(THIS_ CONST D3DXATTRIBUTERANGE* attrib_table, DWORD attrib_table_size) PURE; }; #undef INTERFACE @@ -696,7 +696,7 @@ HRESULT WINAPI D3DXCreateMesh(DWORD face_count, DWORD vertex_count, DWORD flags, const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh); HRESULT WINAPI D3DXCreateMeshFVF(DWORD face_count, DWORD vertex_count, DWORD flags, DWORD fvf, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh); -HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); +HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer); HRESULT WINAPI D3DXCreateSPMesh(ID3DXMesh *mesh, const DWORD *adjacency, const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, ID3DXSPMesh **spmesh); HRESULT WINAPI D3DXCreatePMeshFromStream(struct IStream *stream, DWORD flags, struct IDirect3DDevice9 *device, @@ -812,7 +812,10 @@ HRESULT WINAPI D3DXOptimizeVertices(LPCVOID, UINT, UINT, BOOL, DWORD *); HRESULT WINAPI D3DXRectPatchSize(CONST FLOAT *, DWORD *, DWORD *); HRESULT WINAPI D3DXSHPRTCompSuperCluster(UINT *cluster_ids, ID3DXMesh *scene, UINT max_cluster_count, UINT cluster_count, UINT *scluster_ids, UINT *scluster_count); -HRESULT WINAPI D3DXSHPRTCompSplitMeshSC(UINT *, UINT, UINT, UINT *, UINT, LPVOID, BOOL, UINT, LPD3DXBUFFER *, UINT *, BOOL, LPD3DXBUFFER *, LPD3DXBUFFER *, UINT *, UINT *, D3DXSHPRTSPLITMESHCLUSTERDATA *); +HRESULT WINAPI D3DXSHPRTCompSplitMeshSC(UINT *cluster_idx, UINT vertex_count, UINT cluster_count, UINT *scluster_ids, + UINT scluster_count, void *index_buffer_in, BOOL ib_in_32bit, UINT face_count, ID3DXBuffer **index_buffer_out, + UINT *index_buffer_size, BOOL ib_out_32bit, ID3DXBuffer **face_remap, ID3DXBuffer **vertex_data, + UINT *vertex_data_length, UINT *sc_cluster_list, D3DXSHPRTSPLITMESHCLUSTERDATA *sc_data); HRESULT WINAPI D3DXSimplifyMesh(ID3DXMesh *mesh_in, const DWORD *adjacency, const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, DWORD min_value, DWORD flags, ID3DXMesh **mesh_out); @@ -830,7 +833,9 @@ HRESULT WINAPI D3DXUVAtlasCreate(ID3DXMesh *mesh_in, UINT max_chart_count, float UINT width, UINT height, float gutter, DWORD texture_idx, const DWORD *adjacency, const DWORD *false_edges, const float *imt_array, LPD3DXUVATLASCB cb, float cb_freq, void *ctx, DWORD flags, ID3DXMesh **mesh_out, ID3DXBuffer **face_partitioning_out, ID3DXBuffer **vertex_remap_out, float *max_stretch_out, UINT *chart_count); -HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *, UINT, UINT, FLOAT, DWORD, CONST DWORD *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXBUFFER); +HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *mesh, UINT width, UINT height, float gutter, DWORD texture_idx, + const DWORD *partition_result_adjacency, LPD3DXUVATLASCB cb, float cb_freq, void *ctx, DWORD flags, + ID3DXBuffer *face_partitioning); HRESULT WINAPI D3DXUVAtlasPartition(ID3DXMesh *mesh_in, UINT max_chart_count, float max_stretch_in, DWORD texture_idx, const DWORD *adjacency, const DWORD *false_edges, const float *imt_array, LPD3DXUVATLASCB cb, float cb_freq, void *ctx, DWORD flags, ID3DXMesh **mesh_out,

1 0

Andrew Talbot : mmsystem.dll: De-constify a variable.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 21af37226d020589f6ed799d8142570196bbf984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21af37226d020589f6ed799d8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 22:12:27 2012 +0000 mmsystem.dll: De-constify a variable. --- dlls/mmsystem.dll16/driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmsystem.dll16/driver.c b/dlls/mmsystem.dll16/driver.c index b18cdcb..d35af7d 100644 --- a/dlls/mmsystem.dll16/driver.c +++ b/dlls/mmsystem.dll16/driver.c @@ -203,7 +203,7 @@ static BOOL DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam1, LPARAM lPar * * Tries to load a 16 bit driver whose DLL's (module) name is lpFileName. */ -static LPWINE_DRIVER DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam2) +static LPWINE_DRIVER DRIVER_TryOpenDriver16(LPSTR lpFileName, LPARAM lParam2) { static WORD DRIVER_hDrvr16Counter /* = 0 */; LPWINE_DRIVER lpDrv = NULL;

1 0

Alexandre Julliard : winex11: Fall back to normal expose processing for areas outside of the surface region .
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 8e6548573233ecdb85a01ac8f6f48456fd259147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6548573233ecdb85a01ac8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 15:27:04 2012 +0100 winex11: Fall back to normal expose processing for areas outside of the surface region. --- dlls/winex11.drv/bitblt.c | 23 +++++++++++++++++++++++ dlls/winex11.drv/event.c | 23 +++++++++++++---------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c5a6bd0..161fa73 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2062,3 +2062,26 @@ void set_surface_color_key( struct window_surface *window_surface, COLORREF colo if (surface->color_key != prev) update_surface_region( surface ); window_surface->funcs->unlock( window_surface ); } + +/*********************************************************************** + * expose_surface + */ +HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) +{ + struct x11drv_window_surface *surface = get_x11_surface( window_surface ); + HRGN region = 0; + + window_surface->funcs->lock( window_surface ); + add_bounds_rect( &surface->bounds, rect ); + if (surface->region) + { + region = CreateRectRgnIndirect( rect ); + if (CombineRgn( region, region, surface->region, RGN_DIFF ) <= NULLREGION) + { + DeleteObject( region ); + region = 0; + } + } + window_surface->funcs->unlock( window_surface ); + return region; +} diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f908413..90b2068 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -816,7 +816,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) XExposeEvent *event = &xev->xexpose; RECT rect; struct x11drv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME; + HRGN surface_region = 0; + UINT flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN; TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); @@ -830,9 +831,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) if (data->surface) { - data->surface->funcs->lock( data->surface ); - add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &rect ); - data->surface->funcs->unlock( data->surface ); + surface_region = expose_surface( data->surface, &rect ); + if (!surface_region) flags = 0; if (data->vis.visualid != default_visual.visualid) data->surface->funcs->flush( data->surface ); } @@ -841,6 +841,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) { OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, data->whole_rect.top - data->client_rect.top ); + if (surface_region) OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); @@ -855,15 +857,16 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) wine_server_call( req ); } SERVER_END_REQ; - - flags |= RDW_ALLCHILDREN; } - else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - - if (data->surface) flags = 0; + else + { + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + flags &= ~RDW_ALLCHILDREN; + } release_win_data( data ); - if (flags) RedrawWindow( hwnd, &rect, 0, flags ); + if (flags) RedrawWindow( hwnd, &rect, surface_region, flags ); + if (surface_region) DeleteObject( surface_region ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 314a438..0c462d6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -200,6 +200,7 @@ extern DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisu extern struct window_surface *create_surface( Window window, const XVisualInfo *vis, const RECT *rect, COLORREF color_key, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void set_surface_color_key( struct window_surface *window_surface, COLORREF color_key ) DECLSPEC_HIDDEN; +extern HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; extern BOOL add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXLINE.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: d856b3a6d2b46d2289fb5856ec0e55bc0751ee3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d856b3a6d2b46d2289fb5856e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:16 2012 +0100 d3dx9: Avoid LPD3DXLINE. --- dlls/d3dx9_36/tests/line.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 891de5a..b9eacee 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -58,7 +58,7 @@ do { \ static void test_create_line(IDirect3DDevice9* device) { HRESULT hr; - LPD3DXLINE line = NULL; + ID3DXLine *line = NULL; struct IDirect3DDevice9 *return_device; D3DXMATRIX world, identity, result; FLOAT r11, r12, r13, r14;

1 0

Stefan Dösinger : wined3d: Add an explicit break in case of unhandled BUMPENVMAP.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 483d025795356b3290ab86c3b4707308d2c0c4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d025795356b3290ab86c3b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 2 16:00:46 2012 +0100 wined3d: Add an explicit break in case of unhandled BUMPENVMAP. --- dlls/wined3d/nvidia_texture_shader.c | 29 ++++++++++++++++------------- dlls/wined3d/state.c | 5 +++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 9a77e1d..52f4341 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -446,23 +446,26 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d case WINED3D_TOP_BUMPENVMAP_LUMINANCE: case WINED3D_TOP_BUMPENVMAP: - if (gl_info->supported[NV_TEXTURE_SHADER]) + if (!gl_info->supported[NV_TEXTURE_SHADER]) { - /* The bump map stage itself isn't exciting, just read the texture. But tell the next stage to - * perform bump mapping and source from the current stage. Pretty much a SELECTARG2. - * ARG2 is passed through unmodified(apps will most likely use D3DTA_CURRENT for arg2, arg1 - * (which will most likely be D3DTA_TEXTURE) is available as a texture shader input for the next stage - */ - GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV, - tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1])); - GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV, - GL_ZERO, GL_UNSIGNED_INVERT_NV, portion)); - /* Always pass through to CURRENT, ignore temp arg */ - GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV, - GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE)); + WARN("BUMPENVMAP requires GL_NV_texture_shader in this codepath\n"); break; } + /* The bump map stage itself isn't exciting, just read the texture. But tell the next stage to + * perform bump mapping and source from the current stage. Pretty much a SELECTARG2. + * ARG2 is passed through unmodified(apps will most likely use D3DTA_CURRENT for arg2, arg1 + * (which will most likely be D3DTA_TEXTURE) is available as a texture shader input for the + * next stage */ + GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV, + tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1])); + GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV, + GL_ZERO, GL_UNSIGNED_INVERT_NV, portion)); + /* Always pass through to CURRENT, ignore temp arg */ + GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV, + GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE)); + break; + default: FIXME("Unhandled texture op: stage %d, is_alpha %d, op %s (%#x), arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d.\n", stage, is_alpha, debug_d3dtop(op), op, arg1, arg2, arg3, texture_idx); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9b5d875..fae7964 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2628,6 +2628,8 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined case WINED3D_TOP_BUMPENVMAP: case WINED3D_TOP_BUMPENVMAP_LUMINANCE: FIXME("Implement bump environment mapping in GL_NV_texture_env_combine4 path\n"); + Handled = FALSE; + break; default: Handled = FALSE; @@ -3090,6 +3092,9 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined */ FIXME("Implement bump mapping with GL_NV_texture_shader in non register combiner path\n"); } + Handled = FALSE; + break; + default: Handled = FALSE; }

1 0

Andrew Talbot : msvcp71: Remove unused semicolons.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: df4761d3f6bccfc61a32320c2ab0ee6246ed587c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4761d3f6bccfc61a32320c2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:37:51 2012 +0000 msvcp71: Remove unused semicolons. --- dlls/msvcp71/ios.c | 84 ++++++++++++++++++++++++++-------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df4761d3f6bccfc61a323…

1 0

Andrew Talbot : msvcp60: Remove unused semicolons.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 327acfa35e90a87d23061313088bc0c9cc2799f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327acfa35e90a87d230613130… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:37:48 2012 +0000 msvcp60: Remove unused semicolons. --- dlls/msvcp60/ios.c | 84 ++++++++++++++++++++++++++-------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=327acfa35e90a87d23061…

1 0