November 2005 - Wine-Commits

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

Nov. 4, 2005

ChangeSet ID: 21101 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:13:55 Modified files: dlls/oleaut32 : tmarshal.c Log message: Marcus Meissner <marcus(a)jet.franken.de> Added support for VT_I8/VT_UI8 marshalling. Patch: http://cvs.winehq.org/patch.py?id=21101 Old revision New revision Changes Path 1.71 1.72 +20 -0 wine/dlls/oleaut32/tmarshal.c Index: wine/dlls/oleaut32/tmarshal.c diff -u -p wine/dlls/oleaut32/tmarshal.c:1.71 wine/dlls/oleaut32/tmarshal.c:1.72 --- wine/dlls/oleaut32/tmarshal.c:1.71 4 Nov 2005 11:13:55 -0000 +++ wine/dlls/oleaut32/tmarshal.c 4 Nov 2005 11:13:55 -0000 @@ -445,6 +445,8 @@ static const IRpcProxyBufferVtbl tmproxy int _argsize(DWORD vt) { switch (vt) { + case VT_UI8: + return 8/sizeof(DWORD); case VT_R8: return sizeof(double)/sizeof(DWORD); case VT_CY: @@ -473,6 +475,9 @@ _xsize(TYPEDESC *td) { arrsize *= adesc->rgbounds[i].cElements; return arrsize*_xsize(&adesc->tdescElem); } + case VT_UI8: + case VT_I8: + return 8; case VT_UI2: case VT_I2: return 2; @@ -501,6 +506,13 @@ serialize_param( switch (tdesc->vt) { case VT_EMPTY: /* nothing. empty variant for instance */ return S_OK; + case VT_I8: + case VT_UI8: + hres = S_OK; + if (debugout) TRACE_(olerelay)("%lx%lx",arg[0],arg[1]); + if (writeit) + hres = xbuf_add(buf,(LPBYTE)arg,8); + return hres; case VT_BOOL: case VT_ERROR: case VT_UINT: @@ -811,6 +823,14 @@ deserialize_param( return S_OK; } } + case VT_I8: + case VT_UI8: + if (readit) { + hres = xbuf_get(buf,(LPBYTE)arg,8); + if (hres) ERR("Failed to read integer 8 byte\n"); + } + if (debugout) TRACE_(olerelay)("%lx%lx",arg[0],arg[1]); + return hres; case VT_ERROR: case VT_BOOL: case VT_I4:

1 0

wine/dlls/wined3d device.c
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

