December 2005 - Wine-Commits

Michael Stefaniuc : Fix VarBstrCmp for NULL input BSTRs (MSDN is wrong).
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 8ec390676890a64e4c32a060a3340fed7350d5eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ec390676890a64e4c32a06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 5 12:00:24 2005 +0100 Fix VarBstrCmp for NULL input BSTRs (MSDN is wrong). --- dlls/oleaut32/tests/vartype.c | 32 ++++++++++++++++++++++++++++++++ dlls/oleaut32/vartype.c | 18 ++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 9beaa35..d77655c 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -516,6 +516,7 @@ static HRESULT (WINAPI *pVarBoolFromUI8) static HRESULT (WINAPI *pVarBstrFromR4)(FLOAT,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); +static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); static HRESULT (WINAPI *pVarCmp)(LPVARIANT,LPVARIANT,LCID,ULONG); @@ -4960,6 +4961,36 @@ static void test_VarBstrFromDec(void) #undef BSTR_DEC #undef BSTR_DEC64 +#define _VARBSTRCMP(left,right,lcid,flags,result) \ + hres = pVarBstrCmp(left,right,lcid,flags); \ + ok(hres == result, "VarBstrCmp: expected " #result ", got hres=0x%lx\n", hres) +#define VARBSTRCMP(left,right,result) \ + _VARBSTRCMP(left,right,lcid,0,result) + +static void test_VarBstrCmp(void) +{ + LCID lcid; + HRESULT hres; + static const WCHAR sz[] = {'W','u','r','s','c','h','t','\0'}; + static const WCHAR szempty[] = {'\0'}; + BSTR bstr, bstrempty; + + CHECKPTR(VarBstrCmp); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + bstr = SysAllocString(sz); + bstrempty = SysAllocString(szempty); + + /* NULL handling. Yepp, MSDN is totaly wrong here */ + VARBSTRCMP(NULL,NULL,VARCMP_EQ); + VARBSTRCMP(bstr,NULL,VARCMP_GT); + VARBSTRCMP(NULL,bstr,VARCMP_LT); + + /* NULL and empty string comparisions */ + VARBSTRCMP(bstrempty,NULL,VARCMP_EQ); + VARBSTRCMP(NULL,bstrempty,VARCMP_EQ); +} + /* Get the internal representation of a BSTR */ static inline LPINTERNAL_BSTR Get(const BSTR lpszString) { @@ -5968,6 +5999,7 @@ START_TEST(vartype) test_VarBstrFromR4(); test_VarBstrFromDate(); test_VarBstrFromDec(); + test_VarBstrCmp(); test_SysStringLen(); test_SysStringByteLen(); test_SysAllocString(); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2075827..1214752 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6599,23 +6599,21 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft * RETURNS * VARCMP_LT, VARCMP_EQ or VARCMP_GT indicating that pbstrLeft is less * than, equal to or greater than pbstrRight respectively. - * VARCMP_NULL is returned if either string is NULL, unless both are NULL - * in which case VARCMP_EQ is returned. + * + * NOTES + * VARCMP_NULL is NOT returned if either string is NULL unlike MSDN + * states. A NULL BSTR pointer is equivalent to an empty string. */ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFlags) { - if (!pbstrLeft) + if (!pbstrLeft || !*pbstrLeft) { if (!pbstrRight || !*pbstrRight) return VARCMP_EQ; - return VARCMP_NULL; - } - else if (!pbstrRight) - { - if (!*pbstrLeft) - return VARCMP_EQ; - return VARCMP_NULL; + return VARCMP_LT; } + else if (!pbstrRight || !*pbstrRight) + return VARCMP_GT; return CompareStringW(lcid, dwFlags, pbstrLeft, -1, pbstrRight, -1) - 1; }

1 0

