February 2006 - Wine-commits

Vitaly Budovski : wined3d: Implemented WINED3DRS_MULTISAMPLEANTIALIAS.
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: 6de3620a9cf29bb36060975af2751d779bed6c5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6de3620a9cf29bb36060975… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Fri Feb 3 12:31:02 2006 +0100 wined3d: Implemented WINED3DRS_MULTISAMPLEANTIALIAS. --- dlls/wined3d/device.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ffeb1a..ab3cc6b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3618,6 +3618,21 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen TRACE("(%p)->(%d,%ld) Texture wraping not yet supported\n",This, State, Value); break; case WINED3DRS_MULTISAMPLEANTIALIAS : + { + if (!GL_SUPPORT(ARB_MULTISAMPLE)) { + TRACE("Multisample antialiasing not supported\n"); + break; + } + + if(Value) { + glEnable(GL_MULTISAMPLE_ARB); + checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); + } else { + glDisable(GL_MULTISAMPLE_ARB); + checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); + } + break; + } case WINED3DRS_MULTISAMPLEMASK : case WINED3DRS_PATCHEDGESTYLE : case WINED3DRS_PATCHSEGMENTS :

1 0

Dmitry Timoshkov : Add a check for icinfo->fccType in DRV_OPEN message handler of builtin
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: c13ae562892841a680ee68d965c8deadc47c15b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c13ae562892841a680ee68d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 3 12:29:26 2006 +0100 Add a check for icinfo->fccType in DRV_OPEN message handler of builtin video codecs. --- dlls/iccvid/iccvid.c | 7 +++++++ dlls/msrle32/msrle32.c | 2 ++ dlls/msvidc32/msvideo1.c | 7 +++++++ dlls/msvideo/msvideo_main.c | 2 +- 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 06915d1..ddb0d5b 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -961,7 +961,13 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ return 0; case DRV_OPEN: + { + ICINFO *icinfo = (ICINFO *)lParam2; + TRACE("Opened\n"); + + if (icinfo && icinfo->fccType != ICTYPE_VIDEO) return 0; + info = ICCVID_Alloc( sizeof (ICCVID_Info), 1 ); if( info ) { @@ -969,6 +975,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ info->cvinfo = NULL; } return (LRESULT) info; + } case ICM_GETINFO: return ICCVID_GetInfo( info, (ICINFO *)lParam1, (DWORD)lParam2 ); diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 7a4deca..3fb6c62 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1099,6 +1099,8 @@ static CodecInfo* Open(LPICOPEN icinfo) return (LPVOID)0xFFFF0000; } + if (icinfo->fccType != ICTYPE_VIDEO) return NULL; + TRACE("(%p = {%lu,0x%08lX(%4.4s),0x%08lX(%4.4s),0x%lX,0x%lX,...})\n", icinfo, icinfo->dwSize, icinfo->fccType, (char*)&icinfo->fccType, icinfo->fccHandler, (char*)&icinfo->fccHandler, diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 0a79139..c639d20 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -497,7 +497,13 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT break; case DRV_OPEN: + { + ICINFO *icinfo = (ICINFO *)lParam2; + TRACE("Opened\n"); + + if (icinfo && icinfo->fccType != ICTYPE_VIDEO) return 0; + info = HeapAlloc( GetProcessHeap(), 0, sizeof (Msvideo1Context) ); if( info ) { @@ -506,6 +512,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT } r = (LRESULT) info; break; + } case ICM_GETINFO: r = CRAM_GetInfo( info, (ICINFO *)lParam1, (DWORD)lParam2 ); diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 3059243..0479210 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -400,7 +400,7 @@ HIC MSVIDEO_OpenFunction(DWORD fccType, icopen.dwSize = sizeof(ICOPEN); icopen.fccType = fccType; icopen.fccHandler = fccHandler; - icopen.dwVersion = 0x00001000; /* FIXME */ + icopen.dwVersion = ICVERSION; icopen.dwFlags = wMode; icopen.dwError = 0; icopen.pV1Reserved = NULL;

1 0

Huw Davies : ole: Initialize a few more funcdesc members in CreateDispTypeInfo.
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: 16cc1858d04f9e2b355df2b273ad137903c5bd50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=16cc1858d04f9e2b355df2b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 3 12:29:39 2006 +0100 ole: Initialize a few more funcdesc members in CreateDispTypeInfo. --- dlls/oleaut32/typelib.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b6693fc..bf4a21b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6396,12 +6396,15 @@ HRESULT WINAPI CreateDispTypeInfo( *ppFuncDesc = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppFuncDesc)); (*ppFuncDesc)->Name = SysAllocString(md->szName); (*ppFuncDesc)->funcdesc.memid = md->dispid; + (*ppFuncDesc)->funcdesc.funckind = FUNC_DISPATCH; (*ppFuncDesc)->funcdesc.invkind = md->wFlags; (*ppFuncDesc)->funcdesc.callconv = md->cc; (*ppFuncDesc)->funcdesc.cParams = md->cArgs; (*ppFuncDesc)->funcdesc.cParamsOpt = 0; (*ppFuncDesc)->funcdesc.oVft = md->iMeth; (*ppFuncDesc)->funcdesc.wFuncFlags = 0; /*??*/ + (*ppFuncDesc)->funcdesc.elemdescFunc.u.paramdesc.wParamFlags = PARAMFLAG_NONE; + (*ppFuncDesc)->funcdesc.elemdescFunc.u.paramdesc.pparamdescex = NULL; (*ppFuncDesc)->funcdesc.elemdescFunc.tdesc.vt = md->vtReturn; (*ppFuncDesc)->funcdesc.lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, md->cArgs * sizeof(ELEMDESC)); @@ -6417,6 +6420,7 @@ HRESULT WINAPI CreateDispTypeInfo( (*ppFuncDesc)->Entry = NULL; (*ppFuncDesc)->ctCustData = 0; (*ppFuncDesc)->pCustData = NULL; + (*ppFuncDesc)->next = NULL; ppFuncDesc = &(*ppFuncDesc)->next; } *pptinfo = (ITypeInfo*)pTIImpl;