ChangeSet ID: 21100 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:13:45 Modified files: dlls/wined3d : device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Add support for updating to D3DFMT_UNKNOWN surfaces and tidy up update surface a little. Patch: http://cvs.winehq.org/patch.py?id=21100 Old revision New revision Changes Path 1.91 1.92 +23 -10 wine/dlls/wined3d/device.c Index: wine/dlls/wined3d/device.c diff -u -p wine/dlls/wined3d/device.c:1.91 wine/dlls/wined3d/device.c:1.92 --- wine/dlls/wined3d/device.c:1.91 4 Nov 2005 11:13:45 -0000 +++ wine/dlls/wined3d/device.c 4 Nov 2005 11:13:45 -0000 @@ -5079,7 +5079,6 @@ float WINAPI IWineD3DDeviceImpl_GetN return 0.0f; } - HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DSurface *pSourceSurface, CONST RECT* pSourceRect, IWineD3DSurface *pDestinationSurface, CONST POINT* pDestPoint) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; /** TODO: remove casts to IWineD3DSurfaceImpl @@ -5087,11 +5086,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda ****************************************/ IWineD3DSurfaceImpl *pSrcSurface = (IWineD3DSurfaceImpl *)pSourceSurface; int srcWidth, srcHeight; - unsigned int srcSurfaceWidth, srcSurfaceHeight, destSurfaceWidth, destSurfaceHeight; + unsigned int srcSurfaceWidth, srcSurfaceHeight, destSurfaceWidth, destSurfaceHeight; WINED3DFORMAT destFormat, srcFormat; - UINT destSize; + UINT destSize; int destLeft, destTop; - D3DPOOL srcPool, destPool; + D3DPOOL srcPool, destPool; int offset = 0; int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ glDescriptor *glDescription = NULL; @@ -5100,6 +5099,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda WINED3DSURFACE_DESC winedesc; + TRACE("(%p) : Source (%p) Rect (%p) Destination (%p) Point(%p)\n", This, pSourceSurface, pSourceRect, pDestinationSurface, pDestPoint); memset(&winedesc, 0, sizeof(winedesc)); winedesc.Width = &srcSurfaceWidth; winedesc.Height = &srcSurfaceHeight; @@ -5117,10 +5117,18 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); if(srcPool != D3DPOOL_SYSTEMMEM || destPool != D3DPOOL_DEFAULT){ - FIXME("source %p must be SYSTEMMEM and dest %p must be DEFAULT\n", pSourceSurface, pDestinationSurface); + WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning D3DERR_INVALIDCALL\n", pSourceSurface, pDestinationSurface); return D3DERR_INVALIDCALL; } - /* TODO: change this to use bindTexture */ + + if (destFormat == WINED3DFMT_UNKNOWN) { + TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", This); + IWineD3DSurface_SetFormat(pDestinationSurface, srcFormat); + + /* Get the update surface description */ + IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); + } + /* Make sure the surface is loaded and upto date */ IWineD3DSurface_PreLoad(pDestinationSurface); @@ -5137,7 +5145,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda /* This function doesn't support compressed textures the pitch is just bytesPerPixel * width */ - if(srcWidth != srcSurfaceWidth || (pSourceRect != NULL && pSourceRect->left != 0) ){ rowoffset = (srcSurfaceWidth - srcWidth) * pSrcSurface->bytesPerPixel; offset += pSourceRect->left * pSrcSurface->bytesPerPixel; @@ -5162,13 +5169,16 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda /* Sanity check */ if (IWineD3DSurface_GetData(pSourceSurface) == NULL) { - /* need to lock the surface to get the data */ - FIXME("Surfaces has no allocated memory, but should be an in memory only surface\n"); + + /* need to lock the surface to get the data */ + FIXME("Surfaces has no allocated memory, but should be an in memory only surface\n"); } + /* TODO: Cube and volume support */ if(rowoffset != 0){ /* not a whole row so we have to do it a line at a time */ int j; + /* hopefully using pointer addtion will be quicker than using a point + j * rowoffset */ unsigned char* data =((unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; @@ -5182,7 +5192,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda ,1 ,glDescription->glFormat ,glDescription->glType - ,data/* could be quicker using */ + ,data /* could be quicker using */ ); data += rowoffset; } @@ -5217,6 +5227,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda } else { if (NP2_REPACK == wined3d_settings.nonpower2_mode) { + /* some applications cannot handle odd pitches returned by soft non-power2, so we have to repack the data from pow2Width/Height to expected Width,Height, this makes the data returned by GetData non-power2 width/height with hardware non-power2 @@ -5233,6 +5244,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda ,IWineD3DSurface_GetData(pSourceSurface) ); } else { + /* not repacked, the data returned by IWineD3DSurface_GetData is pow2Width x pow2Height */ glTexSubImage2D(glDescription->target ,glDescription->level @@ -5249,6 +5261,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Upda } } checkGLcall("glTexSubImage2D"); + /* I only need to look up baseTexture here, so it may be a good idea to hava a GL_TARGET -> * GL_DIMENSIONS lookup, or maybe store the dimensions on the surface (but that's making the * surface bigger than it needs to be hmm.. */

1 0

wine/dlls/oleaut32/tests olefont.c
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

