January 2010 - Wine-Commits

Paul Vriens : ntdll/tests: Fix a test failure on NT4.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: acfada959bcca92eb59ddb3d98bf48c41a0dd777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfada959bcca92eb59ddb3d9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 8 22:29:20 2010 +0100 ntdll/tests: Fix a test failure on NT4. --- dlls/ntdll/tests/om.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1bab21d..d052c35 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -677,7 +677,9 @@ static void test_query_object(void) ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; - ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len, "unexpected len %u\n", len ); + ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len || + broken(sizeof(UNICODE_STRING) + str->Length == len), /* NT4 */ + "unexpected len %u\n", len ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); pNtClose( handle ); }

1 0

Gerald Pfeifer : krnl386: Move WINE_DECLARE_DEBUG_CHANNEL(module) under #ifdef MZ_SUPPORTED.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: a1e134961d99c64cf5d6f55b2880ccb76b4ba01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e134961d99c64cf5d6f55b2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 8 23:32:20 2010 +0100 krnl386: Move WINE_DECLARE_DEBUG_CHANNEL(module) under #ifdef MZ_SUPPORTED. --- dlls/krnl386.exe16/dosvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosvm.c b/dlls/krnl386.exe16/dosvm.c index 3db0649..decd57e 100644 --- a/dlls/krnl386.exe16/dosvm.c +++ b/dlls/krnl386.exe16/dosvm.c @@ -55,8 +55,8 @@ #include "excpt.h" WINE_DEFAULT_DEBUG_CHANNEL(int); -WINE_DECLARE_DEBUG_CHANNEL(module); #ifdef MZ_SUPPORTED +WINE_DECLARE_DEBUG_CHANNEL(module); WINE_DECLARE_DEBUG_CHANNEL(relay); #endif

1 0

Nikolay Sivov : msxml3: Don't leak externaly allocated xmlSAXHandler.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: e4d895c7eeca8448b3ebabc4aef72923c6c64090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d895c7eeca8448b3ebabc4a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 10 18:17:37 2010 +0300 msxml3: Don't leak externaly allocated xmlSAXHandler. --- dlls/msxml3/saxreader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 90600eb..6cf95d1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1787,6 +1787,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz return E_FAIL; } + xmlFree(locator->pParserCtxt->sax); locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator;

1 0

Nikolay Sivov : msxml3: Don' t lose pointer to externaly allocated xmlSAXHandler copy.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: b122cd7a1cbb7d3c320c99f1f3ff6d6a425a756b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b122cd7a1cbb7d3c320c99f1f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 10 18:24:41 2010 +0300 msxml3: Don't lose pointer to externaly allocated xmlSAXHandler copy. --- dlls/msxml3/saxreader.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 6cf95d1..a69b0e6 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1853,7 +1853,6 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt } This->isParsing = FALSE; - locator->pParserCtxt->sax = NULL; xmlFreeParserCtxt(locator->pParserCtxt); locator->pParserCtxt = NULL; ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl);

1 0

Rico Schüller : d3d10: Parse effect shaders as anonymous shaders.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 0b4e6c71b5028c0492bbdf0ff2dd4e837710cb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4e6c71b5028c0492bbdf0ff… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 10 19:30:42 2010 +0100 d3d10: Parse effect shaders as anonymous shaders. --- dlls/d3d10/d3d10_private.h | 18 +++- dlls/d3d10/effect.c | 240 +++++++++++++++++++++++++++++++------------- 2 files changed, 188 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b4e6c71b5028c0492bbd…

1 0

