February 2006 - Wine-commits

lostwages/templates/en status.template status_ ...
by Jeremy Newman 10 Feb '06

10 Feb '06

ChangeSet ID: 22937 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/10 14:53:07 Modified files: templates/en : status.template status_changelog.template status_dlls.template status_multimedia.template status_wine.template Log message: Tom Wickline <twickline(a)gmail.com> Status pages update Patch: http://cvs.winehq.org/patch.py?id=22937 Old revision New revision Changes Path 1.41 1.42 +1 -1 lostwages/templates/en/status.template 1.42 1.43 +57 -188 lostwages/templates/en/status_changelog.template 1.36 1.37 +39 -39 lostwages/templates/en/status_dlls.template 1.16 1.17 +8 -8 lostwages/templates/en/status_multimedia.template 1.25 1.26 +16 -9 lostwages/templates/en/status_wine.template

1 0

lostwages/templates/en press.template
by Jeremy Newman 10 Feb '06

10 Feb '06

ChangeSet ID: 22936 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/10 14:51:50 Modified files: templates/en : press.template Log message: Tom Wickline <twickline(a)gmail.com> Update the press page Patch: http://cvs.winehq.org/patch.py?id=22936 Old revision New revision Changes Path 1.35 1.36 +3 -2 lostwages/templates/en/press.template Index: lostwages/templates/en/press.template diff -u -p lostwages/templates/en/press.template:1.35 lostwages/templates/en/press.template:1.36 --- lostwages/templates/en/press.template:1.35 10 Feb 2006 20:51:50 -0000 +++ lostwages/templates/en/press.template 10 Feb 2006 20:51:50 -0000 @@ -3,9 +3,10 @@ <h1>Press articles covering Wine</h1> <ul> + <li> <a href="http://www.codeweavers.com/about/general/press/?id=20060208">CodeWeavers</a> February 8, 2006 - CrossOver Office for Linspire + <li> <a href="http://www.lugradio.org/episodes/43">LugRadio</a> January 30, 2006 - It's called Wine because we whine a lot + <li> <a href="http://www.linuxtoday.com/news_story.php3?ltsn=2006-01-03-013-26-PS">LinuxToday</a> January 3, 2006 - Gentoo-Wiki: HOWTO Install GoogleEarth with Wine <li> <a href="http://software.newsforge.com/article.pl?sid=05/12/14/1716222&tid=130">NewsForge</a> December 23, 2005 - Review: CrossOver Office 5 - <li> <a href="http://archives.free.net.ph/message/20051213.230208.4eba3398.en.html">archives.free.net.ph</a> December 13, 2005 - WineTools 0.9 III released - <li> <a href=" http://madpenguin.org/cms/index.php/index.php?m=show&id=5679">MadPenguin</a> November 30, 2005 - Installing IE6 on Linux Using WineTools <li> <a href="http://insight.zdnet.co.uk/software/linuxunix/0,39020472,39238665,00.htm">ZDNet/UK</a> November 28, 2005 - So why not put Linux on your business desktops? <li> <a href="http://www.linux-gamers.net/modules/news/article.php?storyid=1051">Linux-Gamers</a> November 21, 2005 - DirectX for Wine <li> <a href="http://www.eweek.com/article2/0,1895,1886920,00.asp">EWeek</a> November 14, 2005 - CrossOver Puts Windows Programs on Linux OS

1 0

docs/en winedev-coding.sgml
by Dimi Paun 10 Feb '06

10 Feb '06

ChangeSet ID: 1139586853911686998865665 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/02/10 07:54:13 Modified files: en : winedev-coding.sgml Log message: Add a few words on adding a new directory to the wine tree. Based on a patch by Jeff Latimer. Old revision New revision Changes Path 1.4 1.5 +7 -0 docs/en/winedev-coding.sgml Index: docs/en/winedev-coding.sgml diff -u -p docs/en/winedev-coding.sgml:1.4 docs/en/winedev-coding.sgml:1.5 --- docs/en/winedev-coding.sgml 10 Feb 2006 15:54:13 -0000 +++ /dev/null 10 Feb 2006 15:54:13 -0000 @@ -56,6 +56,13 @@ newdir/</command> in case of multiple new files to add. </para> <para> + When adding a new directory that contains a + <filename>Makefile.in</filename>, you must ensure that + <filename>configure.ac</filename> references it. + Naturally, your patch should include all the changes you + made to integrate the new directory into the tree. + </para> + <para> For removals, clearly list the files in the description of the patch. </para>