ChangeSet ID: 21099 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/04 05:13:08 Modified files: dlls/oleaut32/tests: olefont.c Log message: Robert Shearman <rob(a)codeweavers.com> Add a test for Invoking an OleFont function. Patch: http://cvs.winehq.org/patch.py?id=21099 Old revision New revision Changes Path 1.9 1.10 +14 -0 wine/dlls/oleaut32/tests/olefont.c Index: wine/dlls/oleaut32/tests/olefont.c diff -u -p wine/dlls/oleaut32/tests/olefont.c:1.9 wine/dlls/oleaut32/tests/olefont.c:1.10 --- wine/dlls/oleaut32/tests/olefont.c:1.9 4 Nov 2005 11:13: 8 -0000 +++ wine/dlls/oleaut32/tests/olefont.c 4 Nov 2005 11:13: 8 -0000 @@ -142,6 +142,8 @@ void test_type_info(void) UINT n; LCID en_us = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US), SORT_DEFAULT); + DISPPARAMS dispparams; + VARIANT varresult; pOleCreateFontIndirect(NULL, &IID_IFontDisp, &pvObj); fontdisp = pvObj; @@ -156,6 +158,18 @@ void test_type_info(void) ok(!lstrcmpiW(names[0],name_Name), "DISPID_FONT_NAME doesn't get 'Names'.\n"); ITypeInfo_Release(pTInfo); + + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + VariantInit(&varresult); + hres = IFontDisp_Invoke(fontdisp, DISPID_FONT_NAME, &IID_NULL, + LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, + NULL, NULL); + ok(hres == S_OK, "IFontDisp_Invoke return 0x%08lx instead of S_OK.\n", hres); + VariantClear(&varresult); + IFontDisp_Release(fontdisp); }

1 0

wine/dlls/setupapi install.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21098 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 13:34:03 Modified files: dlls/setupapi : install.c Log message: Added support for optional section.ntx86 and section.nt in InstallHinfSection when current version is set to NT. Patch: http://cvs.winehq.org/patch.py?id=21098 Old revision New revision Changes Path 1.13 1.14 +27 -2 wine/dlls/setupapi/install.c Index: wine/dlls/setupapi/install.c diff -u -p wine/dlls/setupapi/install.c:1.13 wine/dlls/setupapi/install.c:1.14 --- wine/dlls/setupapi/install.c:1.13 3 Nov 2005 19:34: 3 -0000 +++ wine/dlls/setupapi/install.c 3 Nov 2005 19:34: 3 -0000 @@ -906,14 +906,23 @@ BOOL WINAPI SetupInstallFromInfSectionW( */ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, INT show ) { - WCHAR *p, *path, section[MAX_PATH]; +#ifdef __i386__ + static const WCHAR nt_platformW[] = {'.','n','t','x','8','6',0}; +#elif defined(__x86_64) + static const WCHAR nt_platformW[] = {'.','n','t','i','a','6','4',0}; +#else /* FIXME: other platforms */ + static const WCHAR nt_platformW[] = {'.','n','t',0}; +#endif + static const WCHAR nt_genericW[] = {'.','n','t',0}; + + WCHAR *p, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)]; void *callback_context; UINT mode; HINF hinf; TRACE("hwnd %p, handle %p, cmdline %s\n", hwnd, handle, debugstr_w(cmdline)); - lstrcpynW( section, cmdline, sizeof(section)/sizeof(WCHAR) ); + lstrcpynW( section, cmdline, MAX_PATH ); if (!(p = strchrW( section, ' ' ))) return; *p++ = 0; @@ -927,6 +936,22 @@ void WINAPI InstallHinfSectionW( HWND hw hinf = SetupOpenInfFileW( path, NULL, INF_STYLE_WIN4, NULL ); if (hinf == INVALID_HANDLE_VALUE) return; + if (!(GetVersion() & 0x80000000)) + { + INFCONTEXT context; + + /* check for <section>.ntx86 (or corresponding name for the current platform) + * and then <section>.nt */ + p = section + strlenW(section); + memcpy( p, nt_platformW, sizeof(nt_platformW) ); + if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) + { + memcpy( p, nt_genericW, sizeof(nt_genericW) ); + if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) *p = 0; + } + if (*p) TRACE( "using section %s instead\n", debugstr_w(section) ); + } + callback_context = SetupInitDefaultQueueCallback( hwnd ); SetupInstallFromInfSectionW( hwnd, hinf, section, SPINST_ALL, NULL, NULL, SP_COPY_NEWER, SetupDefaultQueueCallbackW, callback_context,