Milko Krachounov : Update the Bulgarian resources for commdlg and regedit.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 58e156b5e8e490d3c119cd11f36fdc09407f3015 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58e156b5e8e490d3c119cd1… Author: Milko Krachounov <milko(a)3mhz.net> Date: Mon Dec 5 12:00:04 2005 +0100 Update the Bulgarian resources for commdlg and regedit. --- dlls/commdlg/cdlg_Bg.rc | 6 +++--- programs/regedit/Bg.rc | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/commdlg/cdlg_Bg.rc b/dlls/commdlg/cdlg_Bg.rc index 3dafd69..33a756a 100644 --- a/dlls/commdlg/cdlg_Bg.rc +++ b/dlls/commdlg/cdlg_Bg.rc @@ -406,9 +406,9 @@ �� .\n�� PD32_OUT_OF_MEMORY "�� ." PD32_GENERIC_ERROR "�� ." PD32_DRIVER_UNKNOWN "�� ." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "�� , \ +�� , \ +�� . �� ." PD32_DEFAULT_PRINTER "�� ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "�� %d �� " diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc index 5e29842..e40c216 100644 --- a/programs/regedit/Bg.rc +++ b/programs/regedit/Bg.rc @@ -59,8 +59,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&�� ", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&��\tCtrl+F", ID_EDIT_FIND + MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT END POPUP "&��" BEGIN @@ -130,6 +130,22 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��:",IDC_STATIC,5,7,119,8 + EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "�� :",IDC_STATIC,5, 22, 119, 8 + CHECKBOX "��", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + DEFPUSHBUTTON "��",IDOK,175,5,30,11,WS_GROUP + PUSHBUTTON "��",IDCANCEL,175,22,30,11, WS_GROUP +END + IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�� "

1 0

Marcus Meissner : winsock: Rewrote mappers to use sizeof() based loops.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 851328cd853f9c443d746eba76d1c067b146f2f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=851328cd853f9c443d746eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 5 11:59:43 2005 +0100 winsock: Rewrote mappers to use sizeof() based loops. Added IPPROTO_IP and AF_UNSPEC to the mappers. --- dlls/winsock/socket.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index db903f7..e83e747 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -260,7 +260,6 @@ static const int ws_sock_map[][2] = #ifdef SO_SNDTIMEO MAP_OPTION( SO_SNDTIMEO ), #endif - { 0, 0 } }; static const int ws_tcp_map[][2] = @@ -268,7 +267,6 @@ static const int ws_tcp_map[][2] = #ifdef TCP_NODELAY MAP_OPTION( TCP_NODELAY ), #endif - { 0, 0 } }; static const int ws_ip_map[][2] = @@ -284,17 +282,16 @@ static const int ws_ip_map[][2] = #endif MAP_OPTION( IP_TOS ), MAP_OPTION( IP_TTL ), - { 0, 0 } }; static const int ws_af_map[][2] = { + MAP_OPTION( AF_UNSPEC ), MAP_OPTION( AF_INET ), MAP_OPTION( AF_INET6 ), #ifdef HAVE_IPX MAP_OPTION( AF_IPX ), #endif - { 0, 0 } }; static const int ws_socktype_map[][2] = @@ -302,17 +299,16 @@ static const int ws_socktype_map[][2] = MAP_OPTION( SOCK_DGRAM ), MAP_OPTION( SOCK_STREAM ), MAP_OPTION( SOCK_RAW ), - { 0, 0 } }; static const int ws_proto_map[][2] = { + MAP_OPTION( IPPROTO_IP ), MAP_OPTION( IPPROTO_TCP ), MAP_OPTION( IPPROTO_UDP ), MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ), - { 0, 0 } }; static const int ws_aiflag_map[][2] = @@ -323,7 +319,6 @@ static const int ws_aiflag_map[][2] = /* Linux/UNIX knows a lot more. But Windows only * has 3 as far as I could see. -Marcus */ - { 0, 0 } }; static const int ws_eai_map[][2] = @@ -531,8 +526,7 @@ static int convert_sockopt(INT *level, I { case WS_SOL_SOCKET: *level = SOL_SOCKET; - for(i=0; ws_sock_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_sock_map)/sizeof(ws_sock_map[0]); i++) { if( ws_sock_map[i][0] == *optname ) { *optname = ws_sock_map[i][1]; @@ -543,8 +537,7 @@ static int convert_sockopt(INT *level, I break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; - for(i=0; ws_tcp_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_tcp_map)/sizeof(ws_tcp_map[0]); i++) { if ( ws_tcp_map[i][0] == *optname ) { *optname = ws_tcp_map[i][1]; @@ -555,8 +548,7 @@ static int convert_sockopt(INT *level, I break; case WS_IPPROTO_IP: *level = IPPROTO_IP; - for(i=0; ws_ip_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_ip_map)/sizeof(ws_ip_map[0]); i++) { if (ws_ip_map[i][0] == *optname ) { *optname = ws_ip_map[i][1]; @@ -727,7 +719,7 @@ static int convert_af_w2u(int windowsaf) { int i; - for (i=0;ws_af_map[i][0];i++) + for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) if (ws_af_map[i][0] == windowsaf) return ws_af_map[i][1]; FIXME("unhandled Windows address family %d\n", windowsaf); @@ -738,7 +730,7 @@ static int convert_af_u2w(int unixaf) { int i; - for (i=0;ws_af_map[i][0];i++) + for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) if (ws_af_map[i][1] == unixaf) return ws_af_map[i][0]; FIXME("unhandled UNIX address family %d\n", unixaf); @@ -749,7 +741,7 @@ static int convert_proto_w2u(int windowsproto) { int i; - for (i=0;ws_proto_map[i][0];i++) + for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][0] == windowsproto) return ws_proto_map[i][1]; FIXME("unhandled Windows socket protocol %d\n", windowsproto); @@ -760,11 +752,9 @@ static int convert_proto_u2w(int unixproto) { int i; - for (i=0;ws_proto_map[i][0];i++) + for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][1] == unixproto) return ws_proto_map[i][0]; - if (unixproto == 0) /* 0 is ok too as wild card */ - return 0; FIXME("unhandled UNIX socket protocol %d\n", unixproto); return -1; } @@ -773,7 +763,7 @@ static int convert_socktype_w2u(int windowssocktype) { int i; - for (i=0;ws_socktype_map[i][0];i++) + for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) if (ws_socktype_map[i][0] == windowssocktype) return ws_socktype_map[i][1]; FIXME("unhandled Windows socket type %d\n", windowssocktype); @@ -784,7 +774,7 @@ static int convert_socktype_u2w(int unixsocktype) { int i; - for (i=0;ws_socktype_map[i][0];i++) + for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) if (ws_socktype_map[i][1] == unixsocktype) return ws_socktype_map[i][0]; FIXME("unhandled UNIX socket type %d\n", unixsocktype); @@ -3089,12 +3079,11 @@ void WINAPI WS_freeaddrinfo(struct WS_ad static int convert_aiflag_w2u(int winflags) { int i, unixflags = 0; - for (i=0;ws_aiflag_map[i][0];i++) { + for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) if (ws_aiflag_map[i][0] & winflags) { unixflags |= ws_aiflag_map[i][1]; winflags &= ~ws_aiflag_map[i][0]; } - } if (winflags) FIXME("Unhandled windows AI_xxx flags %x\n", winflags); return unixflags; @@ -3103,12 +3092,11 @@ static int convert_aiflag_w2u(int winfla static int convert_aiflag_u2w(int unixflags) { int i, winflags = 0; - for (i=0;ws_aiflag_map[i][0];i++) { + for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) if (ws_aiflag_map[i][1] & unixflags) { winflags |= ws_aiflag_map[i][0]; unixflags &= ~ws_aiflag_map[i][1]; } - } if (unixflags) /* will warn usually */ WARN("Unhandled UNIX AI_xxx flags %x\n", unixflags); return winflags;

