May 2007 - Wine-commits - list.winehq.org

James Hawkins : msxml3: Add tests for IXMLDocument.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: e24667cc6e5f5dd1e3434d9073496970130de4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24667cc6e5f5dd1e3434d907… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:23:10 2007 -0700 msxml3: Add tests for IXMLDocument. --- dlls/msxml3/tests/Makefile.in | 1 + dlls/msxml3/tests/xmldoc.c | 329 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 330 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e24667cc6e5f5dd1e3434…

1 0

James Hawkins : msxml3: Add initial implementation of IXMLElement and IXMLElementCollection.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 74f18d968ffb75a307932879810ecf87b4c9f915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f18d968ffb75a3079328798… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:12:19 2007 -0700 msxml3: Add initial implementation of IXMLElement and IXMLElementCollection. --- dlls/msxml3/Makefile.in | 3 +- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/xmlelem.c | 725 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 729 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74f18d968ffb75a307932…

1 0

James Hawkins : msxml3: Add initial implementation of IXMLDocument.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: f5e9a1ea6f6eb7e750ff09060937ea91012b8985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e9a1ea6f6eb7e750ff09060… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:13:06 2007 -0700 msxml3: Add initial implementation of IXMLDocument. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/factory.c | 10 +- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/xmldoc.c | 655 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 666 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e9a1ea6f6eb7e750ff0…

1 0

James Hawkins : msxml3: Add tests for IXMLElement and IXMLElementCollection .
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 9c04d0d8ca8811f5ddfc66c987c83a50075a1da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c04d0d8ca8811f5ddfc66c98… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:13:43 2007 -0700 msxml3: Add tests for IXMLElement and IXMLElementCollection. --- dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmlelem.c | 449 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 451 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c04d0d8ca8811f5ddfc6…

1 0

Huw Davies : oleaut32: SLTG references are only unique at the typeinfo level, so convert them to be unique to the typelib.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: cd3df383a535ffa0534c93202be4bb82654f3e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3df383a535ffa0534c93202… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 23 11:50:59 2007 +0100 oleaut32: SLTG references are only unique at the typeinfo level, so convert them to be unique to the typelib. --- dlls/oleaut32/typelib.c | 108 +++++++++++++++++++++++++++++++++------------- 1 files changed, 77 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd3df383a535ffa0534c9…

1 0

Dan Hipschman : widl: Allow types that reference themselves.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 8f7a5d63ec8a96d24c8f56eca7f49b390e1de9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7a5d63ec8a96d24c8f56eca… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu May 24 17:50:02 2007 -0700 widl: Allow types that reference themselves. --- dlls/rpcrt4/tests/server.c | 45 +++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 12 ++++++ dlls/rpcrt4/tests/server_defines.h | 4 ++ tools/widl/parser.y | 1 + tools/widl/typegen.c | 69 +++++++++++++++++++++++++----------- tools/widl/widltypes.h | 1 + 6 files changed, 111 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f7a5d63ec8a96d24c8f5…

1 0