1 0

wine/dlls/ole32 defaulthandler.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21097 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 13:32:49 Modified files: dlls/ole32 : defaulthandler.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement OLE object notifications, making sure to cope with the case of the advise holder not being created because no notifications are needed. Patch: http://cvs.winehq.org/patch.py?id=21097 Old revision New revision Changes Path 1.34 1.35 +14 -3 wine/dlls/ole32/defaulthandler.c Index: wine/dlls/ole32/defaulthandler.c diff -u -p wine/dlls/ole32/defaulthandler.c:1.34 wine/dlls/ole32/defaulthandler.c:1.35 --- wine/dlls/ole32/defaulthandler.c:1.34 3 Nov 2005 19:32:49 -0000 +++ wine/dlls/ole32/defaulthandler.c 3 Nov 2005 19:32:49 -0000 @@ -1339,13 +1339,23 @@ static void WINAPI DefaultHandler_IAdvis IAdviseSink *iface, IMoniker *pmk) { - FIXME(": stub\n"); + DefaultHandler *This = impl_from_IAdviseSink(iface); + + TRACE("(%p)\n", pmk); + + if (This->oleAdviseHolder) + IOleAdviseHolder_SendOnRename(This->oleAdviseHolder, pmk); } static void WINAPI DefaultHandler_IAdviseSink_OnSave( IAdviseSink *iface) { - FIXME(": stub\n"); + DefaultHandler *This = impl_from_IAdviseSink(iface); + + TRACE("()\n"); + + if (This->oleAdviseHolder) + IOleAdviseHolder_SendOnSave(This->oleAdviseHolder); } static void WINAPI DefaultHandler_IAdviseSink_OnClose( @@ -1355,7 +1365,8 @@ static void WINAPI DefaultHandler_IAdvis TRACE("()\n"); - IOleAdviseHolder_SendOnClose(This->oleAdviseHolder); + if (This->oleAdviseHolder) + IOleAdviseHolder_SendOnClose(This->oleAdviseHolder); DefaultHandler_Stop(This); }

1 0

wine/tools wine.inf
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21096 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 13:32:38 Modified files: tools : wine.inf Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Get rid of a double backslash. Patch: http://cvs.winehq.org/patch.py?id=21096 Old revision New revision Changes Path 1.46 1.47 +1 -1 wine/tools/wine.inf Index: wine/tools/wine.inf diff -u -p wine/tools/wine.inf:1.46 wine/tools/wine.inf:1.47 --- wine/tools/wine.inf:1.46 3 Nov 2005 19:32:38 -0000 +++ wine/tools/wine.inf 3 Nov 2005 19:32:38 -0000 @@ -78,7 +78,7 @@ HKCR,lnkfile,"NeverShowExt",,"" HKCR,lnkfile,"IsShortcut",,"yes" HKCR,lnkfile\CLSID,,,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\IconHandler,,,"{00021401-0000-0000-C000-000000000046}" -HKCR,lnkfile\shellex\ContextMenuHandlers\\{00021401-0000-0000-C000-000000000046},,, +HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,, HKCR,Msi.Package\DefaultIcon,,,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,,"msiexec /i %1" HKCR,Msi.Package\shell\Repair\command,,,"msiexec /f %1"

1 0