1 0

lostwages/ news/2005120201.xml wwn/wn20051202_ ...
by WineHQ Dec. 4, 2005

Dec. 4, 2005

ChangeSet ID: 21659 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/04 23:29:39 Added files: news : 2005120201.xml wwn : wn20051202_300.xml Log message: WWN #300. Patch: http://cvs.winehq.org/patch.py?id=21659 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005120201.xml Added 1.1 +0 -0 lostwages/wwn/wn20051202_300.xml

1 0

appdb/include application.php version.php
by WineHQ Dec. 4, 2005

Dec. 4, 2005

ChangeSet ID: 21658 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/12/04 22:19:14 Modified files: include : application.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix SendNotificationEmail() so it appends to the existing message in the 'edit' case instead of overwriting the message passed in Patch: http://cvs.winehq.org/patch.py?id=21658 Old revision New revision Changes Path 1.38 1.39 +1 -1 appdb/include/application.php 1.43 1.44 +1 -1 appdb/include/version.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.38 appdb/include/application.php:1.39 --- appdb/include/application.php:1.38 5 Dec 2005 4:19:14 -0000 +++ appdb/include/application.php 5 Dec 2005 4:19:14 -0000 @@ -376,7 +376,7 @@ class Application { break; case "edit": $sSubject = $this->sName." has been modified by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."\n"; + $sMsg .= APPDB_ROOT."appview.php?appId=".$this->iAppId."\n"; addmsg("Application modified.", "green"); break; case "delete": Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.43 appdb/include/version.php:1.44 --- appdb/include/version.php:1.43 5 Dec 2005 4:19:14 -0000 +++ appdb/include/version.php 5 Dec 2005 4:19:14 -0000 @@ -486,7 +486,7 @@ class Version { break; case "edit": $sSubject = "'".$oApp->sName." ".$this->sName."' has been modified by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; + $sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; addmsg("Version modified.", "green"); break; case "delete":