Rico Schüller : d3d10: Reorder struct d3d10_effect_variable to make the initialisation nicer.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 0682453d142c1ab848a103d6a7035203e3ec3787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0682453d142c1ab848a103d6a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 10 19:30:36 2010 +0100 d3d10: Reorder struct d3d10_effect_variable to make the initialisation nicer. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 80 +++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 49 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 5bf59b1..6fa60dd 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -102,6 +102,7 @@ struct d3d10_effect_variable const struct ID3D10EffectVariableVtbl *vtbl; struct d3d10_effect_variable *buffer; + struct d3d10_effect_type *type; struct d3d10_effect *effect; char *name; @@ -110,7 +111,6 @@ struct d3d10_effect_variable DWORD annotation_count; DWORD flag; DWORD data_size; - struct d3d10_effect_type *type; struct d3d10_effect_variable *elements; struct d3d10_effect_variable *members; struct d3d10_effect_variable *annotations; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 65ad689..12535aa 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2009 Rico Schüller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,54 +65,37 @@ static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variabl static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ -static struct d3d10_effect_technique null_technique = - {&d3d10_effect_technique_vtbl, NULL, NULL, 0, 0, NULL, NULL}; -static struct d3d10_effect_pass null_pass = - {&d3d10_effect_pass_vtbl, NULL, NULL, 0, 0, 0, NULL, NULL}; -static struct d3d10_effect_type null_type = - {&d3d10_effect_type_vtbl, 0, {NULL, NULL, 0}, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL}; -static struct d3d10_effect_variable null_local_buffer = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_variable = - {&d3d10_effect_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_scalar_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_vector_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_matrix_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_string_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_string_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_shader_resource_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_shader_resource_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_render_target_view_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_render_target_view_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_depth_stencil_view_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_view_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_shader_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_blend_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_blend_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_depth_stencil_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_rasterizer_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_rasterizer_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; -static struct d3d10_effect_variable null_sampler_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_sampler_variable_vtbl, &null_local_buffer, - NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; +static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl}; +static struct d3d10_effect_pass null_pass = {&d3d10_effect_pass_vtbl}; +static struct d3d10_effect_type null_type = {&d3d10_effect_type_vtbl}; +static struct d3d10_effect_variable null_local_buffer = {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_variable = {&d3d10_effect_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_scalar_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_vector_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_matrix_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_string_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_string_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_shader_resource_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_shader_resource_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_render_target_view_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_render_target_view_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_depth_stencil_view_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_view_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_shader_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_blend_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_blend_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_depth_stencil_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_rasterizer_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_rasterizer_variable_vtbl, + &null_local_buffer, &null_type}; +static struct d3d10_effect_variable null_sampler_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_sampler_variable_vtbl, + &null_local_buffer, &null_type}; static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset);

1 0

