November 2005 - Wine-Commits

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21061 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 14:54:34 Modified files: dlls/oleaut32 : typelib.c Log message: Huw Davies <huw(a)codeweavers.com> Don't call Release on a null ptr. Patch: http://cvs.winehq.org/patch.py?id=21061 Old revision New revision Changes Path 1.173 1.174 +4 -1 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.173 wine/dlls/oleaut32/typelib.c:1.174 --- wine/dlls/oleaut32/typelib.c:1.173 2 Nov 2005 20:54:34 -0000 +++ wine/dlls/oleaut32/typelib.c 2 Nov 2005 20:54:34 -0000 @@ -5064,7 +5064,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke * variants here too */ if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) - IUnknown_Release(*V_UNKNOWNREF(&varresult)); + { + if(*V_UNKNOWNREF(&varresult)) + IUnknown_Release(*V_UNKNOWNREF(&varresult)); + } break; } }

1 0

wine/ server/trace.c server/thread.h server/th ...
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21060 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 14:54:12 Modified files: server : trace.c thread.h thread.c protocol.def include/wine : server_protocol.h dlls/ntdll : thread.c signal_x86_64.c signal_sparc.c signal_powerpc.c signal_i386.c ntdll_misc.h exception.c dlls/kernel/tests: thread.c Log message: Fixed Get/SetThreadContext to work properly on suspended threads. Added a test case. Patch: http://cvs.winehq.org/patch.py?id=21060 Old revision New revision Changes Path 1.266 1.267 +4 -2 wine/server/trace.c 1.65 1.66 +1 -0 wine/server/thread.h 1.129 1.130 +48 -5 wine/server/thread.c 1.159 1.160 +2 -0 wine/server/protocol.def 1.160 1.161 +3 -2 wine/include/wine/server_protocol.h 1.42 1.43 +56 -4 wine/dlls/ntdll/thread.c 1.1 1.2 +4 -4 wine/dlls/ntdll/signal_x86_64.c 1.38 1.39 +4 -4 wine/dlls/ntdll/signal_sparc.c 1.30 1.31 +4 -4 wine/dlls/ntdll/signal_powerpc.c 1.102 1.103 +91 -39 wine/dlls/ntdll/signal_i386.c 1.68 1.69 +2 -0 wine/dlls/ntdll/ntdll_misc.h 1.88 1.89 +37 -0 wine/dlls/ntdll/exception.c 1.27 1.28 +41 -0 wine/dlls/kernel/tests/thread.c

1 0

wine/dlls shell32/shelllink.c opengl32/wgl.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21059 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 14:51:41 Modified files: dlls/shell32 : shelllink.c dlls/opengl32 : wgl.c Log message: Martin Fuchs <martin-fuchs(a)gmx.net> Correct WINAPI position for MSVC portability. Patch: http://cvs.winehq.org/patch.py?id=21059 Old revision New revision Changes Path 1.108 1.109 +2 -2 wine/dlls/shell32/shelllink.c 1.64 1.65 +1 -1 wine/dlls/opengl32/wgl.c Index: wine/dlls/shell32/shelllink.c diff -u -p wine/dlls/shell32/shelllink.c:1.108 wine/dlls/shell32/shelllink.c:1.109 --- wine/dlls/shell32/shelllink.c:1.108 2 Nov 2005 20:51:41 -0000 +++ wine/dlls/shell32/shelllink.c 2 Nov 2005 20:51:41 -0000 @@ -2415,8 +2415,8 @@ ShellLink_QueryContextMenu( IContextMenu static LPWSTR shelllink_get_msi_component_path( LPCWSTR component ) { - UINT WINAPI (*pMsiDecomposeDescriptorW)(LPCWSTR,LPWSTR,LPWSTR,LPWSTR,DWORD*); - INSTALLSTATE WINAPI (*pMsiGetComponentPathW)(LPCWSTR,LPCWSTR,LPWSTR,DWORD*); + UINT (WINAPI *pMsiDecomposeDescriptorW)(LPCWSTR,LPWSTR,LPWSTR,LPWSTR,DWORD*); + INSTALLSTATE (WINAPI *pMsiGetComponentPathW)(LPCWSTR,LPCWSTR,LPWSTR,DWORD*); WCHAR szProd[MAX_FEATURE_CHARS+1], szFeat[MAX_FEATURE_CHARS+1], szComp[MAX_FEATURE_CHARS+1], szCompPath[MAX_PATH]; INSTALLSTATE state; Index: wine/dlls/opengl32/wgl.c diff -u -p wine/dlls/opengl32/wgl.c:1.64 wine/dlls/opengl32/wgl.c:1.65 --- wine/dlls/opengl32/wgl.c:1.64 2 Nov 2005 20:51:41 -0000 +++ wine/dlls/opengl32/wgl.c 2 Nov 2005 20:51:41 -0000 @@ -582,7 +582,7 @@ static BOOL internal_wglUseFontBitmaps(H DWORD first, DWORD count, DWORD listBase, - DWORD WINAPI (*GetGlyphOutline_ptr)(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*)) + DWORD (WINAPI *GetGlyphOutline_ptr)(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*)) { /* We are running using client-side rendering fonts... */ GLYPHMETRICS gm;