wine/dlls/comctl32 string.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21095 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 13:31:59 Modified files: dlls/comctl32 : string.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Use Win32 APIs for string comparison. Patch: http://cvs.winehq.org/patch.py?id=21095 Old revision New revision Changes Path 1.7 1.8 +13 -8 wine/dlls/comctl32/string.c Index: wine/dlls/comctl32/string.c diff -u -p wine/dlls/comctl32/string.c:1.7 wine/dlls/comctl32/string.c:1.8 --- wine/dlls/comctl32/string.c:1.7 3 Nov 2005 19:31:59 -0000 +++ wine/dlls/comctl32/string.c 3 Nov 2005 19:31:59 -0000 @@ -40,6 +40,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); +INT WINAPI StrCmpNA(LPCSTR, LPCSTR, INT); +INT WINAPI StrCmpNW(LPCWSTR, LPCWSTR, INT); +INT WINAPI StrCmpNIA(LPCSTR, LPCSTR, INT); +INT WINAPI StrCmpNIW(LPCWSTR, LPCWSTR, INT); + /************************************************************************* * COMCTL32_ChrCmpHelperA * @@ -180,7 +185,7 @@ LPSTR WINAPI StrChrA(LPCSTR lpszStr, WOR * Internal implementation of StrStrA/StrStrIA */ static LPSTR COMCTL32_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, - int (*pStrCmpFn)(LPCSTR,LPCSTR,size_t)) + INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; @@ -204,7 +209,7 @@ static LPSTR COMCTL32_StrStrHelperA(LPCS * Internal implementation of StrStrW/StrStrIW */ static LPWSTR COMCTL32_StrStrHelperW(LPCWSTR lpszStr, LPCWSTR lpszSearch, - int (*pStrCmpFn)(LPCWSTR,LPCWSTR,int)) + INT (WINAPI *pStrCmpFn)(LPCWSTR,LPCWSTR,INT)) { int iLen; @@ -238,7 +243,7 @@ LPSTR WINAPI StrStrIA(LPCSTR lpszStr, LP { TRACE("(%s,%s)\n", debugstr_a(lpszStr), debugstr_a(lpszSearch)); - return COMCTL32_StrStrHelperA(lpszStr, lpszSearch, strncasecmp); + return COMCTL32_StrStrHelperA(lpszStr, lpszSearch, StrCmpNIA); } /************************************************************************** @@ -267,7 +272,7 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, { TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); - return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, strncmpiW); + return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, StrCmpNIW); } /************************************************************************** @@ -381,7 +386,7 @@ INT WINAPI StrCmpNA(LPCSTR lpszStr, LPCS * An integer less than, equal to or greater than 0, indicating that * lpszStr is less than, the same, or greater than lpszComp. */ -int WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, int iLen) +INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) { INT iRet; @@ -396,7 +401,7 @@ int WINAPI StrCmpNIA(LPCSTR lpszStr, LPC * * See StrCmpNIA. */ -INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, int iLen) +INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) { INT iRet; @@ -504,7 +509,7 @@ LPSTR WINAPI StrStrA(LPCSTR lpszStr, LPC { TRACE("(%s,%s)\n", debugstr_a(lpszStr), debugstr_a(lpszSearch)); - return COMCTL32_StrStrHelperA(lpszStr, lpszSearch, strncmp); + return COMCTL32_StrStrHelperA(lpszStr, lpszSearch, StrCmpNA); } /************************************************************************** @@ -516,7 +521,7 @@ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, L { TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); - return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, strncmpW); + return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, StrCmpNW); } /*************************************************************************

1 0

wine/programs/winecfg audio.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21094 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 13:31:45 Modified files: programs/winecfg: audio.c Log message: Vijay Kiran Kamuju <infyquest(a)gmail.com> Show detected audio drivers in autodetect. Patch: http://cvs.winehq.org/patch.py?id=21094 Old revision New revision Changes Path 1.14 1.15 +8 -2 wine/programs/winecfg/audio.c Index: wine/programs/winecfg/audio.c diff -u -p wine/programs/winecfg/audio.c:1.14 wine/programs/winecfg/audio.c:1.15 --- wine/programs/winecfg/audio.c:1.14 3 Nov 2005 19:31:45 -0000 +++ wine/programs/winecfg/audio.c 3 Nov 2005 19:31:45 -0000 @@ -168,7 +168,7 @@ static const char *audioAutoDetect(void) const char *driversFound[10]; const char *name[10]; - int numFound = 0; + int numFound = 0,i; argv_new[0] = "/bin/sh"; argv_new[1] = "-c"; @@ -234,7 +234,13 @@ static const char *audioAutoDetect(void) { /* TODO: possibly smarter handling of multiple drivers? */ char text[128]; - snprintf(text, sizeof(text), "Found %s", name[0]); + sprintf(text, "Found "); + for(i=0;i<numFound;i++) + { + strcat(text, name[i]); + if(i != numFound-1) + strcat(text,", "); + } MessageBox(NULL, (LPCTSTR)text, "Successful", MB_OK); return driversFound[0]; }