Juan Lang : crypt32: Statically initialize static lists and critical sections.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 82a31d09a1493a326e8a7aa9c0c651d37cb0de72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a31d09a1493a326e8a7aa9c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 24 16:42:45 2007 -0700 crypt32: Statically initialize static lists and critical sections. --- dlls/crypt32/oid.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 1865f97..4b51a70 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -37,14 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static const WCHAR DllW[] = { 'D','l','l',0 }; -static void init_function_sets(void); static void init_oid_info(HINSTANCE hinst); static void free_function_sets(void); static void free_oid_info(void); void crypt_oid_init(HINSTANCE hinst) { - init_function_sets(); init_oid_info(hinst); } @@ -55,7 +53,14 @@ void crypt_oid_free(void) } static CRITICAL_SECTION funcSetCS; -static struct list funcSets; +static CRITICAL_SECTION_DEBUG funcSetCSDebug = +{ + 0, 0, &funcSetCS, + { &funcSetCSDebug.ProcessLocksList, &funcSetCSDebug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": funcSetCS") } +}; +static CRITICAL_SECTION funcSetCS = { &funcSetCSDebug, -1, 0, 0, 0, 0 }; +static struct list funcSets = { &funcSets, &funcSets }; struct OIDFunctionSet { @@ -72,13 +77,6 @@ struct OIDFunction struct list next; }; -static void init_function_sets(void) -{ - InitializeCriticalSection(&funcSetCS); - funcSetCS.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": funcSetCS"); - list_init(&funcSets); -} - static void free_function_sets(void) { struct OIDFunctionSet *setCursor, *setNext; @@ -100,8 +98,6 @@ static void free_function_sets(void) DeleteCriticalSection(&setCursor->cs); CryptMemFree(setCursor); } - funcSetCS.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&funcSetCS); } /* There is no free function associated with this; therefore, the sets are @@ -849,7 +845,14 @@ LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName) } static CRITICAL_SECTION oidInfoCS; -static struct list oidInfo; +static CRITICAL_SECTION_DEBUG oidInfoCSDebug = +{ + 0, 0, &oidInfoCS, + { &oidInfoCSDebug.ProcessLocksList, &oidInfoCSDebug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": oidInfoCS") } +}; +static CRITICAL_SECTION oidInfoCS = { &oidInfoCSDebug, -1, 0, 0, 0, 0 }; +static struct list oidInfo = { &oidInfo, &oidInfo }; static const WCHAR tripledes[] = { '3','d','e','s',0 }; static const WCHAR cms3deswrap[] = { 'C','M','S','3','D','E','S','w','r','a', @@ -1190,9 +1193,6 @@ static void init_oid_info(HINSTANCE hinst) { DWORD i; - InitializeCriticalSection(&oidInfoCS); - oidInfoCS.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": oidInfoCS"); - list_init(&oidInfo); for (i = 0; i < sizeof(oidInfoConstructors) / sizeof(oidInfoConstructors[0]); i++) { @@ -1264,8 +1264,6 @@ static void free_oid_info(void) list_remove(&info->entry); CryptMemFree(info); } - oidInfoCS.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&oidInfoCS); } /***********************************************************************

1 0

Dan Hipschman : widl: Handle pointers in unions.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 00ce411231b4dd94fef20e98b1a9c08c3321670e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ce411231b4dd94fef20e98b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu May 24 17:48:39 2007 -0700 widl: Handle pointers in unions. Unify write_pointers with write_embedded_types, and handle pointers in unions. Includes tests. --- dlls/rpcrt4/tests/server.c | 8 ++ dlls/rpcrt4/tests/server.idl | 1 + dlls/rpcrt4/tests/server_defines.h | 1 + tools/widl/typegen.c | 135 +++++++++++++++++------------------- 4 files changed, 74 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00ce411231b4dd94fef20…

1 0

Dan Hipschman : widl: Shrink type_t structure.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 9c30da77ba074d18f2d52891c9bbb32ede6e96a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c30da77ba074d18f2d52891c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu May 24 17:49:21 2007 -0700 widl: Shrink type_t structure. --- tools/widl/parser.y | 2 +- tools/widl/widltypes.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b70dab8..60d7d14 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1200,7 +1200,7 @@ static type_t *make_type(unsigned char type, type_t *ref) t->fields = NULL; t->ifaces = NULL; t->typestring_offset = 0; - t->ignore = parse_only; + t->ignore = (parse_only != 0); t->is_const = FALSE; t->sign = 0; t->defined = FALSE; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 946581a..4d8b6d4 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -208,9 +208,13 @@ struct _type_t { ifref_list_t *ifaces; /* coclasses */ type_t *orig; /* dup'd types */ unsigned int typestring_offset; - int ignore, is_const, sign; - int defined, written, user_types_registered; int typelib_idx; + unsigned int ignore : 1; + unsigned int is_const : 1; + unsigned int defined : 1; + unsigned int written : 1; + unsigned int user_types_registered : 1; + int sign : 2; }; struct _var_t {

1 0

Maarten Lankhorst : dsound: Block align SetCurrentPosition and add test for it.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 236035894407181e75d149aae71eda56c4936841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=236035894407181e75d149aae… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 24 20:42:14 2007 +0200 dsound: Block align SetCurrentPosition and add test for it. --- dlls/dsound/buffer.c | 1 + dlls/dsound/tests/dsound.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 252fbc8..b1cecd7 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -687,6 +687,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition( EnterCriticalSection(&(This->lock)); newpos %= This->buflen; + newpos -= newpos%This->pwfx->nBlockAlign; This->buf_mixpos = newpos; if (This->hwbuf) { hres = IDsDriverBuffer_SetPosition(This->hwbuf, This->buf_mixpos); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 6f95264..cbb6829 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -9,6 +9,7 @@ * So this is only done if the test is being run in interactive mode. * * Copyright (c) 2002-2004 Francois Gouget + * Copyright (c) 2007 Maarten Lankhorst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -764,6 +765,7 @@ static HRESULT test_block_align(LPGUID lpGuid) DSBUFFERDESC bufdesc; DSBCAPS dsbcaps; WAVEFORMATEX wfx; + DWORD pos, pos2; int ref; /* Create the DirectSound object */ @@ -790,11 +792,23 @@ static HRESULT test_block_align(LPGUID lpGuid) rc=IDirectSoundBuffer_GetCaps(secondary,&dsbcaps); ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() should have returned DS_OK, " "returned: %s\n", DXGetErrorString8(rc)); - if (rc==DS_OK) + if (rc==DS_OK && wfx.nBlockAlign > 1) + { ok(dsbcaps.dwBufferBytes==(wfx.nAvgBytesPerSec + wfx.nBlockAlign), "Buffer size not a multiple of nBlockAlign: requested %d, " "got %d, should be %d\n", bufdesc.dwBufferBytes, dsbcaps.dwBufferBytes, wfx.nAvgBytesPerSec + wfx.nBlockAlign); + + rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 0); + ok(rc == DS_OK, "Could not set position to 0: %s\n", DXGetErrorString8(rc)); + rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos, NULL); + ok(rc == DS_OK, "Could not get position: %s\n", DXGetErrorString8(rc)); + rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 1); + ok(rc == DS_OK, "Could not set position to 1: %s\n", DXGetErrorString8(rc)); + rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos2, NULL); + ok(rc == DS_OK, "Could not get new position: %s\n", DXGetErrorString8(rc)); + ok(pos == pos2, "Positions not the same! Old position: %d, new position: %d\n", pos, pos2); + } ref=IDirectSoundBuffer_Release(secondary); ok(ref==0,"IDirectSoundBuffer_Release() secondary has %d references, " "should have 0\n",ref);

1 0