1 0

wine/programs/wineconsole dialog.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21058 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 14:51:16 Modified files: programs/wineconsole: dialog.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Fixed crash in font browsing for raster fonts. Patch: http://cvs.winehq.org/patch.py?id=21058 Old revision New revision Changes Path 1.20 1.21 +8 -3 wine/programs/wineconsole/dialog.c Index: wine/programs/wineconsole/dialog.c diff -u -p wine/programs/wineconsole/dialog.c:1.20 wine/programs/wineconsole/dialog.c:1.21 --- wine/programs/wineconsole/dialog.c:1.20 2 Nov 2005 20:51:16 -0000 +++ wine/programs/wineconsole/dialog.c 2 Nov 2005 20:51:16 -0000 @@ -393,9 +393,14 @@ static int CALLBACK font_enum_size(const SendDlgItemMessage(di->hDlg, IDC_FNT_LIST_SIZE, LB_INSERTSTRING, idx, (LPARAM)buf); /* now grow our arrays and insert the values at the same index than in the list box */ - di->font = HeapReAlloc(GetProcessHeap(), 0, di->font, sizeof(*di->font) * (di->nFont + 1)); - if (idx != di->nFont) - memmove(&di->font[idx + 1], &di->font[idx], (di->nFont - idx) * sizeof(*di->font)); + if (di->nFont) + { + di->font = HeapReAlloc(GetProcessHeap(), 0, di->font, sizeof(*di->font) * (di->nFont + 1)); + if (idx != di->nFont) + memmove(&di->font[idx + 1], &di->font[idx], (di->nFont - idx) * sizeof(*di->font)); + } + else + di->font = HeapAlloc(GetProcessHeap(), 0, sizeof(*di->font)); di->font[idx].height = tm->tmHeight; di->font[idx].weight = tm->tmWeight; lstrcpy(di->font[idx].faceName, lf->lfFaceName);

1 0

wine/dlls/oleaut32 variant.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21057 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 14:03:01 Modified files: dlls/oleaut32 : variant.c Log message: Robert Shearman <rob(a)codeweavers.com> Fix a crash during +variant logging caused by a typo causing an array to be one element less than expected. Patch: http://cvs.winehq.org/patch.py?id=21057 Old revision New revision Changes Path 1.125 1.126 +2 -2 wine/dlls/oleaut32/variant.c Index: wine/dlls/oleaut32/variant.c diff -u -p wine/dlls/oleaut32/variant.c:1.125 wine/dlls/oleaut32/variant.c:1.126 --- wine/dlls/oleaut32/variant.c:1.125 2 Nov 2005 20: 3: 1 -0000 +++ wine/dlls/oleaut32/variant.c 2 Nov 2005 20: 3: 1 -0000 @@ -43,13 +43,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); -const char* wine_vtypes[VT_CLSID] = +const char* wine_vtypes[VT_CLSID+1] = { "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", - "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR""32","33","34","35", + "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE",

