wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Rico Schüller : d3dx9/tests: Fix typo.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 5b7834851fc885c6011395d441047a8a74e21cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7834851fc885c6011395d44… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 25 10:39:33 2011 +0200 d3dx9/tests: Fix typo. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8d82a68..d11a918 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -260,7 +260,7 @@ static void test_get_shader_constant_table_ex(void) /* No CTAB data */ hr = D3DXGetShaderConstantTableEx(simple_ps, 0, &constant_table); - ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DXERR_INVALIDDATA); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); /* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table);

1 0

Rico Schüller : d3dx9: Improve argument check in D3DXFindShaderComment().
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: be68d56efc0e7dc1a6aab644ad3fabfa5650fc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be68d56efc0e7dc1a6aab644a… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 25 10:39:25 2011 +0200 d3dx9: Improve argument check in D3DXFindShaderComment(). --- dlls/d3dx9_36/shader.c | 3 +++ dlls/d3dx9_36/tests/shader.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index bc5e002..b538edd 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -153,6 +153,9 @@ HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVO TRACE("(%p, %x, %p, %p)\n", byte_code, fourcc, data, size); + if (data) *data = NULL; + if (size) *size = 0; + if (!byte_code) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 9220e28..8d82a68 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -215,23 +215,31 @@ static void test_get_shader_version(void) static void test_find_shader_comment(void) { HRESULT hr; - LPCVOID data; - UINT size; + LPCVOID data = (LPVOID)0xdeadbeef; + UINT size = 100; hr = D3DXFindShaderComment(NULL, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + ok(!data, "Got %p, expected NULL\n", data); + ok(!size, "Got %u, expected 0\n", size); hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), NULL, &size); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(size == 28, "Got %u, expected 28\n", size); hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); hr = D3DXFindShaderComment(shader_with_ctab, 0, &data, &size); ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + ok(!data, "Got %p, expected NULL\n", data); + ok(!size, "Got %u, expected 0\n", size); hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('X','X','X','X'), &data, &size); ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + ok(!data, "Got %p, expected NULL\n", data); + ok(!size, "Got %u, expected 0\n", size); hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr);

1 0

Jacek Caban : jscript: Moved return_type_t declaration to engine.c.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 6ffe4cb59fd62e7ce9c384bf098623b138f1e5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffe4cb59fd62e7ce9c384bf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 25 11:56:36 2011 +0200 jscript: Moved return_type_t declaration to engine.c. --- dlls/jscript/engine.c | 10 ++++++++++ dlls/jscript/engine.h | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 160a67b..130fe41 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -32,6 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define EXPR_NEWREF 0x0002 #define EXPR_STRREF 0x0004 +struct _return_type_t { + enum{ + RT_NORMAL, + RT_RETURN, + RT_BREAK, + RT_CONTINUE + } type; + jsexcept_t ei; +}; + static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { return stat->eval(ctx, stat, rt, ret); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 306e962..9b2e2b5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -156,15 +156,7 @@ typedef struct _variable_declaration_t { struct _variable_declaration_t *next; } variable_declaration_t; -typedef struct { - enum{ - RT_NORMAL, - RT_RETURN, - RT_BREAK, - RT_CONTINUE - } type; - jsexcept_t ei; -} return_type_t; +typedef struct _return_type_t return_type_t; typedef HRESULT (*statement_eval_t)(script_ctx_t*,statement_t*,return_type_t*,VARIANT*);

1 0

Michael Stefaniuc : include: Remove 'l' modifier from numeric constants in digitalv.h.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 4b6ad8c21923164fce70efd3d175808e2fb26113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6ad8c21923164fce70efd3d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 24 23:26:28 2011 +0200 include: Remove 'l' modifier from numeric constants in digitalv.h. --- include/digitalv.h | 506 ++++++++++++++++++++++++++-------------------------- 1 files changed, 253 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b6ad8c21923164fce70e…

1 0

Michael Stefaniuc : include: Remove 'l' modifier from numeric constants in dinput.h.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: f334333cb56a23143f447f7b893f8de928d7091d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f334333cb56a23143f447f7b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 24 23:25:12 2011 +0200 include: Remove 'l' modifier from numeric constants in dinput.h. --- include/dinput.h | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index dc82622..bd9d898 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -130,11 +130,11 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DI_BUFFEROVERFLOW S_FALSE #define DI_PROPNOEFFECT S_FALSE #define DI_NOEFFECT S_FALSE -#define DI_POLLEDDEVICE ((HRESULT)0x00000002L) -#define DI_DOWNLOADSKIPPED ((HRESULT)0x00000003L) -#define DI_EFFECTRESTARTED ((HRESULT)0x00000004L) -#define DI_TRUNCATED ((HRESULT)0x00000008L) -#define DI_TRUNCATEDANDRESTARTED ((HRESULT)0x0000000CL) +#define DI_POLLEDDEVICE ((HRESULT)0x00000002) +#define DI_DOWNLOADSKIPPED ((HRESULT)0x00000003) +#define DI_EFFECTRESTARTED ((HRESULT)0x00000004) +#define DI_TRUNCATED ((HRESULT)0x00000008) +#define DI_TRUNCATEDANDRESTARTED ((HRESULT)0x0000000C) #define DIERR_OLDDIRECTINPUTVERSION \ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_OLD_WIN_VERSION) @@ -167,20 +167,20 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DIERR_READONLY E_ACCESSDENIED #define DIERR_HANDLEEXISTS E_ACCESSDENIED #ifndef E_PENDING -#define E_PENDING 0x8000000AL +#define E_PENDING 0x8000000A #endif -#define DIERR_INSUFFICIENTPRIVS 0x80040200L -#define DIERR_DEVICEFULL 0x80040201L -#define DIERR_MOREDATA 0x80040202L -#define DIERR_NOTDOWNLOADED 0x80040203L -#define DIERR_HASEFFECTS 0x80040204L -#define DIERR_NOTEXCLUSIVEACQUIRED 0x80040205L -#define DIERR_INCOMPLETEEFFECT 0x80040206L -#define DIERR_NOTBUFFERED 0x80040207L -#define DIERR_EFFECTPLAYING 0x80040208L -#define DIERR_UNPLUGGED 0x80040209L -#define DIERR_REPORTFULL 0x8004020AL -#define DIERR_MAPFILEFAIL 0x8004020BL +#define DIERR_INSUFFICIENTPRIVS 0x80040200 +#define DIERR_DEVICEFULL 0x80040201 +#define DIERR_MOREDATA 0x80040202 +#define DIERR_NOTDOWNLOADED 0x80040203 +#define DIERR_HASEFFECTS 0x80040204 +#define DIERR_NOTEXCLUSIVEACQUIRED 0x80040205 +#define DIERR_INCOMPLETEEFFECT 0x80040206 +#define DIERR_NOTBUFFERED 0x80040207 +#define DIERR_EFFECTPLAYING 0x80040208 +#define DIERR_UNPLUGGED 0x80040209 +#define DIERR_REPORTFULL 0x8004020A +#define DIERR_MAPFILEFAIL 0x8004020B #define DIENUM_STOP 0 #define DIENUM_CONTINUE 1

1 0

Michael Stefaniuc : include: Remove 'l' modifier from numeric constants in mmsystem.h.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 5439aede62e40511703784eca5d01b16678b680a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5439aede62e40511703784eca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 24 23:22:16 2011 +0200 include: Remove 'l' modifier from numeric constants in mmsystem.h. --- dlls/mmsystem.dll16/message16.c | 2 +- dlls/winmm/mci.c | 5 +- dlls/winmm/tests/capture.c | 4 +- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 3 +- include/mmsystem.h | 518 +++++++++++++++++++------------------- 6 files changed, 266 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5439aede62e4051170378…

1 0

Juan Lang : wininet: Fix off by one error parsing RFC 850 dates.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: ad3e22d5ee2e4f8855bd722bc6004891bef96950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad3e22d5ee2e4f8855bd722bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 24 13:21:10 2011 -0700 wininet: Fix off by one error parsing RFC 850 dates. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d1a870b..db85d0b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4292,7 +4292,7 @@ static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) return FALSE; } } - else if (ptr - value <= sizeof(day) / sizeof(day[0])) + else if (ptr - value < sizeof(day) / sizeof(day[0])) { memcpy(day, value, (ptr - value) * sizeof(WCHAR)); day[ptr - value + 1] = 0;

1 0

Henri Verbeet : wined3d: Make the device parameter to context_apply_clear_state() const.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: bab2a40f87599caef5fa194740c1546cf5ba4c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab2a40f87599caef5fa19474… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 21:24:40 2011 +0200 wined3d: Make the device parameter to context_apply_clear_state() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 888c40c..1def817 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2171,7 +2171,7 @@ static BOOL context_validate_rt_config(UINT rt_count, } /* Context activation is done by the caller. */ -BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { DWORD rt_mask = 0, old_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 02c60e1..e911edd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1234,7 +1234,7 @@ void context_alloc_event_query(struct wined3d_context *context, void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; -BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,

1 0

Henri Verbeet : wined3d: Make the device parameter to context_apply_blit_state() const.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 9b42c657e475c5e370ab75f05902788b2b786110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b42c657e475c5e370ab75f05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 21:24:39 2011 +0200 wined3d: Make the device parameter to context_apply_blit_state() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 66460d9..888c40c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2100,7 +2100,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device } /* Context activation is done by the caller. */ -void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) +void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { struct wined3d_surface *rt = context->current_rt; DWORD rt_mask, old_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8278983..02c60e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1233,7 +1233,7 @@ void context_alloc_event_query(struct wined3d_context *context, struct wined3d_event_query *query) DECLSPEC_HIDDEN; void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; -void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; +void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Read/draw from/ to the actual screen when there is no swapchain window.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: d09ad48328e9614b1f8a52157b5827eb23e2b0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09ad48328e9614b1f8a52157… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 21:24:38 2011 +0200 ddraw: Read/draw from/to the actual screen when there is no swapchain window. --- dlls/ddraw/ddraw.c | 5 ++ dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 121 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 107 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d09ad48328e9614b1f8a5…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011