January 2009 - Wine-Commits

Scott Ritchie : Remove long defunct Windows, Solaris, and Etch versions from download page
by Jeremy Newman Jan. 9, 2009

Jan. 9, 2009

Module: website Branch: master Commit: cf859c6871d9f092c9f43f9200e6054df2e9cea9 URL: http://source.winehq.org/git/website.git/?a=commit;h=cf859c6871d9f092c9f43f… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Jan 8 15:21:49 2009 -0800 Remove long defunct Windows, Solaris, and Etch versions from download page Remove references to unmaintained Etch, Solaris, and Windows versions from the download page. Update Ubuntu download page to make Ubuntu specific, and move command line instructions to the bottom. >From 6989941bfd0209d9fde707c190a7fb595fc47ae7 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Thu, 8 Jan 2009 15:12:28 -0800 Subject: Remove references to unmaintained Etch, Solaris, and Windows versions from the download page. Update Ubuntu download page to make Ubuntu specific, and move command line instructions to the bottom. --- templates/en/download.template | 27 ------------- templates/en/download/deb.template | 76 +++++++++++++++++------------------- 2 files changed, 36 insertions(+), 67 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 8c0bdb8..97e5dfb 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -64,15 +64,6 @@ for post-installation instructions. <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/deb"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> - </td> - <td> <a href="{$root}/download/deb">Debian</a> - binary and source .debs for Debian Etch (4.0)</td> - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> - </tr> - <tr bgcolor="#ffffff"> <td align=center><a href="{$root}/download/deblenny"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> @@ -144,24 +135,6 @@ for post-installation instructions. <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> </tr> - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://ocean1.ee.duth.gr/SolarisX/"> - <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> - </td> - <td> <a href="http://ocean1.ee.duth.gr/SolarisX/">Solaris</a> - binary and source for Solaris 10 and 11</td> - <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> - </tr> - - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…"> - <img src="{$root}/images/distro/windows.png" width="50" height="54" alt="Windows" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…">Windows</a> binary .zips</td> - <td><a href="mailto:ivanleo(a)gmail.com">Ivan Leo Puoti</a></td> - </tr> - </table> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index c5d413e..240beaa 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -1,17 +1,16 @@   -<h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> -Wine for Ubuntu, Debian Etch, and Debian-based distributions -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> +<h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> +Wine for Ubuntu and Ubuntu derivatives +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> Ubuntu and other Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up -to date, by scanning what are known as APT repositories. Debian-based -distributions have their own repositories of software that include Wine, -however we keep our own repository of the latest available beta packages here -for download. +to date, by scanning what are known as APT repositories. Ubuntu has its own +repository of software that includes Wine, however we keep our own repository +of the latest available beta packages here for download. <h2>Warning: These are beta packages</h2> @@ -37,8 +36,6 @@ version you are running. deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" For Ubuntu Hardy (8.04): deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" -For Debian Etch (4.0): -deb http://wine.budgetdedicated.com/apt etch main #WineHQ - Debian 4.0 "Etch" <h2>Trusting the WineHQ APT Repository and installing Wine:</h2> @@ -48,40 +45,16 @@ to your system's list of trusted keys. <a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Download and save Scott Ritchie's key</a> to your desktop. Then open the Authentication tab, click import key file, and select the key -file you just saved (Scott Ritchie.gpg). It is safe to delete this file after -doing this step. +file you just saved (Scott Ritchie.gpg). It is safe to delete this file +after doing this step. <img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> -Click close to finish, and then reload the package information. If -you have Wine installed, the system's update manager will now inform you of the -latest Wine beta release and prompt you to upgrade. If you haven't installed -Wine yet, go to Applications->Add/Remove and search for Wine. - -<h2>Command Line Instructions for Installing Wine:</h2> - -An alternate method for adding the Wine repositories and installing Wine is through the command line, as follows: - -First, open a terminal window (Applications->Accessories->Terminal). On -Debian, you will need to open a root terminal. Then add the repository's key -to your system's list of trusted APT keys by copy and pasting the following into your terminal: - -wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - - -Next, add the repository to your system's list of APT sources: - -For Ubuntu Intrepid (8.10): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Hardy (8.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list -For Debian Etch (4.0): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list - -Then update APT's package information by running 'sudo apt-get update'. - -If you are using Ubuntu, you can now install Wine by <a href="apt://wine"> -clicking this link</a>. Alternatively, you can install by going to -Applications->Add/Remove and searching for Wine. +Click close to finish, and then reload the package information when +prompted. If you have Wine installed, the system's update manager will now +inform you of the latest Wine beta release and prompt you to upgrade. If you +haven't installed Wine yet, go to Applications->Add/Remove and search for +Wine or just <a href="apt://wine">click this link</a>. <h2>Upgrading to a new version of Ubuntu</h2> @@ -98,5 +71,28 @@ the packages are available at You can install downloaded packages by double-clicking on them. +<h2>Alternative command Line Instructions for Installing Wine:</h2> + +It is also possible to add the Wine repositories and install via the command +line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu +derivatives. + +First, open a terminal window (Applications->Accessories->Terminal). Then +add the repository's key to your system's list of trusted APT keys by copy +and pasting the following into your terminal: + +wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - + +Next, add the repository to your system's list of APT sources: + +For Ubuntu Intrepid (8.10): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list +For Ubuntu Hardy (8.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list + +Then update APT's package information by running 'sudo apt-get +update'. You can now install Wine normally or by typing 'sudo apt-get +install wine' into the terminal. + Very fast and reliable webhosting for the APT repository is graciously provided by <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.

