December 2005 - Wine-commits

bugzilla/template/en/default/global banner.htm ...
by Jeremy Newman 14 Dec '05

14 Dec '05

ChangeSet ID: 21851 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2005/12/14 09:40:13 Modified files: template/en/default/global: banner.html.tmpl Log message: take out the banner ad rotation for bugzilla Patch: http://cvs.winehq.org/patch.py?id=21851 Old revision New revision Changes Path 1.2 1.3 +5 -3 bugzilla/template/en/default/global/banner.html.tmpl Index: bugzilla/template/en/default/global/banner.html.tmpl diff -u -p bugzilla/template/en/default/global/banner.html.tmpl:1.2 bugzilla/template/en/default/global/banner.html.tmpl:1.3 --- bugzilla/template/en/default/global/banner.html.tmpl:1.2 14 Dec 2005 15:40:13 -0000 +++ bugzilla/template/en/default/global/banner.html.tmpl 14 Dec 2005 15:40:13 -0000 @@ -29,15 +29,17 @@ <tr> <td width="100%"><a href="http://bugs.winehq.org/"><img src="images/winehq_top_logo.gif" width=209 height=99 border=0 alt="Wine HQ Bugzilla"></a></td> <td> - <img src="images/blank.gif" border=0 width=10 height=1 alt=""> + <img src="images/blank.gif" border="0" width="10" height="1" alt=""> </td> <td width="468" align="center" valign="middle">  - <iframe src="http://www.winehq.org/bin/ad" scrolling="no" frameBorder="0" height="60" width="468"></iframe> + <a href="http://www.codeweavers.com/products/support_wine/?ad=5" target="_top"><img + src="http://www.winehq.org/images/bannerads/cw-ad02.gif" width="468" height="60" border="0" + alt="Support the Wine Project!" /></a>  </td> <td> - <img src="images/blank.gif" border=0 width=10 height=1 alt=""> + <img src="images/blank.gif" border="0" width="10" height="1" alt=""> </td> </tr> </table>

1 0

lostwages/images/bannerads cw-ad02.gif
by Jeremy Newman 14 Dec '05

14 Dec '05

ChangeSet ID: 21850 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/14 09:35:44 Modified files: images/bannerads: cw-ad02.gif Log message: update ad Patch: http://cvs.winehq.org/patch.py?id=21850 Old revision New revision Changes Path 1.3 1.4 +47 -8 lostwages/images/bannerads/cw-ad02.gif

1 0

lostwages/bin ad
by Jeremy Newman 14 Dec '05

14 Dec '05

ChangeSet ID: 21849 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/14 09:23:33 Modified files: bin : ad Log message: cookie expires to soon, set for 1 year Patch: http://cvs.winehq.org/patch.py?id=21849 Old revision New revision Changes Path 1.1 1.2 +1 -1 lostwages/bin/ad Index: lostwages/bin/ad diff -u -p lostwages/bin/ad:1.1 lostwages/bin/ad:1.2 --- lostwages/bin/ad:1.1 14 Dec 2005 15:23:33 -0000 +++ lostwages/bin/ad 14 Dec 2005 15:23:33 -0000 @@ -69,7 +69,7 @@ else list($url, $alt) = get_xml_tags($bannerads_path.$img.'.xml', array('url', 'alt')); // da banner -setcookie("whqac", $whqac, time()+60*60*24*1); +setcookie("whqac", $whqac, time()+60*60*24*365); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header("Cache-Control: no-store, no-cache, must-revalidate");

1 0

H. Verbeet : d3d9: Add a test for Get/SetVertexDeclaration refcounts.
by Alexandre Julliard 14 Dec '05

14 Dec '05

