March 2008 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msxml3: Add support for SAX Documents.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 4bbeb2c6f4ae642073095a7f7df588baf07f3b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbeb2c6f4ae642073095a7f7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 24 20:09:08 2008 +1100 msxml3: Add support for SAX Documents. --- include/msxml2did.h | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/include/msxml2did.h b/include/msxml2did.h index 1a718de..f2adaaf 100644 --- a/include/msxml2did.h +++ b/include/msxml2did.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Vijay Kiran Kamuju + * Copyright (C) 2008 Alistair Leslie-Hughes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -268,4 +269,130 @@ #define DISPID_XMLDSO_DOCUMENT 0x10001 #define DISPID_XMLDSO_JAVADSOCOMPATIBLE 0x10002 +/* SAX Defines */ +#define DISPID_SAX_XMLREADER__MIN 0x00000501 +#define DISPID_SAX_XMLREADER__MAX 0x00010000 +#define DISPID_SAX_XMLREADER__BASE DISPID_SAX_XMLREADER__MIN + +#define DISPID_SAX_XMLREADER 0x00000501 +#define DISPID_SAX_XMLREADER_GETFEATURE 0x00000502 +#define DISPID_SAX_XMLREADER_PUTFEATURE 0x00000503 +#define DISPID_SAX_XMLREADER_GETPROPERTY 0x00000504 +#define DISPID_SAX_XMLREADER_PUTPROPERTY 0x00000505 +#define DISPID_SAX_XMLREADER_ENTITYRESOLVER 0x00000506 +#define DISPID_SAX_XMLREADER_CONTENTHANDLER 0x00000507 +#define DISPID_SAX_XMLREADER_DTDHANDLER 0x00000508 +#define DISPID_SAX_XMLREADER_ERRORHANDLER 0x00000509 +#define DISPID_SAX_XMLREADER_BASEURL 0x0000050A +#define DISPID_SAX_XMLREADER_SECUREBASEURL 0x0000050B +#define DISPID_SAX_XMLREADER_PARSE 0x0000050C +#define DISPID_SAX_XMLREADER_PARSEURL 0x0000050D +#define DISPID_SAX_XMLREADER_PARENT 0x0000050E + +#define DISPID_SAX_XMLFILTER 0x00000510 +#define DISPID_SAX_XMLFILTER_GETFEATURE 0x00000511 +#define DISPID_SAX_XMLFILTER_PUTFEATURE 0x00000512 +#define DISPID_SAX_XMLFILTER_GETPROPERTY 0x00000513 +#define DISPID_SAX_XMLFILTER_PUTPROPERTY 0x00000514 +#define DISPID_SAX_XMLFILTER_ENTITYRESOLVER 0x00000515 +#define DISPID_SAX_XMLFILTER_CONTENTHANDLER 0x00000516 +#define DISPID_SAX_XMLFILTER_DTDHANDLER 0x00000517 +#define DISPID_SAX_XMLFILTER_ERRORHANDLER 0x00000518 +#define DISPID_SAX_XMLFILTER_BASEURL 0x00000519 +#define DISPID_SAX_XMLFILTER_SECUREBASEURL 0x0000051A +#define DISPID_SAX_XMLFILTER_PARSE 0x0000051B +#define DISPID_SAX_XMLFILTER_PARSEURL 0x0000051C +#define DISPID_SAX_XMLFILTER_PARENT 0x0000051D + +#define DISPID_SAX_LOCATOR 0x00000520 +#define DISPID_SAX_LOCATOR_COLUMNNUMBER 0x00000521 +#define DISPID_SAX_LOCATOR_LINENUMBER 0x00000522 +#define DISPID_SAX_LOCATOR_PUBLICID 0x00000523 +#define DISPID_SAX_LOCATOR_SYSTEMID 0x00000524 + +#define DISPID_SAX_ENTITYRESOLVER 0x00000526 +#define DISPID_SAX_ENTITYRESOLVER_RESOLVEENTITY 0x00000527 + +#define DISPID_SAX_CONTENTHANDLER 0x00000529 +#define DISPID_SAX_CONTENTHANDLER_DOCUMENTLOCATOR 0x0000052A +#define DISPID_SAX_CONTENTHANDLER_STARTDOCUMENT 0x0000052B +#define DISPID_SAX_CONTENTHANDLER_ENDDOCUMENT 0x0000052C +#define DISPID_SAX_CONTENTHANDLER_STARTPREFIXMAPPING 0x0000052D +#define DISPID_SAX_CONTENTHANDLER_ENDPREFIXMAPPING 0x0000052E +#define DISPID_SAX_CONTENTHANDLER_STARTELEMENT 0x0000052F +#define DISPID_SAX_CONTENTHANDLER_ENDELEMENT 0x00000530 +#define DISPID_SAX_CONTENTHANDLER_CHARACTERS 0x00000531 +#define DISPID_SAX_CONTENTHANDLER_IGNORABLEWHITESPACE 0x00000532 +#define DISPID_SAX_CONTENTHANDLER_PROCESSINGINSTRUCTION 0x00000533 +#define DISPID_SAX_CONTENTHANDLER_SKIPPEDENTITY 0x00000534 + +#define DISPID_SAX_DTDHANDLER 0x00000536 +#define DISPID_SAX_DTDHANDLER_NOTATIONDECL 0x00000537 +#define DISPID_SAX_DTDHANDLER_UNPARSEDENTITYDECL 0x00000538 + +#define DISPID_SAX_ERRORHANDLER 0x0000053A +#define DISPID_SAX_ERRORHANDLER_ERROR 0x0000053B +#define DISPID_SAX_ERRORHANDLER_FATALERROR 0x0000053C +#define DISPID_SAX_ERRORHANDLER_IGNORABLEWARNING 0x0000053D + +#define DISPID_SAX_ATTRIBUTES 0x0000053F +#define DISPID_SAX_ATTRIBUTES_LENGTH 0x00000540 +#define DISPID_SAX_ATTRIBUTES_GETURI 0x00000541 +#define DISPID_SAX_ATTRIBUTES_GETLOCALNAME 0x00000542 +#define DISPID_SAX_ATTRIBUTES_GETQNAME 0x00000543 +#define DISPID_SAX_ATTRIBUTES_GETINDEXFROMNAME 0x00000544 +#define DISPID_SAX_ATTRIBUTES_GETINDEXFROMQNAME 0x00000545 +#define DISPID_SAX_ATTRIBUTES_GETTYPE 0x00000546 +#define DISPID_SAX_ATTRIBUTES_GETTYPEFROMNAME 0x00000547 +#define DISPID_SAX_ATTRIBUTES_GETTYPEFROMQNAME 0x00000548 +#define DISPID_SAX_ATTRIBUTES_GETVALUE 0x00000549 +#define DISPID_SAX_ATTRIBUTES_GETVALUEFROMNAME 0x0000054A +#define DISPID_SAX_ATTRIBUTES_GETVALUEFROMQNAME 0x0000054B + +#define DISPID_SAX_LEXICALHANDLER 0x0000054D +#define DISPID_SAX_LEXICALHANDLER_STARTDTD 0x0000054E +#define DISPID_SAX_LEXICALHANDLER_ENDDTD 0x0000054F +#define DISPID_SAX_LEXICALHANDLER_STARTENTITY 0x00000550 +#define DISPID_SAX_LEXICALHANDLER_ENDENTITY 0x00000551 +#define DISPID_SAX_LEXICALHANDLER_STARTCDATA 0x00000552 +#define DISPID_SAX_LEXICALHANDLER_ENDCDATA 0x00000553 +#define DISPID_SAX_LEXICALHANDLER_COMMENT 0x00000554 + +#define DISPID_SAX_DECLHANDLER 0x00000556 +#define DISPID_SAX_DECLHANDLER_ELEMENTDECL 0x00000557 +#define DISPID_SAX_DECLHANDLER_ATTRIBUTEDECL 0x00000558 +#define DISPID_SAX_DECLHANDLER_INTERNALENTITYDECL 0x00000559 +#define DISPID_SAX_DECLHANDLER_EXTERNALENTITYDECL 0x0000055A + +#define DISPID_MX_ATTRIBUTES_ADDATTRIBUTE 0x0000055D +#define DISPID_MX_ATTRIBUTES_CLEAR 0x0000055E +#define DISPID_MX_ATTRIBUTES_REMOVEATTRIBUTE 0x0000055F +#define DISPID_MX_ATTRIBUTES_SETATTRIBUTE 0x00000560 +#define DISPID_MX_ATTRIBUTES_SETATTRIBUTES 0x00000561 +#define DISPID_MX_ATTRIBUTES_SETLOCALNAME 0x00000562 +#define DISPID_MX_ATTRIBUTES_SETQNAME 0x00000563 +#define DISPID_MX_ATTRIBUTES_SETTYPE 0x00000564 +#define DISPID_MX_ATTRIBUTES_SETURI 0x00000565 +#define DISPID_MX_ATTRIBUTES_SETVALUE 0x00000566 +#define DISPID_MX_ATTRIBUTES_ADDATTRIBUTEFROMINDEX 0x00000567 + +#define DISPID_MX_WRITER 0x00000568 +#define DISPID_MX_WRITER_OUTPUT 0x00000569 +#define DISPID_MX_WRITER_DESTINATION 0x0000056A +#define DISPID_MX_WRITER_ENCODING 0x0000056B +#define DISPID_MX_WRITER_BYTEORDERMARK 0x0000056C +#define DISPID_MX_WRITER_INDENT 0x0000056D +#define DISPID_MX_WRITER_STANDALONE 0x0000056E +#define DISPID_MX_WRITER_OMITXMLDECLARATION 0x0000056F +#define DISPID_MX_WRITER_VERSION 0x00000570 +#define DISPID_MX_WRITER_DISABLEOUTPUTESCAPING 0x00000571 +#define DISPID_MX_WRITER_FLUSH 0x00000572 +#define DISPID_MX_WRITER_RESET 0x00000573 + +#define DISPID_MX_READER_CONTROL 0x00000575 +#define DISPID_MX_READER_CONTROL_ABORT 0x00000576 +#define DISPID_MX_READER_CONTROL_RESUME 0x00000577 +#define DISPID_MX_READER_CONTROL_SUSPEND 0x00000578 + + #endif /* __MSXML2DID_H__ */