1 0

ricardo filipe : Website: add portuguese translation info
by Jeremy Newman Jan. 9, 2009

Jan. 9, 2009

Module: website Branch: master Commit: 0aa0264121f15901222008afd0a5ed228f940ad1 URL: http://source.winehq.org/git/website.git/?a=commit;h=0aa0264121f15901222008… Author: ricardo filipe <ricardo_barbano(a)hotmail.com> Date: Fri Jan 9 15:47:45 2009 +0000 Website: add portuguese translation info these are the preliminary steps to show the portuguese translation _________________________________________________________________ More than messages–check out the rest of the Windows Live™. http://www.microsoft.com/windows/windowslive/ >From 8c995aa50f99a195d6a12a31675b16d26f14f8c8 Mon Sep 17 00:00:00 2001 From: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Fri, 9 Jan 2009 03:01:27 +0000 Subject: add portuguese translation info --- include/data.php | 4 ++++ include/winehq.conf.sample | 2 +- templates/en/lang.template | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/data.php b/include/data.php index 6c5a90a..a0e2f5f 100644 --- a/include/data.php +++ b/include/data.php @@ -60,6 +60,10 @@ class data 'fr' => array( 'name' => 'Français', 'change' => 'Changez la langue' + ), + 'pt' => array( + 'name' => 'Português', + 'change' => 'Mudar a língua' ) ); diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 2ec82ab..b5d5025 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -16,7 +16,7 @@ theme: winehq lang: en # available languages -(a)languages: en, de, es, fr +(a)languages: en, de, es, fr, pt # default base URLS (if you run the site, in a subdir, set base_root) base_root: diff --git a/templates/en/lang.template b/templates/en/lang.template index cdd3052..a634696 100644 --- a/templates/en/lang.template +++ b/templates/en/lang.template @@ -22,7 +22,11 @@ </li> <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/fr" title="Español">Français</a> (French) + <a href="{$root}/lang/fr" title="Français">Français</a> (French) + </li> + + <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/pt" title="Português">Português</a> (Portuguese) </li> </ul>

1 0