1 0

wine/ include/wine/wined3d_interface.h dlls/wi ...
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21056 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 14:01:54 Modified files: include/wine : wined3d_interface.h dlls/wined3d : surface.c device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Implement D3DFMT_UNKNOWN surfaces, this seems to be used a lot in d3d8 but I haven't found any d3d9 application that uses D3DFMT_UNKNOWN surfaces yet. Patch: http://cvs.winehq.org/patch.py?id=21056 Old revision New revision Changes Path 1.44 1.45 +2 -1 wine/include/wine/wined3d_interface.h 1.27 1.28 +139 -86 wine/dlls/wined3d/surface.c 1.90 1.91 +22 -7 wine/dlls/wined3d/device.c

1 0

wine/dlls/oleaut32 tmarshal.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21055 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 14:00:00 Modified files: dlls/oleaut32 : tmarshal.c Log message: Robert Shearman <rob(a)codeweavers.com> - Make sure to clean up properly on error. - Restrict the critical section to getting the channel buffer and adding a reference to it. Patch: http://cvs.winehq.org/patch.py?id=21055 Old revision New revision Changes Path 1.70 1.71 +17 -13 wine/dlls/oleaut32/tmarshal.c Index: wine/dlls/oleaut32/tmarshal.c diff -u -p wine/dlls/oleaut32/tmarshal.c:1.70 wine/dlls/oleaut32/tmarshal.c:1.71 --- wine/dlls/oleaut32/tmarshal.c:1.70 2 Nov 2005 20: 0: 0 -0000 +++ wine/dlls/oleaut32/tmarshal.c 2 Nov 2005 20: 0: 0 -0000 @@ -1155,15 +1155,16 @@ xCall(LPVOID retptr, int method, TMProxy UINT nrofnames; DWORD remoteresult = 0; ITypeInfo *tinfo; + IRpcChannelBuffer *chanbuf; EnterCriticalSection(&tpinfo->crit); hres = _get_funcdesc(tpinfo->tinfo,method,&tinfo,&fdesc,&iname,&fname); if (hres) { - ERR("Did not find typeinfo/funcdesc entry for method %d!\n",method); + ERR("Did not find typeinfo/funcdesc entry for method %d!\n",method); ITypeInfo_Release(tinfo); LeaveCriticalSection(&tpinfo->crit); - return E_FAIL; + return E_FAIL; } if (!tpinfo->chanbuf) @@ -1173,6 +1174,10 @@ xCall(LPVOID retptr, int method, TMProxy LeaveCriticalSection(&tpinfo->crit); return RPC_E_DISCONNECTED; } + chanbuf = tpinfo->chanbuf; + IRpcChannelBuffer_AddRef(chanbuf); + + LeaveCriticalSection(&tpinfo->crit); if (relaydeb) { TRACE_(olerelay)("->"); @@ -1234,19 +1239,17 @@ xCall(LPVOID retptr, int method, TMProxy memset(&msg,0,sizeof(msg)); msg.cbBuffer = buf.curoff; msg.iMethod = method; - hres = IRpcChannelBuffer_GetBuffer(tpinfo->chanbuf,&msg,&(tpinfo->iid)); + hres = IRpcChannelBuffer_GetBuffer(chanbuf,&msg,&(tpinfo->iid)); if (hres) { ERR("RpcChannelBuffer GetBuffer failed, %lx\n",hres); - LeaveCriticalSection(&tpinfo->crit); - return hres; + goto exit; } memcpy(msg.Buffer,buf.base,buf.curoff); if (relaydeb) TRACE_(olerelay)("\n"); - hres = IRpcChannelBuffer_SendReceive(tpinfo->chanbuf,&msg,&status); + hres = IRpcChannelBuffer_SendReceive(chanbuf,&msg,&status); if (hres) { ERR("RpcChannelBuffer SendReceive failed, %lx\n",hres); - LeaveCriticalSection(&tpinfo->crit); - return hres; + goto exit; } if (relaydeb) TRACE_(olerelay)(" status = %08lx (",status); @@ -1293,16 +1296,17 @@ xCall(LPVOID retptr, int method, TMProxy hres = xbuf_get(&buf, (LPBYTE)&remoteresult, sizeof(DWORD)); if (hres != S_OK) - return hres; + goto exit; if (relaydeb) TRACE_(olerelay)(") = %08lx\n", remoteresult); - if (status != S_OK) /* OLE/COM internal error */ - return status; + hres = remoteresult; +exit: HeapFree(GetProcessHeap(),0,buf.base); + IRpcChannelBuffer_Release(chanbuf); ITypeInfo_Release(tinfo); - LeaveCriticalSection(&tpinfo->crit); - return remoteresult; + TRACE("-- 0x%08lx\n", hres); + return hres; } HRESULT WINAPI ProxyIUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21054 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 13:59:13 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> - Make wParamFlags in the paramdesc dumping function human readable. - Enums should be VT_I4 instead of VT_INT. - Trace the return value from the ITypeInfo_fnInvoke. Patch: http://cvs.winehq.org/patch.py?id=21054 Old revision New revision Changes Path 1.172 1.173 +14 -3 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.172 wine/dlls/oleaut32/typelib.c:1.173 --- wine/dlls/oleaut32/typelib.c:1.172 2 Nov 2005 19:59:13 -0000 +++ wine/dlls/oleaut32/typelib.c 2 Nov 2005 19:59:13 -0000 @@ -5,6 +5,7 @@ * 1999 Rein Klazes * 2000 Francois Jacques * 2001 Huw D M Davies for CodeWeavers + * 2005 Robert Shearman, for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1073,10 +1074,19 @@ static void dump_TypeDesc(TYPEDESC *pTD, static void dump_ELEMDESC(ELEMDESC *edesc) { char buf[200]; + USHORT flags = edesc->u.paramdesc.wParamFlags; dump_TypeDesc(&edesc->tdesc,buf); MESSAGE("\t\ttdesc.vartype %d (%s)\n",edesc->tdesc.vt,buf); - MESSAGE("\t\tu.parmadesc.flags %x\n",edesc->u.paramdesc.wParamFlags); - MESSAGE("\t\tu.parmadesc.lpex %p\n",edesc->u.paramdesc.pparamdescex); + MESSAGE("\t\tu.paramdesc.wParamFlags"); + if (!flags) MESSAGE(" PARAMFLAGS_NONE"); + if (flags & PARAMFLAG_FIN) MESSAGE(" PARAMFLAG_FIN"); + if (flags & PARAMFLAG_FOUT) MESSAGE(" PARAMFLAG_FOUT"); + if (flags & PARAMFLAG_FLCID) MESSAGE(" PARAMFLAG_FLCID"); + if (flags & PARAMFLAG_FRETVAL) MESSAGE(" PARAMFLAG_FRETVAL"); + if (flags & PARAMFLAG_FOPT) MESSAGE(" PARAMFLAG_FOPT"); + if (flags & PARAMFLAG_FHASDEFAULT) MESSAGE(" PARAMFLAG_FHASDEFAULT"); + if (flags & PARAMFLAG_FHASCUSTDATA) MESSAGE(" PARAMFLAG_FHASCUSTDATA"); + MESSAGE("\n\t\tu.paramdesc.lpex %p\n",edesc->u.paramdesc.pparamdescex); } static void dump_FUNCDESC(FUNCDESC *funcdesc) { int i; @@ -4754,7 +4764,7 @@ static HRESULT userdefined_to_variantvt( switch (tattr->typekind) { case TKIND_ENUM: - *vt |= VT_INT; + *vt |= VT_I4; break; case TKIND_ALIAS: @@ -5095,6 +5105,7 @@ func_fail: } ITypeInfo2_ReleaseFuncDesc(iface, func_desc); + TRACE("-- 0x%08lx\n", hres); return hres; } else if(SUCCEEDED(hres = ITypeInfo2_GetVarIndexOfMemId(iface, memid, &var_index))) {