1 0

Alistair Leslie-Hughes : msxml3: Add SAX interfaces.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: b8040eb2567bc01d0f87fbf4e5613178028e76ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8040eb2567bc01d0f87fbf4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 24 20:10:05 2008 +1100 msxml3: Add SAX interfaces. --- include/msxml2.idl | 915 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 915 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8040eb2567bc01d0f87f…

1 0

Reece Dunn : comdlg32: Fix building the tests with MSVC headers.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: ae32a7fe0473aebb875b26083c1567ff046c3b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae32a7fe0473aebb875b26083… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sat Mar 22 22:50:43 2008 +0000 comdlg32: Fix building the tests with MSVC headers. --- dlls/comdlg32/tests/printdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 783773f..744b6eb 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -26,6 +26,7 @@ #include "winerror.h" #include "wingdi.h" #include "winuser.h" +#include "objbase.h" #include "cderr.h" #include "commdlg.h"

1 0

Reece Dunn : tools: Target the version defines to Vista in msvcmaker.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 45d248f1e0bddfa370f7a50ed16cb797d7a10e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d248f1e0bddfa370f7a50ed… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Mar 23 00:39:11 2008 +0000 tools: Target the version defines to Vista in msvcmaker. --- tools/winapi/msvcmaker | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index f466bf1..325339b 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -575,18 +575,18 @@ sub _generate_dsp($$) { if($debug) { if($lib || $exe) { print OUT "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od"; - @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _MBCS _LIB)); + @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _MBCS _LIB)); } else { print OUT "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); + @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); } } else { if($lib || $exe) { print OUT "# ADD BASE CPP /nologo /W3 /GX /O2"; - @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _MBCS _LIB)); + @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _MBCS _LIB)); } else { print OUT "# ADD BASE CPP /nologo /MD /W3 /GX /O2"; - @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); + @defines = (qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); } } @@ -607,18 +607,18 @@ sub _generate_dsp($$) { if($debug) { if($lib) { print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _LIB); + @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _WINDOWS _MBCS _LIB); } else { print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL); + @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x700 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL); } } else { if($lib) { print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; - @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _LIB); + @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _WINDOWS _MBCS _LIB); } else { print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; - @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL); + @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL); } }

1 0

Marcus Meissner : user32/tests: Fix uninitialized struct component.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: a0c18ce7849a192d4803fe08d65144bf914331ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c18ce7849a192d4803fe08d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Mar 24 13:06:48 2008 +0100 user32/tests: Fix uninitialized struct component. --- dlls/user32/tests/msg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7aa99b4..b8d9375 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7176,14 +7176,16 @@ static LRESULT CALLBACK cbt_global_hook_proc(int nCode, WPARAM wParam, LPARAM lP /* WH_MOUSE_LL hook */ if (nCode == HC_ACTION) { - struct message msg; MSLLHOOKSTRUCT *mhll = (MSLLHOOKSTRUCT *)lParam; /* we can't test for real mouse events */ if (mhll->flags & LLMHF_INJECTED) { + struct message msg; + + memset (&msg, 0, sizeof (msg)); msg.message = wParam; - msg.flags = hook; + msg.flags = hook; add_message(&msg); } return CallNextHookEx(hCBT_global_hook, nCode, wParam, lParam);

1 0

Andrew Talbot : ws2_32: Assign to structs instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: a839455bb0862d763eaa2cfb5b1ac4e7ada2a992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a839455bb0862d763eaa2cfb5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 24 15:45:30 2008 +0000 ws2_32: Assign to structs instead of using memcpy. --- dlls/ws2_32/protocol.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 7cccecb..43bf424 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -99,7 +99,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_EXPEDITED_DATA | XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - memcpy( &info->ProviderId, &ProviderIdIP, sizeof(GUID) ); + info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3e9; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -114,7 +114,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS; - memcpy( &info->ProviderId, &ProviderIdIP, sizeof(GUID) ); + info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3ea; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -130,7 +130,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS; - memcpy( &info->ProviderId, &ProviderIdIPX, sizeof(GUID) ); + info->ProviderId = ProviderIdIPX; info->dwCatalogEntryId = 0x406; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -147,7 +147,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - memcpy( &info->ProviderId, &ProviderIdSPX, sizeof(GUID) ); + info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x407; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -163,7 +163,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - memcpy( &info->ProviderId, &ProviderIdSPX, sizeof(GUID) ); + info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x409; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -203,7 +203,7 @@ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - memcpy( &info->ProviderId, &ProviderIdIP, sizeof(GUID) ); + info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3e9; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -218,7 +218,7 @@ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS; - memcpy( &info->ProviderId, &ProviderIdIP, sizeof(GUID) ); + info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3ea; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -234,7 +234,7 @@ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS; - memcpy( &info->ProviderId, &ProviderIdIPX, sizeof(GUID) ); + info->ProviderId = ProviderIdIPX; info->dwCatalogEntryId = 0x406; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -251,7 +251,7 @@ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - memcpy( &info->ProviderId, &ProviderIdSPX, sizeof(GUID) ); + info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x407; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; @@ -267,7 +267,7 @@ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - memcpy( &info->ProviderId, &ProviderIdSPX, sizeof(GUID) ); + info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x409; info->ProtocolChain.ChainLen = 1; info->iVersion = 2;

1 0

Andrew Talbot : wsock32: Assign to struct instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 511dd2a8c07bda39df867b8ab87a0231bccf2b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=511dd2a8c07bda39df867b8ab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 24 15:45:33 2008 +0000 wsock32: Assign to struct instead of using memcpy. --- dlls/wsock32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index d326443..6073a76 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -410,7 +410,7 @@ DWORD WINAPI WsControl(DWORD protocol, TRACE("Found IP info for tei_instance 0x%x:\n", index); TRACE("IP 0x%08x, mask 0x%08x\n", table->table[i].dwAddr, table->table[i].dwMask); - memcpy(baseIPInfo, &table->table[i], sizeof(MIB_IPADDRROW)); + *baseIPInfo = table->table[i]; break; } }

1 0

Alexander Dorofeyev : d3d8/tests: Test DrawIndexedPrimitiveUP with primitive count zero.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 94949ab849d7f80eb1fd744a2110685dd513712b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94949ab849d7f80eb1fd744a2… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 23 02:00:01 2008 +0200 d3d8/tests: Test DrawIndexedPrimitiveUP with primitive count zero. --- dlls/d3d8/tests/device.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d3efb42..45524b3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1174,6 +1174,75 @@ static void test_lights(void) if(d3d8) IDirect3D8_Release(d3d8); } +static void test_render_zero_triangles(void) +{ + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice8 *device = NULL; + IDirect3D8 *d3d8; + HWND hwnd; + HRESULT hr; + D3DDISPLAYMODE d3ddm; + + struct nvertex + { + float x, y, z; + float nx, ny, nz; + DWORD diffuse; + } quad[] = + { + { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + }; + + d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d8 || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode( d3d8, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = 800; + d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D16; + + hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, + D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); + if(!device) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed with %#08x\n", hr); + if(hr == D3D_OK) + { + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 0 /* NumVerts */, + 0 /*PrimCount */, NULL, D3DFMT_INDEX16, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawIndexedPrimitiveUP failed with %#08x\n", hr); + + IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed with %#08x\n", hr); + } + + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + cleanup: + if(device) IDirect3DDevice8_Release(device); + if(d3d8) IDirect3D8_Release(d3d8); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -1198,5 +1267,6 @@ START_TEST(device) test_shader(); test_limits(); test_lights(); + test_render_zero_triangles(); } }

1 0

Alexander Dorofeyev : ddraw: Fix vertex processing.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: e2d8e291d6a3e77ec621f1322b245aed9f40d707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d8e291d6a3e77ec621f1322… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 23 17:18:44 2008 +0200 ddraw: Fix vertex processing. --- dlls/ddraw/executebuffer.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index fce3c4f..fe24fe3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -437,9 +437,9 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); - dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dwWidth / 2 + dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + Viewport->dwX + Viewport->dwWidth / 2; - dst->u2.sy = (-dst->u2.sy) / dst->u4.rhw * Viewport->dwHeight / 2 + dst->u2.sy = (-dst->u2.sy) / dst->u4.rhw * Viewport->dvScaleY + Viewport->dwY + Viewport->dwHeight / 2; dst->u3.sz /= dst->u4.rhw; dst->u4.rhw = 1 / dst->u4.rhw; @@ -460,8 +460,8 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, dump_D3DMATRIX(&proj_mat); TRACE(" View Matrix : (%p)\n",&view_mat); dump_D3DMATRIX(&view_mat); - TRACE(" World Matrix : (%p)\n", &mat); - dump_D3DMATRIX(&mat); + TRACE(" World Matrix : (%p)\n", &world_mat); + dump_D3DMATRIX(&world_mat); } multiply_matrix(&mat,&view_mat,&world_mat); @@ -479,8 +479,11 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); - dst->u1.sx /= dst->u4.rhw * Viewport->dvScaleX * Viewport->dwWidth / 2 + Viewport->dwX; - dst->u2.sy /= dst->u4.rhw * Viewport->dvScaleY * Viewport->dwHeight / 2 + Viewport->dwY; + dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + + Viewport->dwX + Viewport->dwWidth / 2; + dst->u2.sy = (-dst->u2.sy) / dst->u4.rhw * Viewport->dvScaleY + + Viewport->dwY + Viewport->dwHeight / 2; + dst->u3.sz /= dst->u4.rhw; dst->u4.rhw = 1 / dst->u4.rhw;