Nikolay Sivov : msxml3: Fix string leak while parsing with IXMLDOMDocument.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 73a955efff900802854889f9606cf1f80ec79a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a955efff900802854889f96… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 10 18:46:30 2010 +0300 msxml3: Fix string leak while parsing with IXMLDOMDocument. --- dlls/msxml3/saxreader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a69b0e6..2573e84 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2045,6 +2045,7 @@ static HRESULT internal_parse( hr = internal_parseBuffer(This, (const char*)bstrData, SysStringByteLen(bstrData), vbInterface); IXMLDOMDocument_Release(xmlDoc); + SysFreeString(bstrData); break; } if(IUnknown_QueryInterface(V_UNKNOWN(&varInput),

1 0

André Hentschel : kernel32/tests: Simplify string generation.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: b45d4aa161fbbb905fa9142d2757ff3f7952566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45d4aa161fbbb905fa9142d2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 10 17:44:43 2010 +0100 kernel32/tests: Simplify string generation. --- dlls/kernel32/tests/atom.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 84013b9..f85d272 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -32,6 +32,7 @@ static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; static const WCHAR FOOBARW[] = {'F','O','O','B','A','R',0}; static const WCHAR _foobarW[] = {'_','f','o','o','b','a','r',0}; +static const WCHAR integfmt[] = {'#','%','d',0}; static void do_initA(char* tmp, const char* pattern, int len) { @@ -57,21 +58,6 @@ static void do_initW(WCHAR* tmp, const char* pattern, int len) *tmp = '\0'; } -static void print_integral( WCHAR* buffer, int atom ) -{ - BOOL first = TRUE; - -#define X(v) { if (atom >= v) {*buffer++ = '0' + atom / v; first = FALSE; } else if (!first || v == 1) *buffer++ = '0'; atom %= v; } - *buffer++ = '#'; - X(10000); - X(1000); - X(100); - X(10); - X(1); - *buffer = '\0'; -#undef X -} - static BOOL unicode_OS; static void test_add_atom(void) @@ -281,7 +267,7 @@ static void test_get_atom_name(void) WCHAR res[20]; ok( (len > 1) && (len < 7), "bad length %d\n", len ); - print_integral( res, i ); + wsprintfW( res, integfmt, i ); memset( res + lstrlenW(res) + 1, 'a', 10 * sizeof(WCHAR)); ok( !memcmp( res, outW, 10 * sizeof(WCHAR) ), "bad buffer contents for %d\n", i ); if (len <= 1 || len >= 7) break; /* don't bother testing all of them */ @@ -552,7 +538,7 @@ static void test_local_get_atom_name(void) WCHAR res[20]; ok( (len > 1) && (len < 7), "bad length %d\n", len ); - print_integral( res, i ); + wsprintfW( res, integfmt, i ); memset( res + lstrlenW(res) + 1, 'a', 10 * sizeof(WCHAR)); ok( !memcmp( res, outW, 10 * sizeof(WCHAR) ), "bad buffer contents for %d\n", i ); }

1 0

Nikolay Sivov : msxml3/tests: Fix some string leaks in tests.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 1c040a38c6a2ac947c56bff72f87725e463a0162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c040a38c6a2ac947c56bff72… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 10 18:44:59 2010 +0300 msxml3/tests: Fix some string leaks in tests. --- dlls/msxml3/tests/saxreader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index dd0e42c..a932bf9 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -520,6 +520,8 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); + VariantClear(&var); + SADim[0].lLbound= 0; SADim[0].cElements= sizeof(szTestXML)-1; pSA = SafeArrayCreate(VT_UI1, 1, SADim); @@ -560,6 +562,8 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); + VariantClear(&var); + file = CreateFileA(testXmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); WriteFile(file, szTestXML, sizeof(szTestXML)-1, &bytesWritten, NULL); @@ -591,6 +595,7 @@ static void test_saxreader(void) IXMLDOMDocument_Release(domDocument); ISAXXMLReader_Release(reader); + SysFreeString(bstrData); } START_TEST(saxreader)

1 0

Alexander Kochetkov : user32: Fix arithmetic overflow in GetThumbVal.
by Alexandre Julliard Jan. 11, 2010

Jan. 11, 2010

Module: wine Branch: master Commit: 8037de9f020d58b9072fa44620df5a60f4ec5e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8037de9f020d58b9072fa4462… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Sat Jan 9 15:24:44 2010 +0300 user32: Fix arithmetic overflow in GetThumbVal. --- dlls/user32/scroll.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 6c34652..423dea1 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -317,6 +317,7 @@ static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect, { INT thumbSize; INT pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left; + INT range; if ((pixels -= 2*(GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP)) <= 0) return infoPtr->minVal; @@ -333,9 +334,12 @@ static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect, pos = max( 0, pos - (GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP) ); if (pos > pixels) pos = pixels; - if (!infoPtr->page) pos *= infoPtr->maxVal - infoPtr->minVal; - else pos *= infoPtr->maxVal - infoPtr->minVal - infoPtr->page + 1; - return infoPtr->minVal + ((pos + pixels / 2) / pixels); + if (!infoPtr->page) + range = infoPtr->maxVal - infoPtr->minVal; + else + range = infoPtr->maxVal - infoPtr->minVal - infoPtr->page + 1; + + return infoPtr->minVal + MulDiv(pos, range, pixels); } /***********************************************************************

1 0