1 0

Robert Shearman : OLE: Support HREFTYPEs For ITypeInfos
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 190d05f4db08190b86517832a5608325da9734e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=190d05f4db08190b8651783… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:20:27 2005 +0100 OLE: Support HREFTYPEs For ITypeInfos Add support for reading the hreftype of a typeinfo, return it to the application in ITypeComp_Bind for the DESKIND_APPOBJECT case and support referencing it in ITypeInfo_GetRefTypeInfo. --- dlls/oleaut32/typelib.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3e4b83b..4d8a736 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -976,6 +976,7 @@ typedef struct tagITypeInfoImpl TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ int index; /* index in this typelib; */ + HREFTYPE hreftype; /* hreftype for app object binding */ /* type libs seem to store the doc strings in ascii * so why should we do it in unicode? */ @@ -1448,6 +1449,22 @@ static void MSFT_ReadGuid( GUID *pGuid, TRACE_(typelib)("%s\n", debugstr_guid(pGuid)); } +static HREFTYPE MSFT_ReadHreftype( TLBContext *pcx, int offset ) +{ + MSFT_NameIntro niName; + + if (offset < 0) + { + ERR_(typelib)("bad offset %d\n", offset); + return -1; + } + + MSFT_ReadLEDWords(&niName, sizeof(niName), pcx, + pcx->pTblDir->pNametab.offset+offset); + + return niName.hreftype; +} + static BSTR MSFT_ReadName( TLBContext *pcx, int offset) { char * name; @@ -2057,6 +2074,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( /* name, eventually add to a hash table */ ptiRet->Name=MSFT_ReadName(pcx, tiBase.NameOffset); + ptiRet->hreftype = MSFT_ReadHreftype(pcx, tiBase.NameOffset); TRACE_(typelib)("reading %s\n", debugstr_w(ptiRet->Name)); /* help info */ ptiRet->DocString=MSFT_ReadString(pcx, tiBase.docstringoffs); @@ -4111,7 +4129,7 @@ static HRESULT WINAPI ITypeLibComp_fnBin TYPEDESC tdesc_appobject = { { - 0 /* FIXME */ + (TYPEDESC *)pTypeInfo->hreftype }, VT_USERDEFINED }; @@ -4153,6 +4171,9 @@ static HRESULT WINAPI ITypeLibComp_fnBin } if (subtypeinfo) ITypeInfo_Release(subtypeinfo); + if (pTypeInfo->hreftype == -1) + FIXME("no hreftype for interface %p\n", pTypeInfo); + hr = TLB_AllocAndInitVarDesc(&vardesc_appobject, &pBindPtr->lpvardesc); if (FAILED(hr)) return hr; @@ -4202,6 +4223,7 @@ static ITypeInfo2 * WINAPI ITypeInfo_Con pTypeInfoImpl->lpVtbl = &tinfvt; pTypeInfoImpl->lpVtblTypeComp = &tcompvt; pTypeInfoImpl->ref=1; + pTypeInfoImpl->hreftype = -1; } TRACE("(%p)\n", pTypeInfoImpl); return (ITypeInfo2*) pTypeInfoImpl; @@ -5535,7 +5557,13 @@ static HRESULT WINAPI ITypeInfo_fnGetRef ITypeInfoImpl *This = (ITypeInfoImpl *)iface; HRESULT result = E_FAIL; - if (hRefType == -1 && + if ((This->hreftype != -1) && (This->hreftype == hRefType)) + { + *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); + result = S_OK; + } + else if (hRefType == -1 && (((ITypeInfoImpl*) This)->TypeAttr.typekind == TKIND_DISPATCH) && (((ITypeInfoImpl*) This)->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) {

1 0

Robert Shearman : OLE: fix function name loading
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: d8d1693def4dea73b60d9ce0786bf938a0a6f7cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8d1693def4dea73b60d9ce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:20:03 2005 +0100 OLE: fix function name loading Correctly get the name of the second function of a propget/propput pair in MSFT typelibs when the name offset is set to -1. --- dlls/oleaut32/typelib.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07fa031..3e4b83b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1685,6 +1685,7 @@ MSFT_DoFuncs(TLBContext* pcx, char recbuf[512]; MSFT_FuncRecord * pFuncRec=(MSFT_FuncRecord *) recbuf; + TLBFuncDesc *ptfd_prev = NULL; TRACE_(typelib)("\n"); @@ -1698,7 +1699,12 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); - (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); + /* nameoffset is sometimes -1 on the second half of a propget/propput + * pair of functions */ + if ((nameoffset == -1) && (i > 0)) + (*pptfd)->Name = SysAllocString(ptfd_prev->Name); + else + (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); @@ -1844,6 +1850,8 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), pInt[j], pcx); } + else + elemdesc->u.paramdesc.pparamdescex = NULL; /* custom info */ if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) { @@ -1867,6 +1875,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.cScodes = 0 ; (*pptfd)->funcdesc.lprgscode = NULL ; + ptfd_prev = *pptfd; pptfd = & ((*pptfd)->next); recoffset += reclength; }