1 0

Alexander Dorofeyev : ddraw/tests: Test executebuffer triangle instruction with zero count.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: eddbdbef47529136c965f9912ff251e96ce514f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddbdbef47529136c965f9912… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 23 01:59:54 2008 +0200 ddraw/tests: Test executebuffer triangle instruction with zero count. --- dlls/ddraw/tests/d3d.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d5177a5..4e827a5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1088,6 +1088,30 @@ static void Direct3D1Test(void) hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_CLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute returned %08x\n", hr); + /* Test rendering 0 triangles */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + + hr = IDirect3DExecuteBuffer_Lock(ExecuteBuffer, &desc); + ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Lock failed: %08x\n", hr); + + memset(desc.lpData, 0, 128); + instr = desc.lpData; + idx = 0; + + instr->bOpcode = D3DOP_TRIANGLE; + instr->bSize = sizeof(D3DOP_TRIANGLE); + instr->wCount = 0; + instr = ((D3DINSTRUCTION*)(instr))+1; + instr->bOpcode = D3DOP_EXIT; + instr->bSize = 0; + instr->wCount = 0; + hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); + ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Unlock failed: %08x\n", hr); + + hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "IDirect3DDevice_Execute returned %08x\n", hr); + memset(&transformdata, 0, sizeof(transformdata)); transformdata.dwSize = sizeof(transformdata); transformdata.lpIn = (void *) testverts;

1 0