1 0

Juan Lang : crypt32: Add stub for CryptEnumOIDInfo.
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: b489f3819326659940fc11a5bbe727d57e1b46b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b489f3819326659940fc11a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Feb 3 12:28:33 2006 +0100 crypt32: Add stub for CryptEnumOIDInfo. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/oid.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 2815a45..34973e5 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -95,7 +95,7 @@ @ stdcall CryptEncodeObjectEx(long str ptr long ptr ptr ptr) @ stub CryptEncryptMessage @ stub CryptEnumOIDFunction -@ stub CryptEnumOIDInfo +@ stdcall CryptEnumOIDInfo(long long ptr ptr) @ stub CryptEnumProvidersU @ stub CryptExportPKCS8 @ stdcall CryptExportPublicKeyInfo(long long long ptr ptr) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index e9733a1..f9c4be8 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -76,6 +76,14 @@ void CRYPT_FreeFunctionSets(void) DeleteCriticalSection(&funcSetCS); } +BOOL WINAPI CryptEnumOIDInfo(DWORD dwGroupId, DWORD dwFlags, void *pvArg, + PFN_CRYPT_ENUM_OID_INFO pfnEnumOIDInfo) +{ + FIXME("(%ld, %08lx, %p, %p): stub\n", dwGroupId, dwFlags, pvArg, + pfnEnumOIDInfo); + return TRUE; +} + /* There is no free function associated with this; therefore, the sets are * freed when crypt32.dll is unloaded. */

1 0

