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

Henri Verbeet : wined3d: Make the surface parameter to surface_convert_depth_to_float() const.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: d314aa2d6ef8a899ba6ced167d45a718aa4642a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d314aa2d6ef8a899ba6ced167… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:05 2011 +0200 wined3d: Make the surface parameter to surface_convert_depth_to_float() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 458cc36..069861e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1212,7 +1212,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -static BOOL surface_convert_depth_to_float(struct wined3d_surface *surface, DWORD depth, float *float_depth) +static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { const struct wined3d_format *format = surface->resource.format;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_convert_color_to_float() const.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: a97ed5346095643e52fe4cc924f7a7c1f40c5dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97ed5346095643e52fe4cc92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:06 2011 +0200 wined3d: Make the surface parameter to surface_convert_color_to_float() const. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 069861e..92a4ae5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2477,11 +2477,11 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *d } } -static BOOL surface_convert_color_to_float(struct wined3d_surface *surface, +static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, DWORD color, WINED3DCOLORVALUE *float_color) { const struct wined3d_format *format = surface->resource.format; - struct wined3d_device *device = surface->resource.device; + const struct wined3d_device *device = surface->resource.device; switch (format->id) {

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_depth_blt() const.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 437cec1a49d8e06305eaeb138e46171ef93e24ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=437cec1a49d8e06305eaeb138… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:07 2011 +0200 wined3d: Make the surface parameter to surface_depth_blt() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 92a4ae5..7b10ec8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5561,7 +5561,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa } /* GL locking is done by the caller */ -static void surface_depth_blt(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, +static void surface_depth_blt(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, GLuint texture, GLint x, GLint y, GLsizei w, GLsizei h, GLenum target) { struct wined3d_device *device = surface->resource.device;

1 0

Frédéric Delanoy : cmd/tests: Add SET tests.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 79926d6f2b5712795aef6f01d3c18e87f16e19e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79926d6f2b5712795aef6f01d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 17 22:48:56 2011 +0200 cmd/tests: Add SET tests. --- programs/cmd/tests/test_builtins.cmd | 36 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 20 ++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bcff6e8..982fd23 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -29,11 +29,47 @@ echo word(a)space@ echo word(a)space@@space@ echo ------------ Testing 'set' -------------- +echo %ErrorLevel% +set FOOBAR 2> nul > nul +echo %ErrorLevel% +set FOOBAR = baz +echo %ErrorLevel% +echo %FOOBAR%FOOBAR not defined +echo %FOOBAR % +set FOOBAR 2> nul +set FOOBAR = baz2 +echo %ErrorLevel% +echo %fOObAr % +set FOOBAR= bar +echo %ErrorLevel% +echo %FOOBAR% +set FOO +set FOOBAR= +set FOOB +echo %FOOBAR%FOOBAR not defined +set FOOBAR = +set FOOBA 2> nul > nul +echo %ErrorLevel% +set FOO=bar +echo %FOO% +set FOO=foo +set BAR=bar +echo %FOO%%BAR% +set BAR= +set FOO= +set FOO=%FOO% +echo %FOO%FOO not defined +set BAZ%=bazbaz +set BA +echo %BAZ%% +set BAZ%= echo set "FOO=bar" should not include the quotes in the variable value set "FOO=bar" echo %FOO% +set FOO= echo ------------ Testing variable expansion -------------- +call :setError 0 echo ~dp0 should be directory containing batch file echo %~dp0 mkdir dummydir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index eb55151..235d552 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -48,6 +48,26 @@ word word(a)space@ word(a)space@@space@ ------------ Testing 'set' -------------- +0 +1 +(a)todo_wine@0 +FOOBAR not defined +(a)todo_wine@ baz +FOOBAR = baz +(a)todo_wine@0 +(a)todo_wine@ baz2 +(a)todo_wine@0 + bar +(a)todo_wine@FOOBAR= bar +(a)todo_wine@FOOBAR = baz2 +FOOBAR = baz +FOOBAR not defined +1 +bar +foobar +FOO not defined +BAZ=bazbaz +bazbaz set "FOO=bar" should not include the quotes in the variable value bar ------------ Testing variable expansion --------------

1 0

Akihiro Sagawa : dsound: Fix a typo.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: c1fbf00d2cbec8d61e8e96831d890d64832cc96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fbf00d2cbec8d61e8e96831… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 18 15:02:07 2011 +0900 dsound: Fix a typo. --- dlls/dsound/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index f797baf..4c25402 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1177,7 +1177,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( { IDirectSoundBufferImpl *dsb; HRESULT hres = DS_OK; - TRACE("(%p,%p,%p)\n", device, pdsb, pdsb); + TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb); dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb)); if (dsb == NULL) {

1 0

Travis Athougies : d3dx9_36: Improved constant table handle support.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 48d03555a7a6931ee8ba0952ccb92c70925c6bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d03555a7a6931ee8ba0952c… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jul 14 14:06:49 2011 -0700 d3dx9_36: Improved constant table handle support. --- dlls/d3dx9_36/shader.c | 81 ++++++++++++++++++++++++++--------------------- 1 files changed, 45 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 958c4e8..6a67f04 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -648,6 +648,33 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) return 4 * desc->Elements * desc->Rows * desc->Columns; } +static ctab_constant *is_valid_constant(ID3DXConstantTableImpl *This, D3DXHANDLE parameter) +{ + UINT i; + + for (i = 0; i < This->desc.Constants; i++) + if ((ctab_constant *)parameter == &This->constants[i]) + return (ctab_constant *)parameter; + + return NULL; +} + +static ctab_constant *lookup_constant_by_name(ID3DXConstantTableImpl *This, ctab_constant *c, LPCSTR name) +{ + UINT i; + + TRACE("(%p, %p, %s)\n", This, c, name); + + if (c) + FIXME("Only top level constant supported\n"); + + for (i = 0; i < This->desc.Constants; i++) + if (!strcmp(This->constants[i].desc.Name, name)) + return &This->constants[i]; + + return NULL; +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) { @@ -741,16 +768,13 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* return D3DERR_INVALIDCALL; /* Applications can pass the name of the constant in place of the handle */ - if (!((UINT_PTR)constant >> 16)) - constant_info = &This->constants[(UINT_PTR)constant - 1]; + if (is_valid_constant(This, constant)) + constant_info = (ctab_constant *)constant; else - { - D3DXHANDLE c = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); - if (!c) - return D3DERR_INVALIDCALL; + constant_info = lookup_constant_by_name(This, NULL, (LPCSTR)constant); - constant_info = &This->constants[(UINT_PTR)c - 1]; - } + if (!constant_info) + return D3DERR_INVALIDCALL; if (desc) *desc = constant_info->desc; @@ -785,39 +809,33 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* TRACE("(%p)->(%p, %d)\n", This, constant, index); - if (constant) + if (!constant) { - FIXME("Only top level constants supported\n"); - return NULL; - } + if (index >= This->desc.Constants) + return NULL; - if (index >= This->desc.Constants) + return (D3DXHANDLE)&This->constants[index]; + } + else + { + FIXME("Only top level constant supported\n"); return NULL; - - return (D3DXHANDLE)(DWORD_PTR)(index + 1); + } } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable* iface, D3DXHANDLE constant, LPCSTR name) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - UINT i; TRACE("(%p)->(%p, %s)\n", This, constant, name); if (!name) return NULL; - if (constant) - { - FIXME("Only top level constants supported\n"); + if (!constant || is_valid_constant(This, constant)) + return (D3DXHANDLE)lookup_constant_by_name(This, (ctab_constant *)constant, name); + else return NULL; - } - - for (i = 0; i < This->desc.Constants; i++) - if (!strcmp(This->constants[i].desc.Name, name)) - return (D3DXHANDLE)(DWORD_PTR)(i + 1); - - return NULL; } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) @@ -1217,13 +1235,6 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, if (ctab_header->Target) TRACE("Target = %s\n", object->ctab + ctab_header->Target); - if (object->desc.Constants > 65535) - { - FIXME("Too many constants (%u)\n", object->desc.Constants); - hr = E_NOTIMPL; - goto error; - } - object->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object->constants) * object->desc.Constants); if (!object->constants) @@ -1255,9 +1266,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, error: - HeapFree(GetProcessHeap(), 0, object->constants); - HeapFree(GetProcessHeap(), 0, object->ctab); - HeapFree(GetProcessHeap(), 0, object); + ID3DXConstantTableImpl_Release((ID3DXConstantTable *)object); return hr; }

