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

Michael Stefaniuc : quartz: COM cleanup for the IBasicVideo2 iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: a37208ba96855340fbfca0400127e36cc94725b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37208ba96855340fbfca0400… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:44:08 2011 +0200 quartz: COM cleanup for the IBasicVideo2 iface. --- dlls/quartz/filtergraph.c | 358 ++++++++++++++++++++++----------------------- 1 files changed, 175 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a37208ba96855340fbfca…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IVideoWindow iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 6d929c71b68c1f442a993ec30d17fc2358c87e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d929c71b68c1f442a993ec30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:45:48 2011 +0200 quartz: COM cleanup for the IVideoWindow iface. --- dlls/quartz/filtergraph.c | 408 ++++++++++++++++++++++----------------------- 1 files changed, 198 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d929c71b68c1f442a993…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaEventEx iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: eca149bb4ba1e5eec89414260d303027e556b70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca149bb4ba1e5eec89414260… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:47:38 2011 +0200 quartz: COM cleanup for the IMediaEventEx iface. --- dlls/quartz/filtergraph.c | 135 +++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eca149bb4ba1e5eec8941…

1 0

Frédéric Delanoy : hhctrl.ocx: Remove misplaced semicolon after an if condition.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: c7a46f5d3e37843c44b01ed807d4b0c2119307a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a46f5d3e37843c44b01ed80… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 30 16:46:34 2011 +0200 hhctrl.ocx: Remove misplaced semicolon after an if condition. --- dlls/hhctrl.ocx/hhctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 33cc1f1..f93fecc 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -126,7 +126,7 @@ static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD bufle extra = strstrW(filename, delimW); if (extra) { - if (filename != chm_file); + if (filename != chm_file) memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); chm_file[extra-filename] = 0; filename = chm_file;

1 0

Misha Koshelev : include: Add declarations related to D3DXFLOAT16.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: e35f1a4babd2fd3d09fcdec93d6d6a2fcdf58f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35f1a4babd2fd3d09fcdec93… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Jun 29 11:16:29 2011 -0400 include: Add declarations related to D3DXFLOAT16. --- include/d3dx9math.h | 18 ++++++++++++++++++ include/d3dx9math.inl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/d3dx9math.h b/include/d3dx9math.h index f28ffd1..79a7e66 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -261,6 +261,21 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +typedef struct D3DXFLOAT16 +{ +#ifdef __cplusplus + D3DXFLOAT16(); + D3DXFLOAT16(FLOAT f); + D3DXFLOAT16(CONST D3DXFLOAT16 &f); + + operator FLOAT (); + + BOOL operator == (CONST D3DXFLOAT16 &) const; + BOOL operator != (CONST D3DXFLOAT16 &) const; +#endif /* __cplusplus */ + WORD value; +} D3DXFLOAT16, *LPD3DXFLOAT16; + #ifdef __cplusplus extern "C" { #endif @@ -357,6 +372,9 @@ D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv); D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm); D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, CONST D3DXVECTOR4 *pv, UINT vstride, CONST D3DXMATRIX *pm, UINT n); +D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, CONST FLOAT *pin, UINT n); +FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); + #ifdef __cplusplus } #endif diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 3cd078a..3f55aef 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -851,6 +851,37 @@ inline BOOL D3DXCOLOR::operator != (CONST D3DXCOLOR& col) const return r != col.r || g != col.g || b != col.b || a != col.a; } +inline D3DXFLOAT16::D3DXFLOAT16() +{ +} + +inline D3DXFLOAT16::D3DXFLOAT16(FLOAT f) +{ + D3DXFloat32To16Array(this, &f, 1); +} + +inline D3DXFLOAT16::D3DXFLOAT16(CONST D3DXFLOAT16 &f) +{ + value = f.value; +} + +inline D3DXFLOAT16::operator FLOAT () +{ + FLOAT f; + D3DXFloat16To32Array(&f, this, 1); + return f; +} + +inline BOOL D3DXFLOAT16::operator == (CONST D3DXFLOAT16 &f) const +{ + return value == f.value; +} + +inline BOOL D3DXFLOAT16::operator != (CONST D3DXFLOAT16 &f) const +{ + return value != f.value; +} + #endif /* __cplusplus */ /*_______________D3DXCOLOR_____________________*/

1 0

Misha Koshelev : d3dx9_36: Implement and add tests for D3DXFloat16To32Array .
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: a6b40624dbc457ba7b0b4b307b1eb88617c67197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b40624dbc457ba7b0b4b307… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Jun 29 11:16:29 2011 -0400 d3dx9_36: Implement and add tests for D3DXFloat16To32Array. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 32 +++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index a9b98a7..5973d20 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -130,7 +130,7 @@ @ stub D3DXFillVolumeTextureTX(ptr ptr) @ stdcall D3DXFilterTexture(ptr ptr long long) @ stdcall D3DXFindShaderComment(ptr long ptr ptr) -@ stub D3DXFloat16To32Array(ptr ptr long) +@ stdcall D3DXFloat16To32Array(ptr ptr long) @ stub D3DXFloat32To16Array(ptr ptr long) @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index fdb5f92..fde3e4e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1769,3 +1769,35 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4* out, UINT outstride, CON } return out; } + +/* Native d3dx9's D3DXFloat16to32Array lacks support for NaN and Inf. Specifically, e = 16 is treated as a + * regular number - e.g., 0x7fff is converted to 131008.0 and 0xffff to -131008.0. */ +static inline float float_16_to_32(const unsigned short in) +{ + const unsigned short s = (in & 0x8000); + const unsigned short e = (in & 0x7C00) >> 10; + const unsigned short m = in & 0x3FF; + const float sgn = (s ? -1.0f : 1.0f); + + if (e == 0) + { + if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ + else return sgn * powf(2, -14.0f) * (m / 1024.0f); + } + else + { + return sgn * powf(2, e - 15.0f) * (1.0f + (m / 1024.0f)); + } +} + +FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n) +{ + unsigned int i; + + for (i = 0; i < n; ++i) + { + pout[i] = float_16_to_32(pin[i].value); + } + + return pout; +} diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5ad1924..aa3f135 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -21,6 +21,7 @@ #include "wine/test.h" #include "d3dx9.h" +#include <math.h> #define ARRAY_SIZE 5 @@ -2215,6 +2216,64 @@ static void test_D3DXVec_Array(void) compare_planes(exp_plane, out_plane); } +static void test_D3DXFloat_Array(void) +{ + unsigned int i; + void *out = NULL; + D3DXFLOAT16 half; + FLOAT single; + struct + { + FLOAT single_in; + + /* half_ver2 occurs on WXPPROSP3 (32 bit math), WVISTAADM (32 bit math), W7PRO (32 bit math) */ + WORD half_ver1, half_ver2; + + /* single_out_ver2 confirms that half -> single conversion is consistent across platforms */ + FLOAT single_out_ver1, single_out_ver2; + } testdata[] = { + { 80000.0f, 0x7c00, 0x7ce2, 65536.0f, 80000.0f }, + { 65503.0f, 0x7bff, 0x7bff, 65504.0f, 65504.0f }, + { 65504.0f, 0x7bff, 0x7bff, 65504.0f, 65504.0f }, + { 65520.0f, 0x7bff, 0x7c00, 65504.0f, 65536.0f }, + { 65521.0f, 0x7c00, 0x7c00, 65536.0f, 65536.0f }, + { 65534.0f, 0x7c00, 0x7c00, 65536.0f, 65536.0f }, + { 65535.0f, 0x7c00, 0x7c00, 65535.0f, 65536.0f }, + { 65536.0f, 0x7c00, 0x7c00, 65536.0f, 65536.0f }, + { -80000.0f, 0xfc00, 0xfce2, -65536.0f, -80000.0f }, + { -65503.0f, 0xfbff, 0xfbff, -65504.0f, -65504.0f }, + { -65504.0f, 0xfbff, 0xfbff, -65504.0f, -65504.0f }, + { -65520.0f, 0xfbff, 0xfc00, -65504.0f, -65536.0f }, + { -65521.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, + { -65534.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, + { -65535.0f, 0xfc00, 0xfc00, -65535.0f, -65536.0f }, + { -65536.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, + { INFINITY, 0x7c00, 0x7fff, 65536.0f, 131008.0f }, + { -INFINITY, 0xffff, 0xffff, -131008.0f, -131008.0f }, + { NAN, 0x7fff, 0x7fff, 131008.0f, 131008.0f }, + { -NAN, 0xffff, 0xffff, -131008.0f, -131008.0f }, + { 0.0f, 0x0, 0x0, 0.0f, 0.0f }, + { -0.0f, 0x8000, 0x8000, 0.0f, 0.0f }, + }; + + /* exception on NULL out or in parameter */ + out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&half, 0); + ok(out == &single, "Got %p, expected %p.\n", out, &single); + + for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++) + { + out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver1, 1); + ok(out == &single, "Got %p, expected %p.\n", out, &single); + ok(relative_error(single, testdata[i].single_out_ver1) < admitted_error, + "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver1, i); + + out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver2, 1); + ok(out == &single, "Got %p, expected %p.\n", out, &single); + ok(relative_error(single, testdata[i].single_out_ver2) < admitted_error, + "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver2, i); + } +} + START_TEST(math) { D3DXColorTest(); @@ -2230,4 +2289,5 @@ START_TEST(math) test_Matrix_Decompose(); test_Matrix_Transformation2D(); test_D3DXVec_Array(); + test_D3DXFloat_Array(); }