Module: wine Branch: refs/heads/master Commit: fa40b77ad71419f578e9fecb03544c8457f107a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa40b77ad71419f578e9fec… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 11:29:38 2005 +0100 d3d9: Add a test for Get/SetVertexDeclaration refcounts. --- dlls/d3d9/tests/.gitignore | 1 dlls/d3d9/tests/Makefile.in | 3 + dlls/d3d9/tests/vertexdeclaration.c | 100 +++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 1 deletions(-) create mode 100644 dlls/d3d9/tests/vertexdeclaration.c diff --git a/dlls/d3d9/tests/.gitignore b/dlls/d3d9/tests/.gitignore index bb354df..09b33b6 100644 --- a/dlls/d3d9/tests/.gitignore +++ b/dlls/d3d9/tests/.gitignore @@ -2,3 +2,4 @@ Makefile shader.ok stateblock.ok testlist.c +vertexdeclaration.ok diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index ab026e0..d27d091 100644 --- a/dlls/d3d9/tests/Makefile.in +++ b/dlls/d3d9/tests/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = user32 kernel32 CTESTS = \ shader.c \ - stateblock.c + stateblock.c \ + vertexdeclaration.c @MAKE_TEST_RULES@ diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c new file mode 100644 index 0000000..eb88240 --- /dev/null +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2005 Henri Verbeet + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define COBJMACROS +#include <d3d9.h> +#include "wine/test.h" + +static IDirect3DDevice9 *init_d3d9(void) +{ + IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; + HMODULE d3d9_handle = 0; + IDirect3D9 *d3d9_ptr = 0; + IDirect3DDevice9 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + HRESULT hres; + + d3d9_handle = LoadLibrary("d3d9"); + ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); + if (!d3d9_handle) return NULL; + + d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); + ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); + if (!d3d9_create) return NULL; + + d3d9_ptr = d3d9_create(D3D_SDK_VERSION); + ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); + if (!d3d9_ptr) return NULL; + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = GetDesktopWindow(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%lx\n", hres); + + return device_ptr; +} + +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef(object); + return IUnknown_Release(object); +} + +static void test_get_set_vertex_declaration(IDirect3DDevice9 *device_ptr) +{ + static D3DVERTEXELEMENT9 simple_decl[] = { + { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, + D3DDECL_END()}; + + IDirect3DVertexDeclaration9 *decl_ptr = 0; + IDirect3DVertexDeclaration9 *current_decl_ptr = 0; + HRESULT hret = 0; + int decl_refcount = 0; + int i = 0; + + hret = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, simple_decl, &decl_ptr); + ok(hret == D3D_OK && decl_ptr != NULL, "CreateVertexDeclaration returned: hret 0x%lx, decl_ptr %p. " + "Expected hret 0x%lx, decl_ptr != %p. Aborting.\n", hret, decl_ptr, D3D_OK, NULL); + if (hret != D3D_OK || decl_ptr == NULL) return; + + /* SetVertexDeclaration should not touch the declaration's refcount. */ + i = get_refcount((IUnknown *)decl_ptr); + hret = IDirect3DDevice9_SetVertexDeclaration(device_ptr, decl_ptr); + decl_refcount = get_refcount((IUnknown *)decl_ptr); + ok(hret == D3D_OK && decl_refcount == i, "SetVertexDeclaration returned: hret 0x%lx, refcount %d. " + "Expected hret 0x%lx, refcount %d.\n", hret, decl_refcount, D3D_OK, i); + + /* GetVertexDeclaration should increase the declaration's refcount by one. */ + i = decl_refcount+1; + hret = IDirect3DDevice9_GetVertexDeclaration(device_ptr, &current_decl_ptr); + decl_refcount = get_refcount((IUnknown *)decl_ptr); + ok(hret == D3D_OK && decl_refcount == i && current_decl_ptr == decl_ptr, + "GetVertexDeclaration returned: hret 0x%lx, current_decl_ptr %p refcount %d. " + "Expected hret 0x%lx, current_decl_ptr %p, refcount %d.\n", hret, current_decl_ptr, decl_refcount, D3D_OK, decl_ptr, i); +} + +START_TEST(vertexdeclaration) +{ + IDirect3DDevice9 *device_ptr = init_d3d9(); + if (!device_ptr) return; + + test_get_set_vertex_declaration(device_ptr); +}

1 0