1 0

Uwe Bonnes : msvcrt: In _mktemp sixth generated charater always starts with 'a'.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: b53ed5866df3e18ed7dc17501fa6fb49f448c7c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b53ed5866df3e18ed7dc175… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Fri Feb 10 15:52:47 2006 +0100 msvcrt: In _mktemp sixth generated charater always starts with 'a'. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b6897b2..7c7df8f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1266,11 +1266,11 @@ char *_mktemp(char *pattern) pattern++; do { + *pattern = letter++; if (GetFileAttributesA(retVal) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND) return retVal; - *pattern = letter++; - } while(letter != '|'); + } while(letter <= 'z'); return NULL; }

1 0

Huw Davies : msxml: Add ISupportErrorInfo for named node maps.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: 5673a58297d5b7cbc75d6a5357974c625f299474 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5673a58297d5b7cbc75d6a5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 10 15:14:33 2006 +0100 msxml: Add ISupportErrorInfo for named node maps. --- dlls/msxml3/nodemap.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 11 ++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 5166020..4edb950 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xmlnodemap { const struct IXMLDOMNamedNodeMapVtbl *lpVtbl; + const struct ISupportErrorInfoVtbl *lpSEIVtbl; LONG ref; IXMLDOMNode *node; } xmlnodemap; @@ -50,19 +51,28 @@ static inline xmlnodemap *impl_from_IXML return (xmlnodemap *)((char*)iface - FIELD_OFFSET(xmlnodemap, lpVtbl)); } +static inline xmlnodemap *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return (xmlnodemap *)((char*)iface - FIELD_OFFSET(xmlnodemap, lpSEIVtbl)); +} + static HRESULT WINAPI xmlnodemap_QueryInterface( IXMLDOMNamedNodeMap *iface, REFIID riid, void** ppvObject ) { + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); - if( IsEqualGUID( riid, &IID_IXMLDOMElement ) || - IsEqualGUID( riid, &IID_IUnknown ) || + if( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + IsEqualGUID( riid, &IID_IXMLDOMNamedNodeMap ) ) { *ppvObject = iface; } + else if( IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *ppvObject = &This->lpSEIVtbl; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -321,6 +331,46 @@ static const struct IXMLDOMNamedNodeMapV xmlnodemap__newEnum, }; +static HRESULT WINAPI support_error_QueryInterface( + ISupportErrorInfo *iface, + REFIID riid, void** ppvObject ) +{ + xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + + return IXMLDOMNamedNodeMap_QueryInterface((IXMLDOMNamedNodeMap*)&This->lpVtbl, riid, ppvObject); +} + +static ULONG WINAPI support_error_AddRef( + ISupportErrorInfo *iface ) +{ + xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); + return IXMLDOMNamedNodeMap_AddRef((IXMLDOMNamedNodeMap*)&This->lpVtbl); +} + +static ULONG WINAPI support_error_Release( + ISupportErrorInfo *iface ) +{ + xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); + return IXMLDOMNamedNodeMap_Release((IXMLDOMNamedNodeMap*)&This->lpVtbl); +} + +static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo( + ISupportErrorInfo *iface, + REFIID riid ) +{ + FIXME("(%p)->(%s)\n", iface, debugstr_guid(riid)); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + support_error_QueryInterface, + support_error_AddRef, + support_error_Release, + support_error_InterfaceSupportsErrorInfo +}; + IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ) { xmlnodemap *nodemap; @@ -330,6 +380,7 @@ IXMLDOMNamedNodeMap *create_nodemap( IXM return NULL; nodemap->lpVtbl = &xmlnodemap_vtbl; + nodemap->lpSEIVtbl = &support_error_vtbl; nodemap->node = node; nodemap->ref = 1; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5d745ce..901afc5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -347,6 +347,17 @@ void test_domnode( void ) if (map) { + ISupportErrorInfo *support_error; + r = IXMLDOMNamedNodeMap_QueryInterface( map, &IID_ISupportErrorInfo, (LPVOID*)&support_error ); + ok( r == S_OK, "ret %08lx\n", r ); + + r = ISupportErrorInfo_InterfaceSupportsErrorInfo( support_error, &IID_IXMLDOMNamedNodeMap ); +todo_wine +{ + ok( r == S_OK, "ret %08lx\n", r ); +} + ISupportErrorInfo_Release( support_error ); + str = SysAllocString( szdl ); r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_OK, "getNamedItem returned wrong code\n");

1 0

Jacek Caban : mshtml: Added more defines to mshtmlhst.idl.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: adb1335e4e458968dbce03e087c66d51783e91cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=adb1335e4e458968dbce03e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 15:14:14 2006 +0100 mshtml: Added more defines to mshtmlhst.idl. --- dlls/mshtml/persist.c | 6 +----- dlls/mshtml/tests/htmldoc.c | 7 ++----- include/mshtmhst.idl | 13 +++++++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 3bef7a5..ae883a0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -301,10 +301,6 @@ static HRESULT WINAPI PersistMoniker_Loa if(pibc) { IUnknown *unk = NULL; - static WCHAR wszClientSiteParam[] = {'{','d','4','d','b','6','8','5','0','-', - '5','3','8','5','-','1','1','d','0','-','8','9','e','9','-','0','0','a', - '0','c','9','0','a','9','0','a','c','}',0}; - /* FIXME: * Use params: * "__PrecreatedObject" @@ -317,7 +313,7 @@ static HRESULT WINAPI PersistMoniker_Loa * "_EnumFORMATETC_" */ - IBindCtx_GetObjectParam(pibc, wszClientSiteParam, &unk); + IBindCtx_GetObjectParam(pibc, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, &unk); if(unk) { IOleClientSite *client = NULL; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index e4c638b..fee6565 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -34,7 +34,6 @@ #include "initguid.h" DEFINE_SHLGUID(CGID_Undocumented, 0x000214D4L, 0, 0); -DEFINE_GUID(CGID_MSHTML, 0xDE4BA900,0x59CA,0x11CF,0x95,0x92, 0x44,0x45,0x53,0x54,0x00,0x00); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -1262,9 +1261,6 @@ static void test_Load(IPersistMoniker *p IBindCtx *bind; HRESULT hres; - static WCHAR wszClientSiteParam[] = {'{','d','4','d','b','6','8','5','0','-', - '5','3','8','5','-','1','1','d','0','-','8','9','e','9','-','0','0','a', - '0','c','9','0','a','9','0','a','c','}',0}; static const WCHAR wszWineHQ[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; @@ -1274,7 +1270,8 @@ static void test_Load(IPersistMoniker *p return; CreateBindCtx(0, &bind); - IBindCtx_RegisterObjectParam(bind, wszClientSiteParam, (IUnknown*)&ClientSite); + IBindCtx_RegisterObjectParam(bind, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, + (IUnknown*)&ClientSite); SET_EXPECT(GetHostInfo); SET_EXPECT(GetOptionKeyPath); diff --git a/include/mshtmhst.idl b/include/mshtmhst.idl index 1ed8b90..41c3ed0 100644 --- a/include/mshtmhst.idl +++ b/include/mshtmhst.idl @@ -48,6 +48,17 @@ cpp_quote("#define HTMLDLG_VERIFY cpp_quote("#define PRINT_DONTBOTHERUSER 0x0001") cpp_quote("#define PRINT_WAITFORCOMPLETION 0x0002") +cpp_quote("DEFINE_GUID(CGID_MSHTML, 0xde4ba900,0x59ca,0x11cf,0x95,0x92,0x44,0x45,0x53,0x54,0x00,0x00);") +cpp_quote("#define CMDSETID_Forms3 CGID_MSHTML") + +cpp_quote("#if defined(__GNUC__)") +cpp_quote("#define SZ_HTML_CLIENTSITE_OBJECTPARAM (const WCHAR[]) {'{','d','4','d','b','6','8','5','0','-','5','3','8','5','-','1','1','d','0','-','8','9','e','9','-','0','0','a','0','c','9','0','a','9','0','a','c','}',0}") +cpp_quote("#elif defined(_MSC_VER)") +cpp_quote("#define SZ_HTML_CLIENTSITE_OBJECTPARAM L\"{d4db6850-5385-11d0-89e9-00a0c90a90ac}\"") +cpp_quote("#else") +cpp_quote("static const WCHAR SZ_HTML_CLIENTSITE_OBJECTPARAM[] = {'{','d','4','d','b','6','8','5','0','-','5','3','8','5','-','1','1','d','0','-','8','9','e','9','-','0','0','a','0','c','9','0','a','9','0','a','c','}',0};") +cpp_quote("#endif") + cpp_quote("#ifndef __IHTMLWindow2_FWD_DEFINED__") cpp_quote("#define __IHTMLWindow2_FWD_DEFINED__") cpp_quote("typedef interface IHTMLWindow2 IHTMLWindow2;") @@ -195,6 +206,8 @@ interface IDocHostUIHandler : IUnknown [out] IDataObject **ppDORet); } +cpp_quote("DEFINE_GUID(CGID_DocHostCommandHandler,0xf38bc242,0xb950,0x11d1,0x89,0x18,0x00,0xc0,0x4f,0xc2,0xc8,0x36);") + [ object, uuid(3050F6D0-98b5-11CF-BB82-00AA00BDCE0B),

1 0

Alexandre Julliard : ntdll: Added emulation of ATL thunks for platforms with NX support.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: 57550776cec6f3eac92082bb3bf893b0e31f162e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57550776cec6f3eac92082b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 15:13:59 2006 +0100 ntdll: Added emulation of ATL thunks for platforms with NX support. --- dlls/ntdll/signal_i386.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index be5164d..0cacd7a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -902,6 +902,34 @@ static inline int is_privileged_instr( C } +#include "pshpack1.h" +struct atl_thunk +{ + DWORD movl; /* movl this,4(%esp) */ + DWORD this; + BYTE jmp; /* jmp func */ + int func; +}; +#include "poppack.h" + +/********************************************************************** + * check_atl_thunk + * + * Check if code destination is an ATL thunk, and emulate it if so. + */ +static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + struct atl_thunk *thunk = (struct atl_thunk *)rec->ExceptionInformation[1]; + + if (thunk->movl != 0x042444c7 || thunk->jmp != 0xe9) return FALSE; + *((DWORD *)context->Esp + 1) = thunk->this; + context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk->func; + TRACE( "emulating ATL thunk at %p, func=%08lx arg=%08lx\n", + thunk, context->Eip, *((DWORD *)context->Esp + 1) ); + return TRUE; +} + + /*********************************************************************** * setup_exception * @@ -1026,7 +1054,10 @@ static void WINAPI raise_segv_exception( { case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) + { + if ((rec->ExceptionInformation[0] == 8) && check_atl_thunk( rec, context )) goto done; rec->ExceptionCode = VIRTUAL_HandleFault( (void *)rec->ExceptionInformation[1] ); + } break; case EXCEPTION_DATATYPE_MISALIGNMENT: /* FIXME: pass through exception handler first? */ @@ -1175,7 +1206,7 @@ static HANDLER_DEF(segv_handler) rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; #ifdef FAULT_ADDRESS rec->NumberParameters = 2; - rec->ExceptionInformation[0] = (get_error_code(HANDLER_CONTEXT) & 2) != 0; + rec->ExceptionInformation[0] = (get_error_code(HANDLER_CONTEXT) >> 1) & 0x09; rec->ExceptionInformation[1] = (ULONG_PTR)FAULT_ADDRESS; #endif break;

1 0

Aric Stewart : ntdll: gcc 2.95 compile fixes.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: d7187d79bdaa616332b33ef4acb3d8144e2dc9f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7187d79bdaa616332b33ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 10 14:54:04 2006 +0100 ntdll: gcc 2.95 compile fixes. --- dlls/ntdll/tests/change.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index b45c7be..30e2e5e 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -88,15 +88,15 @@ static void test_ntncdf(void) filter |= FILE_NOTIFY_CHANGE_CREATION; filter |= FILE_NOTIFY_CHANGE_SECURITY; - iosb.Status = 1; + U(iosb).Status = 1; iosb.Information = 1; r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,-1,0); ok(r==STATUS_INVALID_PARAMETER, "should return invalid parameter\n"); - ok( iosb.Status == 1, "information wrong\n"); + ok( U(iosb).Status == 1, "information wrong\n"); ok( iosb.Information == 1, "information wrong\n"); - iosb.Status = 1; + U(iosb).Status = 1; iosb.Information = 0; r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0); ok(r==STATUS_PENDING, "should return status pending\n"); @@ -116,7 +116,7 @@ static void test_ntncdf(void) r = WaitForSingleObject( hEvent, 0 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( iosb.Status == STATUS_SUCCESS, "information wrong\n"); + ok( U(iosb).Status == STATUS_SUCCESS, "information wrong\n"); ok( iosb.Information == 0x12, "information wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -133,12 +133,12 @@ static void test_ntncdf(void) filter = FILE_NOTIFY_CHANGE_SIZE; - iosb.Status = 1; + U(iosb).Status = 1; iosb.Information = 1; r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,NULL,0,filter,0); ok(r==STATUS_PENDING, "should status pending\n"); - ok( iosb.Status == 1, "information wrong\n"); + ok( U(iosb).Status == 1, "information wrong\n"); ok( iosb.Information == 1, "information wrong\n"); r = WaitForSingleObject( hdir, 0 ); @@ -153,7 +153,7 @@ static void test_ntncdf(void) r = WaitForSingleObject( hdir, 100 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( iosb.Status == STATUS_NOTIFY_ENUM_DIR, "information wrong\n"); + ok( U(iosb).Status == STATUS_NOTIFY_ENUM_DIR, "information wrong\n"); ok( iosb.Information == 0, "information wrong\n"); CloseHandle(hdir); @@ -211,11 +211,11 @@ static void test_ntncdf_async(void) filter |= FILE_NOTIFY_CHANGE_SECURITY; - iosb.Status = 0x01234567; + U(iosb).Status = 0x01234567; iosb.Information = 0x12345678; r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0); ok(r==STATUS_PENDING, "should status pending\n"); - ok(iosb.Status == 0x01234567, "status set too soon\n"); + ok(U(iosb).Status == 0x01234567, "status set too soon\n"); ok(iosb.Information == 0x12345678, "info set too soon\n"); r = CreateDirectoryW( subdir, NULL ); @@ -224,7 +224,7 @@ static void test_ntncdf_async(void) r = WaitForSingleObject( hdir, 100 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok(iosb.Status == STATUS_SUCCESS, "status not successful\n"); + ok(U(iosb).Status == STATUS_SUCCESS, "status not successful\n"); ok(iosb.Information == 0x12, "info not set\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -242,7 +242,7 @@ static void test_ntncdf_async(void) r = WaitForSingleObject( hdir, 0 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok(iosb.Status == STATUS_SUCCESS, "status not successful\n"); + ok(U(iosb).Status == STATUS_SUCCESS, "status not successful\n"); ok(iosb.Information == 0x12, "info not set\n"); ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); @@ -251,7 +251,7 @@ static void test_ntncdf_async(void) ok( !memcmp(pfni->FileName,&szHoo[1],6), "name wrong\n" ); /* check APCs */ - iosb.Status = 0; + U(iosb).Status = 0; iosb.Information = 0; r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,NULL,0,filter,0); @@ -263,10 +263,10 @@ static void test_ntncdf_async(void) r = WaitForSingleObject( hdir, 0 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok(iosb.Status == STATUS_NOTIFY_ENUM_DIR, "status not successful\n"); + ok(U(iosb).Status == STATUS_NOTIFY_ENUM_DIR, "status not successful\n"); ok(iosb.Information == 0, "info not set\n"); - iosb.Status = 0; + U(iosb).Status = 0; iosb.Information = 0; r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0); @@ -278,21 +278,21 @@ static void test_ntncdf_async(void) r = WaitForSingleObject( hEvent, 0 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok(iosb.Status == STATUS_SUCCESS, "status not successful\n"); + ok(U(iosb).Status == STATUS_SUCCESS, "status not successful\n"); ok(iosb.Information == 0x12, "info not set\n"); - iosb.Status = 0x01234567; + U(iosb).Status = 0x01234567; iosb.Information = 0x12345678; r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0); ok(r==STATUS_PENDING, "should status pending\n"); - iosb2.Status = 0x01234567; + U(iosb2).Status = 0x01234567; iosb2.Information = 0x12345678; r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb2,buffer,sizeof buffer,filter,0); ok(r==STATUS_PENDING, "should status pending\n"); - ok(iosb.Status == 0x01234567, "status set too soon\n"); + ok(U(iosb).Status == 0x01234567, "status set too soon\n"); ok(iosb.Information == 0x12345678, "info set too soon\n"); todo_wine { @@ -301,8 +301,8 @@ static void test_ntncdf_async(void) CloseHandle(hdir); - ok(iosb.Status == STATUS_SUCCESS, "status wrong\n"); - ok(iosb2.Status == STATUS_CANCELLED, "status wrong\n"); + ok(U(iosb).Status == STATUS_SUCCESS, "status wrong\n"); + ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong\n"); } ok(iosb.Information == 0, "info wrong\n"); ok(iosb2.Information == 0, "info wrong\n");

1 0

Stefan Leichter : kernel: Fix a GetDiskFreeSpaceExA test for cd/dvd drives.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: ba3fb4865701c737050c2e05b8bfafecd361d7c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba3fb4865701c737050c2e0… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Fri Feb 10 14:52:40 2006 +0100 kernel: Fix a GetDiskFreeSpaceExA test for cd/dvd drives. --- dlls/kernel/tests/drive.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/tests/drive.c b/dlls/kernel/tests/drive.c index 7feb171..7ea5d25 100644 --- a/dlls/kernel/tests/drive.c +++ b/dlls/kernel/tests/drive.c @@ -132,7 +132,8 @@ static void test_GetDiskFreeSpaceA(void) tot.QuadPart = sectors_per_cluster; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); - ok( ret, "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%ld\n", drive, GetLastError()); + ok( ret || (!ret && ERROR_NOT_READY == GetLastError()), + "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%ld\n", drive, GetLastError()); ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, "GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive);

1 0

H. Verbeet : wined3d: Release the vertex declaration during stateblock cleanup.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: c2fe85e6587b2a4353f2ff341064ad6eed55e137 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c2fe85e6587b2a4353f2ff3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Feb 10 14:52:27 2006 +0100 wined3d: Release the vertex declaration during stateblock cleanup. --- dlls/wined3d/stateblock.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8ab5429..fe0a98f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -84,6 +84,10 @@ ULONG WINAPI IWineD3DStateBlockImpl_Rele IWineD3DVertexShader_Release(This->vertexShader); } + if (NULL != This->vertexDecl) { + IWineD3DVertexDeclaration_Release(This->vertexDecl); + } + /* NOTE: according to MSDN: The applicaion is responsible for making sure the texture references are cleared down */ for (counter = 0; counter < GL_LIMITS(textures); counter++) { if (This->textures[counter]) {

1 0