1 0

wine/dlls/msi tests/package.c cond.y
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21053 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 13:58:01 Modified files: dlls/msi/tests : package.c dlls/msi : cond.y Log message: Mike McCormack <mike(a)codeweavers.com> NULL and empty strings are the same in conditions. Patch: http://cvs.winehq.org/patch.py?id=21053 Old revision New revision Changes Path 1.8 1.9 +6 -0 wine/dlls/msi/tests/package.c 1.23 1.24 +6 -2 wine/dlls/msi/cond.y Index: wine/dlls/msi/tests/package.c diff -u -p wine/dlls/msi/tests/package.c:1.8 wine/dlls/msi/tests/package.c:1.9 --- wine/dlls/msi/tests/package.c:1.8 2 Nov 2005 19:58: 1 -0000 +++ wine/dlls/msi/tests/package.c 2 Nov 2005 19:58: 1 -0000 @@ -587,6 +587,12 @@ void test_condition(void) r = MsiEvaluateCondition(hpkg, "NOT ( 1 AND 1 )"); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "NOT A AND (BBBBBBBBBB=2 OR CCC=1) AND Ddddddddd"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "Installed<>\"\""); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + MsiCloseHandle( hpkg ); } Index: wine/dlls/msi/cond.y diff -u -p wine/dlls/msi/cond.y:1.23 wine/dlls/msi/cond.y:1.24 --- wine/dlls/msi/cond.y:1.23 2 Nov 2005 19:58: 1 -0000 +++ wine/dlls/msi/cond.y 2 Nov 2005 19:58: 1 -0000 @@ -361,6 +361,10 @@ static WCHAR *strstriW( const WCHAR *str static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b ) { + /* null and empty string are equivalent */ + if (!a) a = szEmpty; + if (!b) b = szEmpty; + /* a or b may be NULL */ switch (operator) { @@ -377,7 +381,7 @@ static INT compare_string( LPCWSTR a, IN case COND_LE: return 1 != lstrcmpW( a, b ); case COND_SS: /* substring */ - return ( a && b && strstrW( a, b ) ) ? 1 : 0; + return strstrW( a, b ) ? 1 : 0; case COND_ILT: return -1 == lstrcmpiW( a, b ); case COND_IGT: @@ -391,7 +395,7 @@ static INT compare_string( LPCWSTR a, IN case COND_ILE: return 1 != lstrcmpiW( a, b ); case COND_ISS: - return ( a && b && strstriW( a, b ) ) ? 1 : 0; + return strstriW( a, b ) ? 1 : 0; case COND_LHS: case COND_RHS: case COND_ILHS:

1 0

wine/dlls/imm32 imm.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21052 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 13:57:13 Modified files: dlls/imm32 : imm.c Log message: Mike McCormack <mike(a)codeweavers.com> Change a FIXME message to a comment. Patch: http://cvs.winehq.org/patch.py?id=21052 Old revision New revision Changes Path 1.42 1.43 +2 -2 wine/dlls/imm32/imm.c Index: wine/dlls/imm32/imm.c diff -u -p wine/dlls/imm32/imm.c:1.42 wine/dlls/imm32/imm.c:1.43 --- wine/dlls/imm32/imm.c:1.42 2 Nov 2005 19:57:13 -0000 +++ wine/dlls/imm32/imm.c 2 Nov 2005 19:57:13 -0000 @@ -980,9 +980,9 @@ HKL WINAPI ImmInstallIMEW( */ BOOL WINAPI ImmIsIME(HKL hKL) { - FIXME("(%p): semi-stub\n", hKL); + TRACE("(%p): semi-stub\n", hKL); /* - * Dead key locales will return TRUE here when they should not + * FIXME: Dead key locales will return TRUE here when they should not * There is probably a more proper way to check this. */ return (root_context != NULL);

1 0