1 0

Michael Stefaniuc : shell32: Don't pass an unitialized size to RegGetValue( ).
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: c2c0bec0e3c70ea9435a7b84e394980d849e8d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c0bec0e3c70ea9435a7b84e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 21:55:57 2011 +0200 shell32: Don't pass an unitialized size to RegGetValue(). --- dlls/shell32/shellpath.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index ef1a0de..66c376e 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3315,7 +3315,8 @@ static HRESULT WINAPI knownfolder_GetCategory( { struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); HRESULT hr = S_OK; - DWORD dwSize, dwType; + DWORD dwSize = sizeof(DWORD); + DWORD dwType; TRACE("%p, %p\n", knownfolder, pCategory);

1 0

Henri Verbeet : wined3d: Make the context parameter to context_check_fbo_status() const.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: b3b1d205628de3118dea44a3b1849366f0eac09a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b1d205628de3118dea44a3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:11 2011 +0200 wined3d: Make the context parameter to context_check_fbo_status() const. --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f52609c..51a77ef 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -219,7 +219,7 @@ static void context_attach_surface_fbo(const struct wined3d_context *context, } /* GL locking is done by the caller */ -void context_check_fbo_status(struct wined3d_context *context, GLenum target) +void context_check_fbo_status(const struct wined3d_context *context, GLenum target) { const struct wined3d_gl_info *gl_info = context->gl_info; GLenum status; @@ -233,7 +233,7 @@ void context_check_fbo_status(struct wined3d_context *context, GLenum target) } else { - struct wined3d_surface *attachment; + const struct wined3d_surface *attachment; unsigned int i; FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ceae2fd..81b5119 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1227,7 +1227,7 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target void context_attach_depth_stencil_fbo(const struct wined3d_context *context, GLenum fbo_target, struct wined3d_surface *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) DECLSPEC_HIDDEN; -void context_check_fbo_status(struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; +void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0