Dmitry Timoshkov : Add support for CDM_HIDECONTROL message in the file open dialog.
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: c8c8f1b8badf601bc4f9c8551573b5ca9b7f9540 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8c8f1b8badf601bc4f9c85… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 3 12:28:42 2006 +0100 Add support for CDM_HIDECONTROL message in the file open dialog. --- dlls/commdlg/filedlg.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index e4a0463..a3a4c83 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -989,12 +989,19 @@ static INT_PTR FILEDLG95_HandleCustomDia break; case CDM_HIDECONTROL: - case CDM_SETDEFEXT: - FIXME("CDM_HIDECONTROL,CDM_SETCONTROLTEXT,CDM_SETDEFEXT not implemented\n"); - retval = -1; + /* MSDN states that it should fail for not OFN_EXPLORER case */ + if (fodInfos->ofnInfos->Flags & OFN_EXPLORER) + { + HWND control = GetDlgItem( hwnd, wParam ); + if (control) ShowWindow( control, SW_HIDE ); + retval = TRUE; + } + else retval = FALSE; break; default: + if (uMsg >= CDM_FIRST && uMsg <= CDM_LAST) + FIXME("message CDM_FIRST+%04x not implemented\n", uMsg - CDM_FIRST); return FALSE; } SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, retval);

1 0

Dmitry Timoshkov : wine.inf: Change fcc type of builtin video codecs in system.ini to be
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: de60d1e3bc616db9cb02b65346ecfcd592b659a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de60d1e3bc616db9cb02b65… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 3 12:29:09 2006 +0100 wine.inf: Change fcc type of builtin video codecs in system.ini to be equal to ICTYPE_VIDEO. --- tools/wine.inf | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index f0978d6..bd81436 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2105,12 +2105,12 @@ system.ini, drivers32,,"MSACM.imaadpcm=i system.ini, drivers32,,"MSACM.msadpcm=msadp32.acm" system.ini, drivers32,,"MSACM.msg711=msg711.acm" system.ini, drivers32,,"MSACM.winemp3=winemp3.acm" -system.ini, drivers32,,"VIDC.MRLE=msrle32.dll" -system.ini, drivers32,,"VIDC.MSVC=msvidc32.dll" -system.ini, drivers32,,"VIDC.CVID=iccvid.dll" -system.ini, drivers32,,"; VIDC.IV50=ir50_32.dll" -system.ini, drivers32,,"; VIDC.IV31=ir32_32.dll" -system.ini, drivers32,,"; VIDC.IV32=ir32_32.dll" +system.ini, drivers32,,"vidc.mrle=msrle32.dll" +system.ini, drivers32,,"vidc.msvc=msvidc32.dll" +system.ini, drivers32,,"vidc.cvid=iccvid.dll" +system.ini, drivers32,,"; vidc.iv50=ir50_32.dll" +system.ini, drivers32,,"; vidc.iv31=ir32_32.dll" +system.ini, drivers32,,"; vidc.iv32=ir32_32.dll" [Timezones] HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Display",,"Kwajalein"

1 0

lostwages/templates/en cvs.template
by Alexandre Julliard 02 Feb '06

02 Feb '06