Stefan Dösinger : ddrawex: Add a test for the permanent DC function.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: a69c86d3f517f659ba47495f77deac2df671fb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69c86d3f517f659ba47495f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 18 16:43:06 2008 +0100 ddrawex: Add a test for the permanent DC function. --- dlls/d3d8/surface.c | 6 +++- dlls/d3d9/surface.c | 6 +++- dlls/ddrawex/tests/surface.c | 62 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_gdi.c | 2 +- include/wine/wined3d.idl | 1 + 6 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 6ecd7af..0d06da2 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -206,7 +206,11 @@ static HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(LPDIRECT3DSURFACE8 iface) EnterCriticalSection(&d3d8_cs); hr = IWineD3DSurface_UnlockRect(This->wineD3DSurface); LeaveCriticalSection(&d3d8_cs); - return hr; + switch(hr) + { + case WINEDDERR_NOTLOCKED: return D3DERR_INVALIDCALL; + default: return hr; + } } const IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl = diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 394d527..a626049 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -241,7 +241,11 @@ static HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(LPDIRECT3DSURFACE9 iface) EnterCriticalSection(&d3d9_cs); hr = IWineD3DSurface_UnlockRect(This->wineD3DSurface); LeaveCriticalSection(&d3d9_cs); - return hr; + switch(hr) + { + case WINEDDERR_NOTLOCKED: return D3DERR_INVALIDCALL; + default: return hr; + } } static HRESULT WINAPI IDirect3DSurface9Impl_GetDC(LPDIRECT3DSURFACE9 iface, HDC* phdc) { diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index 1edb9d5..dd9ebfb 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -60,7 +60,7 @@ static void dctest_surf(IDirectDrawSurface *surf, int ddsdver) { ok(dc2 == (HDC) 0x1234, "The failed GetDC call changed the dc: %p\n", dc2); hr = IDirectDrawSurface_Lock(surf, NULL, ddsdver == 1 ? &ddsd : ((DDSURFACEDESC *) &ddsd2), 0, NULL); - ok(hr == DDERR_SURFACEBUSY, "IDirectDrawSurface_Lock returned 0x%08x, expected DDERR_ALREADYLOCKED\n", hr); + ok(hr == DDERR_SURFACEBUSY, "IDirectDrawSurface_Lock returned 0x%08x, expected DDERR_SURFACEBUSY\n", hr); hr = IDirectDrawSurface_ReleaseDC(surf, dc); ok(hr == DD_OK, "IDirectDrawSurface_ReleaseDC failed: 0x%08x\n", hr); @@ -170,6 +170,65 @@ static void CapsTest(void) IDirectDraw_Release(dd1); } +static void dctest_sysvidmem(IDirectDrawSurface *surf, int ddsdver) { + HRESULT hr; + HDC dc, dc2 = (HDC) 0x1234; + DDSURFACEDESC ddsd; + DDSURFACEDESC2 ddsd2; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + + hr = IDirectDrawSurface_GetDC(surf, &dc); + ok(hr == DD_OK, "IDirectDrawSurface_GetDC failed: 0x%08x\n", hr); + + hr = IDirectDrawSurface_GetDC(surf, &dc2); + ok(hr == DD_OK, "IDirectDrawSurface_GetDC failed: 0x%08x\n", hr); + ok(dc == dc2, "Got two different DCs\n"); + + hr = IDirectDrawSurface_Lock(surf, NULL, ddsdver == 1 ? &ddsd : ((DDSURFACEDESC *) &ddsd2), 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_Lock returned 0x%08x, expected DD_OK\n", hr); + + hr = IDirectDrawSurface_Lock(surf, NULL, ddsdver == 1 ? &ddsd : ((DDSURFACEDESC *) &ddsd2), 0, NULL); + ok(hr == DDERR_SURFACEBUSY, "IDirectDrawSurface_Lock returned 0x%08x, expected DDERR_SURFACEBUSY\n", hr); + + hr = IDirectDrawSurface_Unlock(surf, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_Unlock returned 0x%08x, expected DD_OK\n", hr); + hr = IDirectDrawSurface_Unlock(surf, NULL); + ok(hr == DDERR_NOTLOCKED, "IDirectDrawSurface_Unlock returned 0x%08x, expected DDERR_NOTLOCKED\n", hr); + + hr = IDirectDrawSurface_ReleaseDC(surf, dc); + ok(hr == DD_OK, "IDirectDrawSurface_ReleaseDC failed: 0x%08x\n", hr); + hr = IDirectDrawSurface_ReleaseDC(surf, dc); + ok(hr == DD_OK, "IDirectDrawSurface_ReleaseDC failed: 0x%08x\n", hr); + /* That works any number of times... */ + hr = IDirectDrawSurface_ReleaseDC(surf, dc); + ok(hr == DD_OK, "IDirectDrawSurface_ReleaseDC failed: 0x%08x\n", hr); +} + +static void SysVidMemTest(void) +{ + DDSURFACEDESC ddsd; + DDSURFACEDESC2 ddsd2; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_VIDEOMEMORY; + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_VIDEOMEMORY; + + GetDCTest_main(&ddsd, &ddsd2, dctest_sysvidmem); +} + START_TEST(surface) { IClassFactory *classfactory = NULL; @@ -193,6 +252,7 @@ START_TEST(surface) GetDCTest(); CapsTest(); + SysVidMemTest(); if(factory) { ref = IDirectDrawFactory_Release(factory); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1793696..771291f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1320,7 +1320,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { if (!(This->Flags & SFLAG_LOCKED)) { WARN("trying to Unlock an unlocked surf@%p\n", This); - return WINED3DERR_INVALIDCALL; + return WINEDDERR_NOTLOCKED; } if (This->Flags & SFLAG_PBO) { diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 7e53cd3..4a8f6fa 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -168,7 +168,7 @@ IWineGDISurfaceImpl_UnlockRect(IWineD3DSurface *iface) if (!(This->Flags & SFLAG_LOCKED)) { WARN("trying to Unlock an unlocked surf@%p\n", This); - return WINED3DERR_INVALIDCALL; + return WINEDDERR_NOTLOCKED; } /* Can be useful for debugging */ diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b43a8e7..21e55c1 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -74,6 +74,7 @@ cpp_quote("#define WINED3DERR_INVALIDCALL MAKE_WINED3DHRESU cpp_quote("#define WINED3DERR_DRIVERINVALIDCALL MAKE_WINED3DHRESULT(2157)") cpp_quote("#define WINED3DERR_WASSTILLDRAWING MAKE_WINED3DHRESULT(540)") cpp_quote("#define WINEDDERR_NOTAOVERLAYSURFACE MAKE_WINED3DHRESULT(580)") +cpp_quote("#define WINEDDERR_NOTLOCKED MAKE_WINED3DHRESULT(584)") cpp_quote("#define WINEDDERR_NODC MAKE_WINED3DHRESULT(586)") cpp_quote("#define WINEDDERR_DCALREADYCREATED MAKE_WINED3DHRESULT(620)") cpp_quote("#define WINEDDERR_NOTFLIPPABLE MAKE_WINED3DHRESULT(582)")

1 0

Stefan Dösinger : ddrawex: Make the GetDC test more generic.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 58480f16638efb841033fe2f6c0a9943affe6ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58480f16638efb841033fe2f6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 18 16:16:33 2008 +0100 ddrawex: Make the GetDC test more generic. --- dlls/ddrawex/tests/surface.c | 73 ++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 35 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index c8d519b..1edb9d5 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -68,10 +68,8 @@ static void dctest_surf(IDirectDrawSurface *surf, int ddsdver) { ok(hr == DDERR_NODC, "IDirectDrawSurface_ReleaseDC returned 0x%08x, expected DDERR_NODC\n", hr); } -static void GetDCTest(void) +static void GetDCTest_main(DDSURFACEDESC *ddsd, DDSURFACEDESC2 *ddsd2, void (*testfunc)(IDirectDrawSurface *surf, int ddsdver)) { - DDSURFACEDESC ddsd; - DDSURFACEDESC2 ddsd2; IDirectDrawSurface *surf; IDirectDrawSurface2 *surf2; IDirectDrawSurface2 *surf3; @@ -82,34 +80,21 @@ static void GetDCTest(void) IDirectDraw3 *dd3; IDirectDraw4 *dd4; - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.dwWidth = 64; - ddsd.dwHeight = 64; - ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - memset(&ddsd2, 0, sizeof(ddsd2)); - ddsd2.dwSize = sizeof(ddsd2); - ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd2.dwWidth = 64; - ddsd2.dwHeight = 64; - ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - - hr = IDirectDraw_CreateSurface(dd1, &ddsd, &surf, NULL); + hr = IDirectDraw_CreateSurface(dd1, ddsd, &surf, NULL); ok(hr == DD_OK, "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); - dctest_surf(surf, 1); + testfunc(surf, 1); IDirectDrawSurface_Release(surf); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw2, (void **) &dd2); ok(hr == DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); - hr = IDirectDraw2_CreateSurface(dd2, &ddsd, &surf, NULL); + hr = IDirectDraw2_CreateSurface(dd2, ddsd, &surf, NULL); ok(hr == DD_OK, "IDirectDraw2_CreateSurface failed: 0x%08x\n", hr); - dctest_surf(surf, 1); + testfunc(surf, 1); hr = IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2); ok(hr == DD_OK, "IDirectDrawSurface_QueryInterface failed: 0x%08x\n", hr); - dctest_surf((IDirectDrawSurface *) surf2, 1); + testfunc((IDirectDrawSurface *) surf2, 1); IDirectDrawSurface2_Release(surf2); IDirectDrawSurface_Release(surf); @@ -118,28 +103,25 @@ static void GetDCTest(void) hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **) &dd3); ok(hr == DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IDirectDraw3_CreateSurface(dd3, &ddsd, &surf, NULL); - ok(hr == DD_OK, "IDirectDraw3_CreateSurface failed: 0x%08x\n", hr); - dctest_surf(surf, 1); + hr = IDirectDraw3_CreateSurface(dd3, ddsd, &surf, NULL); + ok(hr == DD_OK, "IDirectDraw3_CreateSurface failed: 0x%08x\n", hr); + testfunc(surf, 1); - hr = IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface3, (void **) &surf3); - ok(hr == DD_OK, "IDirectDrawSurface_QueryInterface failed: 0x%08x\n", hr); - dctest_surf((IDirectDrawSurface *) surf3, 1); + hr = IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface3, (void **) &surf3); + ok(hr == DD_OK, "IDirectDrawSurface_QueryInterface failed: 0x%08x\n", hr); + testfunc((IDirectDrawSurface *) surf3, 1); - IDirectDrawSurface3_Release(surf3); - IDirectDrawSurface_Release(surf); - IDirectDraw3_Release(dd3); - } + IDirectDrawSurface3_Release(surf3); + IDirectDrawSurface_Release(surf); + IDirectDraw3_Release(dd3); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); ok(hr == DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); surf = NULL; - hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + hr = IDirectDraw4_CreateSurface(dd4, ddsd2, &surf4, NULL); ok(hr == DD_OK, "IDirectDraw4_CreateSurface failed: 0x%08x\n", hr); - dctest_surf((IDirectDrawSurface *) surf4, 2); + testfunc((IDirectDrawSurface *) surf4, 2); IDirectDrawSurface4_Release(surf4); IDirectDraw4_Release(dd4); @@ -147,6 +129,27 @@ static void GetDCTest(void) IDirectDraw_Release(dd1); } +static void GetDCTest(void) +{ + DDSURFACEDESC ddsd; + DDSURFACEDESC2 ddsd2; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + + GetDCTest_main(&ddsd, &ddsd2, dctest_surf); +} + static void CapsTest(void) { DDSURFACEDESC ddsd;

1 0

Stefan Dösinger : ddrawex: Implement a GetDC special behavior Internet Explorer depends on.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: da6c9e4cc2a85a5b46f1c9234acf17a0f2dd8874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6c9e4cc2a85a5b46f1c9234… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 18 16:13:06 2008 +0100 ddrawex: Implement a GetDC special behavior Internet Explorer depends on. Tests show that in ddrawex.dll it is legal to create a surface with both DDSCAPS_VIDEOMEMORY and DDSCAPS_SYSTEMMEMORY flag set. A surface created that way shows different behavior in IDirectDrawSurface::GetDC. --- dlls/ddrawex/ddraw.c | 19 ++++++++++++++ dlls/ddrawex/ddrawex_private.h | 4 +++ dlls/ddrawex/surface.c | 55 +++++++++++++++++++++++++++++++++++++--- dlls/ddrawex/tests/surface.c | 2 +- 4 files changed, 75 insertions(+), 5 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 9645a3d..9e8066a 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -387,6 +387,8 @@ IDirectDraw4Impl_CreateSurface(IDirectDraw4 *iface, { IDirectDrawImpl *This = impl_from_dd4(iface); HRESULT hr; + const DWORD perm_dc_flags = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; + BOOL permanent_dc; TRACE("(%p)(%p, %p, %p)\n", This, DDSD, Surf, UnkOuter); if(UnkOuter != NULL) @@ -395,8 +397,25 @@ IDirectDraw4Impl_CreateSurface(IDirectDraw4 *iface, FIXME("Implement aggregation for ddrawex surfaces\n"); } + /* plain ddraw.dll refuses to create a surface that has both VIDMEM and SYSMEM flags + * set. In ddrawex this succeeds, and the GetDC() call changes the behavior. The DC + * is permanently valid, and the surface can be locked between GetDC() and ReleaseDC() + * calls. GetDC() can be called more than once too + */ + if((DDSD->ddsCaps.dwCaps & perm_dc_flags) == perm_dc_flags) + { + permanent_dc = TRUE; + DDSD->ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY; + DDSD->ddsCaps.dwCaps |= DDSCAPS_OWNDC; + } + else + { + permanent_dc = FALSE; + } + hr = IDirectDraw4_CreateSurface(This->parent, DDSD, Surf, UnkOuter); *Surf = dds_get_outer(*Surf); + if(permanent_dc) prepare_permanent_dc(*Surf); return hr; } diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 12d76d5..3e7a0e2 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -100,6 +100,9 @@ typedef struct /* The interface we're forwarding to */ IDirectDrawSurface4 *parent; + BOOL permanent_dc; + HDC hdc; + /* An UUID we use to store the outer surface as private data in the inner surface */ #define IID_DDrawexPriv IID_IDirectDrawSurface4 @@ -107,5 +110,6 @@ typedef struct IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner); IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer); +HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface); #endif /* __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H */ diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 9b16ce5..106b027 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -563,7 +563,16 @@ IDirectDrawSurface4Impl_GetDC(IDirectDrawSurface4 *iface, { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); TRACE("(%p)->(%p)\n", This, hdc); - return IDirectDrawSurface4_GetDC(This->parent, hdc); + if(This->permanent_dc) + { + TRACE("Returning stored dc %p\n", This->hdc); + *hdc = This->hdc; + return DD_OK; + } + else + { + return IDirectDrawSurface4_GetDC(This->parent, hdc); + } } static HRESULT WINAPI @@ -654,8 +663,17 @@ IDirectDrawSurface4Impl_GetSurfaceDesc(IDirectDrawSurface4 *iface, DDSURFACEDESC2 *DDSD) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); + HRESULT hr; TRACE("(%p)->(%p)\n", This, DDSD); - return IDirectDrawSurface4_GetSurfaceDesc(This->parent, DDSD); + hr = IDirectDrawSurface4_GetSurfaceDesc(This->parent, DDSD); + + if(SUCCEEDED(hr) && This->permanent_dc) + { + DDSD->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; + DDSD->ddsCaps.dwCaps &= ~DDSCAPS_OWNDC; + } + + return hr; } static HRESULT WINAPI @@ -731,8 +749,17 @@ IDirectDrawSurface4Impl_Lock(IDirectDrawSurface4 *iface, HANDLE h) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); + HRESULT hr; TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, Rect, DDSD, Flags, h); - return IDirectDrawSurface4_Lock(This->parent, Rect, DDSD, Flags, h); + hr = IDirectDrawSurface4_Lock(This->parent, Rect, DDSD, Flags, h); + + if(SUCCEEDED(hr) && This->permanent_dc) + { + DDSD->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; + DDSD->ddsCaps.dwCaps &= ~DDSCAPS_OWNDC; + } + + return hr; } static HRESULT WINAPI @@ -759,7 +786,15 @@ IDirectDrawSurface4Impl_ReleaseDC(IDirectDrawSurface4 *iface, { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); TRACE("(%p)->(%p)\n", This, hdc); - return IDirectDrawSurface4_ReleaseDC(This->parent, hdc); + if(This->permanent_dc) + { + TRACE("Surface has a permanent DC, not doing anything\n"); + return DD_OK; + } + else + { + return IDirectDrawSurface4_ReleaseDC(This->parent, hdc); + } } static HRESULT WINAPI @@ -1259,3 +1294,15 @@ IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer) if(This == NULL) return NULL; return This->parent; } + +HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) +{ + IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); + HRESULT hr; + This->permanent_dc = TRUE; + + hr = IDirectDrawSurface4_GetDC(This->parent, &This->hdc); + if(FAILED(hr)) return hr; + hr = IDirectDrawSurface4_ReleaseDC(This->parent, This->hdc); + return hr; +} diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index b2065bc..c8d519b 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -161,7 +161,7 @@ static void CapsTest(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; hr = IDirectDraw_CreateSurface(dd1, &ddsd, &surf, NULL); - todo_wine ok(hr == DD_OK, "Creating a SYSMEM | VIDMEM surface returned 0x%08x, expected DD_OK\n", hr); + ok(hr == DD_OK, "Creating a SYSMEM | VIDMEM surface returned 0x%08x, expected DD_OK\n", hr); if(surf) IDirectDrawSurface_Release(surf); IDirectDraw_Release(dd1);

1 0

Stefan Dösinger : ddrawex: Create a surface wrapper.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 0d80130aa21211eae6dba12498c3a6256b5fa046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d80130aa21211eae6dba1249… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 18 15:40:55 2008 +0100 ddrawex: Create a surface wrapper. --- dlls/ddrawex/Makefile.in | 3 +- dlls/ddrawex/ddraw.c | 80 +++- dlls/ddrawex/ddrawex_private.h | 26 + dlls/ddrawex/surface.c | 1261 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1359 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d80130aa21211eae6dba…

1 0

Stefan Dösinger : ddrawex: Add a refcount test.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: b13894489232f1d4c3f6c522bbe52e1e92563eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13894489232f1d4c3f6c522b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 7 13:48:17 2009 +0100 ddrawex: Add a refcount test. --- dlls/ddrawex/tests/Makefile.in | 1 + dlls/ddrawex/tests/ddrawex.c | 119 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/ddrawex/tests/Makefile.in b/dlls/ddrawex/tests/Makefile.in index a945c81..709059e 100644 --- a/dlls/ddrawex/tests/Makefile.in +++ b/dlls/ddrawex/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = ddrawex.dll IMPORTS = user32 gdi32 kernel32 CTESTS = \ + ddrawex.c \ surface.c @MAKE_TEST_RULES@ diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c new file mode 100644 index 0000000..848c149 --- /dev/null +++ b/dlls/ddrawex/tests/ddrawex.c @@ -0,0 +1,119 @@ +/* + * Unit tests for ddrawex specific things + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include <assert.h> +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "ddraw.h" +#include "ddrawex.h" +#include "unknwn.h" + +static IDirectDrawFactory *factory; +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + +static IDirectDraw *createDD(void) +{ + HRESULT hr; + IDirectDraw *dd; + + hr = IDirectDrawFactory_CreateDirectDraw(factory, NULL, NULL, DDSCL_NORMAL, 0, + 0, &dd); + ok(hr == DD_OK, "Failed to create an IDirectDraw interface, hr = 0x%08x\n", hr); + return SUCCEEDED(hr) ? dd : NULL; +} + +static ULONG get_ref(IUnknown *o) +{ + IUnknown_AddRef(o); + return IUnknown_Release(o); +} + +static void RefCountTest(void) +{ + IDirectDraw *dd1 = createDD(); + IDirectDraw2 *dd2; + IDirectDraw3 *dd3; + IDirectDraw4 *dd4; + ULONG ref; + + ref = get_ref((IUnknown *) dd1); + ok(ref == 1, "A new ddraw object's refcount is %u, expected 1\n", ref); + + IDirectDraw_AddRef(dd1); + ref = get_ref((IUnknown *) dd1); + ok(ref == 2, "After AddRef the refcount is %u, expected 2\n", ref); + IDirectDraw_Release(dd1); + ref = get_ref((IUnknown *) dd1); + ok(ref == 1, "After Release the refcount is %u, expected 2\n", ref); + + IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw2, (void **) &dd2); + ref = get_ref((IUnknown *) dd2); + ok(ref == 2, "IDirectDraw2 refcount is %u, expected 2\n", ref); + + IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **) &dd3); + ref = get_ref((IUnknown *) dd3); + ok(ref == 3, "IDirectDraw3 refcount is %u, expected 3\n", ref); + + IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); + ref = get_ref((IUnknown *) dd4); + ok(ref == 4, "IDirectDraw4 refcount is %u, expected 4\n", ref); + + IDirectDraw_Release(dd1); + IDirectDraw2_Release(dd2); + IDirectDraw3_Release(dd3); + + ref = get_ref((IUnknown *) dd4); + ok(ref == 1, "IDirectDraw4 refcount is %u, expected 1\n", ref); + + IDirectDraw4_Release(dd4); +} + +START_TEST(ddrawex) +{ + IClassFactory *classfactory = NULL; + ULONG ref; + HRESULT hr; + HMODULE hmod = LoadLibrary("ddrawex.dll"); + if(hmod == NULL) { + skip("Failed to load ddrawex.dll\n"); + return; + } + pDllGetClassObject = (void*)GetProcAddress(hmod, "DllGetClassObject"); + if(pDllGetClassObject == NULL) { + skip("Failed to get DllGetClassObject\n"); + return; + } + + hr = pDllGetClassObject(&CLSID_DirectDrawFactory, &IID_IClassFactory, (void **) &classfactory); + ok(hr == S_OK, "Failed to create a IClassFactory\n"); + hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IDirectDrawFactory, (void **) &factory); + ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n"); + + RefCountTest(); + + if(factory) { + ref = IDirectDrawFactory_Release(factory); + ok(ref == 0, "IDirectDrawFactory not cleanly released\n"); + } + if(classfactory) { + ref = IClassFactory_Release(classfactory); + todo_wine ok(ref == 1, "IClassFactory refcount wrong, ref = %u\n", ref); + } +}

1 0

Stefan Dösinger : ddraw[ex]: Show a caps handling difference.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: ae4e8244230f6d298eadb71b9af8bda64991927b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4e8244230f6d298eadb71b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 9 12:32:24 2009 +0100 ddraw[ex]: Show a caps handling difference. --- dlls/ddraw/ddraw.c | 11 +++++++++++ dlls/ddraw/tests/dsurface.c | 10 ++++++++++ dlls/ddrawex/tests/surface.c | 21 +++++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 286e4b3..5a24ddb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2432,6 +2432,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, LONG extra_surfaces = 0; DDSURFACEDESC2 desc2; WINED3DDISPLAYMODE Mode; + const DWORD sysvidmem = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; TRACE("(%p)->(%p,%p,%p)\n", This, DDSD, Surf, UnkOuter); @@ -2490,6 +2491,16 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDCAPS; } + + if((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem) + { + /* This is a special switch in ddrawex.dll, but not allowed in ddraw.dll */ + WARN("Application tries to put the surface in both system and video memory\n"); + LeaveCriticalSection(&ddraw_cs); + *Surf = NULL; + return DDERR_INVALIDCAPS; + } + /* Check cube maps but only if the size includes them */ if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 68a51cd..a12b968 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2746,6 +2746,16 @@ static void SurfaceCapsTest(void) IDirectDraw7_Release(dd7); } + + memset(&create, 0, sizeof(create)); + create.dwSize = sizeof(create); + create.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + create.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_VIDEOMEMORY; + create.dwWidth = 64; + create.dwHeight = 64; + hr = IDirectDraw_CreateSurface(lpDD, &create, &surface1, NULL); + ok(hr == DDERR_INVALIDCAPS, "Creating a SYSMEM | VIDMEM surface returned 0x%08x, expected DDERR_INVALIDCAPS\n", hr); + if(surface1) IDirectDrawSurface_Release(surface1); } static BOOL can_create_primary_surface(void) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index 84743fe..b2065bc 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -147,6 +147,26 @@ static void GetDCTest(void) IDirectDraw_Release(dd1); } +static void CapsTest(void) +{ + DDSURFACEDESC ddsd; + IDirectDraw *dd1 = createDD(); + IDirectDrawSurface *surf; + HRESULT hr; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_VIDEOMEMORY; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + hr = IDirectDraw_CreateSurface(dd1, &ddsd, &surf, NULL); + todo_wine ok(hr == DD_OK, "Creating a SYSMEM | VIDMEM surface returned 0x%08x, expected DD_OK\n", hr); + if(surf) IDirectDrawSurface_Release(surf); + + IDirectDraw_Release(dd1); +} + START_TEST(surface) { IClassFactory *classfactory = NULL; @@ -169,6 +189,7 @@ START_TEST(surface) ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n"); GetDCTest(); + CapsTest(); if(factory) { ref = IDirectDrawFactory_Release(factory);

1 0

Stefan Dösinger : ddrawex: Start some tests.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 60039a5ba8871a60a4bbbadbb0ba381e49d862ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=60039a5ba8871a60a4bbbadbb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 9 12:24:49 2009 +0100 ddrawex: Start some tests. --- configure | 9 ++ configure.ac | 1 + dlls/ddrawex/tests/Makefile.in | 13 +++ dlls/ddrawex/tests/ddrawex.h | 46 ++++++++++ dlls/ddrawex/tests/surface.c | 181 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 250 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60039a5ba8871a60a4bbb…

1 0

Stefan Dösinger : ddrawex: Implement a wrapper around IDirectDraw.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: efcecb9b99331a39f2f96d456df280a15a9557ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=efcecb9b99331a39f2f96d456… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 9 12:23:17 2009 +0100 ddrawex: Implement a wrapper around IDirectDraw. This allows us to cleanly implement the differences between ddraw.dll and ddrawex.dll without private functions and if checks if an object was created by ddraw or ddrawex. A similar wrapper will be added for IDirectDrawSurface. --- dlls/ddrawex/Makefile.in | 1 + dlls/ddrawex/ddraw.c | 1484 ++++++++++++++++++++++++++++++++++++++++ dlls/ddrawex/ddrawex_private.h | 21 +- dlls/ddrawex/main.c | 32 +- 4 files changed, 1506 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efcecb9b99331a39f2f96…

1 0