1 0

Robert Shearman : OLE: fix invoking dispinterface functions
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: bd8fefd66b8457c39420ee146a6bd42effe7ee49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd8fefd66b8457c39420ee1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:19:17 2005 +0100 OLE: fix invoking dispinterface functions Fix invoking dispinterface functions by using the internal representation of the function, not the one returned to applications. --- dlls/oleaut32/typelib.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8e37ea9..07fa031 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5185,25 +5185,29 @@ static HRESULT WINAPI ITypeInfo_fnInvoke { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; - unsigned int func_index, var_index; + unsigned int var_index; TYPEKIND type_kind; HRESULT hres; + const TLBFuncDesc *pFuncInfo; TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n", This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); dump_DispParms(pDispParams); - hres = ITypeInfo2_GetFuncIndexOfMemId(iface, memid, dwFlags, &func_index); - if (SUCCEEDED(hres)) { - FUNCDESC *func_desc; + /* we do this instead of using GetFuncDesc since it will return a fake + * FUNCDESC for dispinterfaces and we want the real function description */ + for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) + if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind)) + break; + + if (pFuncInfo) { + const FUNCDESC *func_desc = &pFuncInfo->funcdesc; - hres = ITypeInfo2_GetFuncDesc(iface, func_index, &func_desc); - if(FAILED(hres)) return hres; if (TRACE_ON(ole)) { TRACE("invoking:\n"); - dump_FUNCDESC(func_desc); + dump_TLBFuncDesc(pFuncInfo); } switch (func_desc->funckind) { @@ -5376,7 +5380,6 @@ func_fail: break; } - ITypeInfo2_ReleaseFuncDesc(iface, func_desc); TRACE("-- 0x%08lx\n", hres); return hres;

1 0

H. Verbeet : wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 246b07de7c6390f59b48f997c8e3038cc182e95d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=246b07de7c6390f59b48f99… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:10:56 2005 +0100 wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent. Remove an unnecessary cast. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a22f39b..123b3a5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -100,7 +100,7 @@ ULONG WINAPI IWineD3DPixelShaderImpl_Rel HRESULT WINAPI IWineD3DPixelShaderImpl_GetParent(IWineD3DPixelShader *iface, IUnknown** parent){ IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - *parent= (IUnknown*) parent; + *parent = This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ce5258d..af7a566 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -2012,7 +2012,7 @@ ULONG WINAPI IWineD3DVertexShaderImpl_Re HRESULT WINAPI IWineD3DVertexShaderImpl_GetParent(IWineD3DVertexShader *iface, IUnknown** parent){ IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - *parent = (IUnknown*)This->parent; + *parent = This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK;

1 0

H. Verbeet : wined3d: Set pixel shader version correctly in IWineD3DPixelShaderImpl_SetFunction.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: c73679e4ebe68a505a261aa28d58de7b965c190d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c73679e4ebe68a505a261aa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:18:58 2005 +0100 wined3d: Set pixel shader version correctly in IWineD3DPixelShaderImpl_SetFunction. --- dlls/wined3d/pixelshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 123b3a5..4f868ee 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1664,7 +1664,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S if (NULL != pToken) { while (D3DPS_END() != *pToken) { if (pshader_is_version_token(*pToken)) { /** version */ - version = *pToken & 0xFF; + version = (((*pToken >> 8) & 0x0F) * 10) + (*pToken & 0x0F); TRACE("ps_%lu_%lu\n", (*pToken >> 8) & 0x0F, (*pToken & 0x0F)); ++pToken; ++len;

1 0