Alexandre Julliard : ntdll: Fixes in virtual memory protection flags.
by Alexandre Julliard 14 Dec '05

14 Dec '05

Module: wine Branch: refs/heads/master Commit: 354e7700b300421779d489847c7b900cc30ca0bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=354e7700b300421779d4898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 12:17:59 2005 +0100 ntdll: Fixes in virtual memory protection flags. Tweak reporting of virtual protection flags and address space limit to yield results closer to what Windows does. --- dlls/ntdll/virtual.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7d2d445..3cd9fff 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -118,7 +118,7 @@ static RTL_CRITICAL_SECTION csVirtual = # define page_size 0x1000 /* Note: these are Windows limits, you cannot change them. */ # define ADDRESS_SPACE_LIMIT ((void *)0xc0000000) /* top of the total available address space */ -# define USER_SPACE_LIMIT ((void *)0x80000000) /* top of the user address space */ +# define USER_SPACE_LIMIT ((void *)0x7fff0000) /* top of the user address space */ #else static UINT page_shift; static UINT page_size; @@ -379,7 +379,7 @@ static NTSTATUS create_view( struct file view->flags = 0; view->mapping = 0; view->protect = vprot; - memset( view->prot, vprot, size >> page_shift ); + memset( view->prot, vprot & ~VPROT_IMAGE, size >> page_shift ); /* Insert it in the linked list */ @@ -448,22 +448,13 @@ static int VIRTUAL_GetUnixProt( BYTE vpr * VIRTUAL_GetWin32Prot * * Convert page protections to Win32 flags. - * - * RETURNS - * None */ -static void VIRTUAL_GetWin32Prot( - BYTE vprot, /* [in] Page protection flags */ - DWORD *protect, /* [out] Location to store Win32 protection flags */ - DWORD *state ) /* [out] Location to store mem state flag */ +static DWORD VIRTUAL_GetWin32Prot( BYTE vprot ) { - if (protect) { - *protect = VIRTUAL_Win32Flags[vprot & 0x0f]; - if (vprot & VPROT_NOCACHE) *protect |= PAGE_NOCACHE; - if (vprot & VPROT_GUARD) *protect = PAGE_NOACCESS | PAGE_GUARD; - } - - if (state) *state = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; + DWORD ret = VIRTUAL_Win32Flags[vprot & 0x0f]; + if (vprot & VPROT_NOCACHE) ret |= PAGE_NOCACHE; + if (vprot & VPROT_GUARD) ret |= PAGE_GUARD; + return ret; } @@ -1461,7 +1452,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( /* Make sure all the pages are committed */ p = view->prot + ((base - (char *)view->base) >> page_shift); - VIRTUAL_GetWin32Prot( *p, &prot, NULL ); + prot = VIRTUAL_GetWin32Prot( *p ); for (i = size >> page_shift; i; i--, p++) { if (!(*p & VPROT_COMMITTED)) @@ -1583,13 +1574,14 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HA else { BYTE vprot = view->prot[(base - alloc_base) >> page_shift]; - VIRTUAL_GetWin32Prot( vprot, &info->Protect, &info->State ); - for (size = base - alloc_base; size < view->size; size += page_mask+1) - if (view->prot[size >> page_shift] != vprot) break; - VIRTUAL_GetWin32Prot( view->protect, &info->AllocationProtect, NULL ); + info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; + info->Protect = VIRTUAL_GetWin32Prot( vprot ); + info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect ); if (view->protect & VPROT_IMAGE) info->Type = MEM_IMAGE; else if (view->flags & VFLAG_VALLOC) info->Type = MEM_PRIVATE; else info->Type = MEM_MAPPED; + for (size = base - alloc_base; size < view->size; size += page_mask+1) + if (view->prot[size >> page_shift] != vprot) break; } RtlLeaveCriticalSection(&csVirtual);

1 0

Alexandre Julliard : preloader: Reserve some space for the shared user data.
by Alexandre Julliard 14 Dec '05

14 Dec '05