ChangeSet ID: 22682 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/02/02 10:54:45 Modified files: templates/en : cvs.template Log message: Removed the cvsdirs instructions, this no longer works. Patch: http://cvs.winehq.org/patch.py?id=22682 Old revision New revision Changes Path 1.22 1.23 +0 -43 lostwages/templates/en/cvs.template Index: lostwages/templates/en/cvs.template diff -u -p lostwages/templates/en/cvs.template:1.22 lostwages/templates/en/cvs.template:1.23 --- lostwages/templates/en/cvs.template:1.22 2 Feb 2006 16:54:45 -0000 +++ lostwages/templates/en/cvs.template 2 Feb 2006 16:54:45 -0000 @@ -25,7 +25,6 @@ EU server only hosts the Wine source cod <ol> <li><a href="#co">Getting a local copy of Wine</a> <li><a href="#cvsservers">Wine CVS Servers</a> - <li><a href="#ftpcvs">Getting Wine via FTP and converting to CVS</a> <li><a href="#uptodate">Staying Up-To-Date</a> <li><a href="#useful">Useful Options</a> <li><a href="#modules">Other modules available via CVS from WineHQ</a> @@ -160,48 +159,6 @@ The password will be cached in "<code>~/ <p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> -<a name="ftpcvs" class="hidden"></a> - -<h1>Getting Wine via FTP and converting to CVS</h1> - -<p> -Getting the entire Wine source tree via -CVS is pretty slow, especially compared to getting Wine from an -FTP mirror near you. It's possible to convert a Wine tarball to a CVS -sandbox, just like you would get by checking out the entire source -via CVS. Here's how to do it: -<ul> - <li>Get the latest Wine snapshot: Wine-<i>x.x.x</i>.tar.gz - <li>Get wine-cvsdirs-<i>x.x.x</i>.tar.gz from - <a href="ftp://ftp.winehq.org/pub/wine/">ftp://ftp.winehq.org/pub/wine</a> - <li>Untar them on top of each other: - - <table width="300" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - tar xzf Wine-<i>x.x.x</i>.tar.gz<br> - mv wine-<i>x.x.x</i> wine<br> - tar xzf wine-cvsdirs-<i>x.x.x</i>.tar.gz<br> - </span> - </td></tr> - </table> - - -<li>Update from main tree: login as above, then do - - <table width="300" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - cd wine<br> - cvs update -PAd - </span> - </td></tr> - </table> - -</ul> -You will now be completely up to date. The <code>-A</code> is required to get the latest version in the tree. -<p> - -<p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> - <a name="uptodate" class="hidden"></a> <h1>Cleaning up your existing tree</h1>

1 0

tools/. wine_release
by Alexandre Julliard 02 Feb '06

02 Feb '06

ChangeSet ID: 22681 CVSROOT: /opt/cvs-commit Module name: tools Changes by: julliard(a)winehq.org 2006/02/02 10:53:51 Modified files: . : wine_release Log message: Get rid of the cvsdirs tarball, this no longer works with the new git packages. Patch: http://cvs.winehq.org/patch.py?id=22681 Old revision New revision Changes Path 1.16 1.17 +0 -9 tools/wine_release Index: tools/wine_release diff -u -p tools/wine_release:1.16 tools/wine_release:1.17 --- tools/wine_release:1.16 2 Feb 2006 16:53:51 -0000 +++ tools/wine_release 2 Feb 2006 16:53:51 -0000 @@ -86,15 +86,6 @@ rm -f winapi_stats.txt # cleanup source tree make distclean -# update cvsdirs tarball and place on ftp site -echo "==== UPDATING CVSDIRS TARBALL ====" -cd /var/tmp -rm -rf wine -cvstag=`echo $version | sed 's/\./_/g'` -cvs -Q -d:pserver:cvs(a)cvs.winehq.org:/home/wine co -r Wine-$cvstag wine -tar czf /home/ftp/pub/wine/wine-cvsdirs-$version.tar.gz `find wine -name CVS` -rm -rf wine - # homepage announcement # edit the homepage to announce the new release... # TODO

1 0

Alexandre Julliard : Release 0.9.7.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 5ccae1aec9ce8080731e1ff61ffc34678241e9f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ccae1aec9ce8080731e1ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 15:54:42 2006 +0100 Release 0.9.7. --- ANNOUNCE | 16 - ChangeLog | 1249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1267 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5ccae1aec9ce8080731…

1 0

Tag wine-0.9.7 : Alexandre Julliard : Release 0.9.7
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/tags/wine-0.9.7 Tag: 66e93d292b39b7351b7f1d060ba19bf9f8ca3bfa URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=66e93d292b39b7351b7f1d060b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 15:54:42 2006 +0100 Release 0.9.7

1 0