1 0

Rico Schüller : d3dx9: Implement D3DXGetShaderSamplers ().
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: c42ee0339a8aa6069712059ccc6b3e72d10e9d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42ee0339a8aa6069712059cc… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jul 15 10:52:36 2011 +0200 d3dx9: Implement D3DXGetShaderSamplers(). --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 62 +++++++++++++++++++++++ dlls/d3dx9_36/tests/shader.c | 111 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 1 + 4 files changed, 175 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c42ee0339a8aa60697120…

1 0

Vincent Povirk : gdiplus: Fix use of uninitialized memory.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 171e832839c082b55e7e44161d82bd58aa3b056e URL: http://source.winehq.org/git/wine.git/?a=commit;h=171e832839c082b55e7e44161… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 15 13:21:09 2011 -0500 gdiplus: Fix use of uninitialized memory. --- dlls/gdiplus/graphics.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1e3f946..324b895 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4713,6 +4713,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string args.graphics = graphics; args.brush = brush; + args.x = rect->X; + args.y = rect->Y; + args.rel_width = rel_width; args.rel_height = rel_height;

1 0

Frédéric Delanoy : cmd/tests: Convert line endings to DOS style at runtime before running batch test file .
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 1cb7378e94bc15d8223af824f0d691fb478d0e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb7378e94bc15d8223af824f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 16 10:14:50 2011 +0200 cmd/tests: Convert line endings to DOS style at runtime before running batch test file. --- programs/cmd/tests/batch.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 03c2b56..2715b11 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,22 +25,39 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; -/* Substitute escaped spaces with real ones */ -static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size) +/* Convert to DOS line endings, and substitute escaped spaces with real ones */ +static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) { - static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'}; + static const char escaped_space[] = {'@','s','p','a','c','e','@'}; + DWORD i, eol_count = 0; char *ptr, *new_data; - new_data = ptr = HeapAlloc(GetProcessHeap(), 0, size + 1); - memcpy( new_data, data, size ); - new_data[size] = 0; - - while ((ptr = strstr(ptr, escaped_space))) - { - char *end = ptr + sizeof(escaped_space) - 1; - *ptr++ = ' '; - memmove( ptr, end, strlen(end) + 1 ); + for (i = 0; i < size; i++) + if (data[i] == '\n') eol_count++; + + ptr = new_data = HeapAlloc(GetProcessHeap(), 0, size + eol_count + 1); + + for (i = 0; i < size; i++) { + switch (data[i]) { + case '\n': + *ptr++ = '\r'; + *ptr++ = '\n'; + break; + case '@': + if (data + i + sizeof(escaped_space) - 1 < data + size + && !memcmp(data + i, escaped_space, sizeof(escaped_space))) { + *ptr++ = ' '; + i += sizeof(escaped_space) - 1; + } else { + *ptr++ = data[i]; + } + break; + default: + *ptr++ = data[i]; + } } + *ptr = '\0'; + *new_size = strlen(new_data); return new_data; } @@ -233,7 +250,7 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, const char *out_data, *actual_cmd_data; DWORD out_size, actual_cmd_size; - actual_cmd_data = replace_escaped_spaces(cmd_data, cmd_size, &actual_cmd_size); + actual_cmd_data = convert_input_data(cmd_data, cmd_size, &actual_cmd_size); if(!actual_cmd_size || !actual_cmd_data) goto cleanup;

1 0

Austin English : wine.inf: Create %systemroot%\logs directory by default.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 2a708ee94db84276e4b72e13cbb124e67aa0fb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a708ee94db84276e4b72e13c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 16 12:10:22 2011 -0500 wine.inf: Create %systemroot%\logs directory by default. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d9159dd..69124be 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2600,6 +2600,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ; create some directories first 10,help, 10,inf, +10,logs, 10,temp, 11,mui, 11,spool\drivers\color,

1 0