Module: wine Branch: refs/heads/master Commit: 0577113e35abcfd9ad0172d9bf4ea2aae8ec64c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0577113e35abcfd9ad0172d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 12:19:18 2005 +0100 preloader: Reserve some space for the shared user data. --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index f4343a7..040fb66 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -109,7 +109,7 @@ static struct wine_preload_info preload_info[] = { { (void *)0x00000000, 0x00110000 }, /* DOS area */ - { (void *)0x80000000, 0x01000000 }, /* shared heap */ + { (void *)0x7ffe0000, 0x01020000 }, /* shared user data + shared heap */ { (void *)0x00110000, 0x1fef0000 }, /* PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */ { 0, 0 } /* end of list */ };

1 0

Rein Klazes : user: Read/save minimized metrics from/to registry.
by Alexandre Julliard 14 Dec '05

14 Dec '05

Module: wine Branch: refs/heads/master Commit: 105450db4a1d8794788f41813dcc85bfe7a1e828 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=105450db4a1d8794788f418… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Wed Dec 14 12:27:39 2005 +0100 user: Read/save minimized metrics from/to registry. --- dlls/user/sysparams.c | 129 ++++++++++++++++++++++++++++++------------- dlls/user/tests/sysparams.c | 104 ++++++++++++++++++++++++++++++----- 2 files changed, 180 insertions(+), 53 deletions(-)

1 0

H. Verbeet : d3d9: Check for a NULL shader in IDirect3DDevice9Impl_GetVertexShader
by Alexandre Julliard 14 Dec '05

14 Dec '05

Module: wine Branch: refs/heads/master Commit: 0a0e948b2809590e2475e2d64e58a6adab3c7536 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a0e948b2809590e2475e2d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 11:29:05 2005 +0100 d3d9: Check for a NULL shader in IDirect3DDevice9Impl_GetVertexShader before getting the parent. --- dlls/d3d9/vertexshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index e4f76b9..034b097 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -148,7 +148,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetV TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader); - if(hrc == D3D_OK){ + if(hrc == D3D_OK && pShader != NULL){ hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); IWineD3DVertexShader_Release(pShader); } else {

1 0

H. Verbeet : wined3d: Return the correct parent in IWineD3DVertexDeclarationImpl_GetParent.
by Alexandre Julliard 14 Dec '05

14 Dec '05

Module: wine Branch: refs/heads/master Commit: 0f43cb2f3836cdda535a383cd743f6a30593463c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f43cb2f3836cdda535a383… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 11:29:17 2005 +0100 wined3d: Return the correct parent in IWineD3DVertexDeclarationImpl_GetParent. --- dlls/wined3d/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 56f56b6..74dce97 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -432,7 +432,7 @@ ULONG WINAPI IWineD3DVertexDeclarationIm HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetParent(IWineD3DVertexDeclaration *iface, IUnknown** parent){ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; - *parent= (IUnknown*) parent; + *parent= This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK;

1 0

Vitaliy Margolen : ntdll: Implement FSCTL_PIPE_WAIT NtFsControlFile ioctl.
by Alexandre Julliard 14 Dec '05

14 Dec '05

Module: wine Branch: refs/heads/master Commit: b05340a52397e2474668920edee18eb8c8f34fb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b05340a52397e2474668920… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Dec 14 11:14:02 2005 +0100 ntdll: Implement FSCTL_PIPE_WAIT NtFsControlFile ioctl. Implement FSCTL_PIPE_WAIT NtFsControlFile ioctl. Modify WaitNamedPipeW to use NtFsControlFile. Replace struct overlapped with event. --- dlls/kernel/sync.c | 95 +++++++++++++++++++++------------------- dlls/kernel/tests/pipe.c | 2 - dlls/ntdll/file.c | 44 +++++++++++++------ include/wine/server_protocol.h | 5 +- include/winioctl.h | 7 +++ server/named_pipe.c | 18 ++++---- server/protocol.def | 3 + server/trace.c | 3 + 8 files changed, 108 insertions(+), 69 deletions(-)

1 0