1 0

wine/dlls/x11drv winpos.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21093 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 13:31:38 Modified files: dlls/x11drv : winpos.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Stricter check whether a window needs to be mapped on the screen. Patch: http://cvs.winehq.org/patch.py?id=21093 Old revision New revision Changes Path 1.139 1.140 +12 -11 wine/dlls/x11drv/winpos.c Index: wine/dlls/x11drv/winpos.c diff -u -p wine/dlls/x11drv/winpos.c:1.139 wine/dlls/x11drv/winpos.c:1.140 --- wine/dlls/x11drv/winpos.c:1.139 3 Nov 2005 19:31:38 -0000 +++ wine/dlls/x11drv/winpos.c 3 Nov 2005 19:31:38 -0000 @@ -643,11 +643,12 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H if (data->whole_window && !(swp_flags & SWP_WINE_NOHOSTMOVE)) { - if (!(old_style & WS_VISIBLE) && (new_style & WS_VISIBLE)) + if ((new_style & WS_VISIBLE) && !(new_style & WS_MINIMIZE) && + X11DRV_is_window_rect_mapped( rectWindow )) { - /* window got shown, map it */ - if (X11DRV_is_window_rect_mapped( rectWindow )) + if (!(old_style & WS_VISIBLE)) { + /* window got shown, map it */ TRACE( "mapping win %p\n", hwnd ); X11DRV_sync_window_style( display, data ); X11DRV_set_wm_hints( display, data ); @@ -655,14 +656,14 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); } - } - else if ((new_style & WS_VISIBLE) && X11DRV_is_window_rect_mapped( rectWindow )) - { - /* resizing from zero size to non-zero -> map */ - TRACE( "mapping non zero size or off-screen win %p\n", hwnd ); - wine_tsx11_lock(); - XMapWindow( display, data->whole_window ); - wine_tsx11_unlock(); + else if ((swp_flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) + { + /* resizing from zero size to non-zero -> map */ + TRACE( "mapping non zero size or off-screen win %p\n", hwnd ); + wine_tsx11_lock(); + XMapWindow( display, data->whole_window ); + wine_tsx11_unlock(); + } } wine_tsx11_lock(); XFlush( display ); /* FIXME: should not be necessary */

1 0

wine/dlls/ntdll time.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21092 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 07:21:23 Modified files: dlls/ntdll : time.c Log message: Kieran Clancy <n0dalus+wine(a)gmail.com> Added another CST (Australian Central Daylight Time) to TZ_INFO. Patch: http://cvs.winehq.org/patch.py?id=21092 Old revision New revision Changes Path 1.80 1.81 +3 -0 wine/dlls/ntdll/time.c Index: wine/dlls/ntdll/time.c diff -u -p wine/dlls/ntdll/time.c:1.80 wine/dlls/ntdll/time.c:1.81 --- wine/dlls/ntdll/time.c:1.80 3 Nov 2005 13:21:23 -0000 +++ wine/dlls/ntdll/time.c 3 Nov 2005 13:21:23 -0000 @@ -297,6 +297,9 @@ static const struct tagTZ_INFO TZ_INFO[] {"CST", {'C','e','n','.',' ','A','u','s','t','r','a','l','i','a',' ','S','t','a', 'n','d','a','r','d',' ','T','i','m','e','\0'}, -570, 0}, + {"CST", + {'C','e','n','.',' ','A','u','s','t','r','a','l','i','a',' ','D','a','y', + 'l','i','g','h','t',' ','T','i','m','e','\0'}, -630, 1}, {"EST", {'E','.',' ','A','u','s','t','r','a','l','i','a',' ','S','t','a','n','d', 'a','r','d',' ','T','i','m','e','\0'}, -600, 0},

1 0