July 2006 - Wine-Commits - list.winehq.org

Vitaliy Margolen : dinput: Keyboard: Use the same event queue mechanism as mouse.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 6bd7451eceaae1a8dedb2bbc63efa357a760f2b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bd7451eceaae1a8dedb2bb… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Jul 27 08:19:59 2006 -0600 dinput: Keyboard: Use the same event queue mechanism as mouse. --- dlls/dinput/keyboard.c | 214 ++++++++++++++++++++---------------------------- 1 files changed, 91 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6bd7451eceaae1a8ded…

1 0

Mike McCormack : msiexec: Don't crash if there's no args.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 2b8abca493ca61a30a9d3cd9a66d32f2302046ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b8abca493ca61a30a9d3cd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 27 23:39:49 2006 +0900 msiexec: Don't crash if there's no args. --- programs/msiexec/msiexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 0d273f2..d00fde9 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -401,7 +401,7 @@ int main(int argc, char **argv) * We do that before starting to process the real commandline, * then overwrite the commandline again. */ - if(msi_option_equal(argvW[1], "@")) + if(argc>1 && msi_option_equal(argvW[1], "@")) { if(!process_args_from_reg( argvW[2], &argc, &argvW )) return 1;

1 0

Mike McCormack : msi: Don't set the shortcut's working directory if it' s NULL.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 43f7f3ec3f51b51949a3a7be5166a48d10b8559e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43f7f3ec3f51b51949a3a7b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 27 23:18:15 2006 +0900 msi: Don't set the shortcut's working directory if it's NULL. --- dlls/msi/action.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f7454c2..ccdb3c4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2926,7 +2926,8 @@ static UINT ITERATE_CreateShortcuts(MSIR LPWSTR Path; buffer = MSI_RecordGetString(row,12); Path = resolve_folder(package, buffer, FALSE, FALSE, NULL); - IShellLinkW_SetWorkingDirectory(sl,Path); + if (Path) + IShellLinkW_SetWorkingDirectory(sl,Path); msi_free(Path); }

1 0

Stefan Dösinger : wined3d: Do not use the IWineD3DSurface for the cursor.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 65e5ed60ae02f01015222a4317770a0444d36549 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65e5ed60ae02f01015222a4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 27 17:39:03 2006 +0200 wined3d: Do not use the IWineD3DSurface for the cursor. --- dlls/wined3d/device.c | 30 +++++++++++++++++++++++++----- dlls/wined3d/swapchain.c | 35 +++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83754c2..651d134 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2115,6 +2115,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl if(!This->d3d_initialized) return WINED3DERR_INVALIDCALL; + /* Delete the mouse cursor texture */ + if(This->cursorTexture) { + ENTER_GL(); + glDeleteTextures(1, &This->cursorTexture); + LEAVE_GL(); + This->cursorTexture = 0; + } + for(sampler = 0; sampler < GL_LIMITS(sampler_stages); ++sampler) { IWineD3DDevice_SetTexture(iface, sampler, NULL); } @@ -7471,6 +7479,13 @@ static HRESULT WINAPI IWineD3DDeviceIm TRACE("(%p) : Spot Pos(%u,%u)\n", This, XHotSpot, YHotSpot); /* some basic validation checks */ + if(This->cursorTexture) { + ENTER_GL(); + glDeleteTextures(1, &This->cursorTexture); + LEAVE_GL(); + This->cursorTexture = 0; + } + if(pCursorBitmap) { /* MSDN: Cursor must be A8R8G8B8 */ if (WINED3DFMT_A8R8G8B8 != pSur->resource.format) { @@ -7486,19 +7501,24 @@ static HRESULT WINAPI IWineD3DDeviceIm } /* TODO: MSDN: Cursor sizes must be a power of 2 */ - if(This->mouseCursor) { - ((IWineD3DSurfaceImpl *) This->mouseCursor)->Flags &= ~SFLAG_FORCELOAD; - } /* This is to tell our texture code to load a SCRATCH surface. This allows us to use out * Texture and Blitting code to draw the cursor */ pSur->Flags |= SFLAG_FORCELOAD; + IWineD3DSurface_PreLoad(pCursorBitmap); + pSur->Flags &= ~SFLAG_FORCELOAD; + /* Do not store the surface's pointer because the application may release + * it after setting the cursor image. Windows doesn't addref the set surface, so we can't + * do this either without creating circular refcount dependencies. Copy out the gl texture instead. + */ + This->cursorTexture = pSur->glDescription.textureName; + This->cursorWidth = pSur->currentDesc.Width; + This->cursorHeight = pSur->currentDesc.Height; + pSur->glDescription.textureName = 0; /* Prevent the texture from beeing changed or deleted */ } This->xHotSpot = XHotSpot; This->yHotSpot = YHotSpot; - - This->mouseCursor = pCursorBitmap; return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9dde987..f0b3033 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -142,17 +142,40 @@ static HRESULT WINAPI IWineD3DSwapChainI ENTER_GL(); /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ - if(This->wineD3DDevice->bCursorVisible && This->wineD3DDevice->mouseCursor) { - IWineD3DSurfaceImpl *cursor = (IWineD3DSurfaceImpl *) This->wineD3DDevice->mouseCursor; + if(This->wineD3DDevice->bCursorVisible && This->wineD3DDevice->cursorTexture) { + IWineD3DSurfaceImpl cursor; RECT destRect = {This->wineD3DDevice->xScreenSpace - This->wineD3DDevice->xHotSpot, This->wineD3DDevice->yScreenSpace - This->wineD3DDevice->yHotSpot, - This->wineD3DDevice->xScreenSpace + cursor->currentDesc.Width - This->wineD3DDevice->xHotSpot, - This->wineD3DDevice->yScreenSpace + cursor->currentDesc.Height - This->wineD3DDevice->yHotSpot}; - TRACE("Rendering the cursor\n"); + This->wineD3DDevice->xScreenSpace + This->wineD3DDevice->cursorWidth - This->wineD3DDevice->xHotSpot, + This->wineD3DDevice->yScreenSpace + This->wineD3DDevice->cursorHeight - This->wineD3DDevice->yHotSpot}; + TRACE("Rendering the cursor. Creating fake surface at %p\n", &cursor); + /* Build a fake surface to call the Blitting code. It is not possible to use the interface passed by + * the application because we are only supposed to copy the information out. Using a fake surface + * allows to use the Blitting engine and avoid copying the whole texture -> render target blitting code. + */ + memset(&cursor, 0, sizeof(cursor)); + cursor.lpVtbl = &IWineD3DSurface_Vtbl; + cursor.resource.ref = 1; + cursor.resource.wineD3DDevice = This->wineD3DDevice; + cursor.resource.pool = WINED3DPOOL_SCRATCH; + cursor.resource.format = WINED3DFMT_A8R8G8B8; + cursor.resource.resourceType = WINED3DRTYPE_SURFACE; + cursor.glDescription.textureName = This->wineD3DDevice->cursorTexture; + cursor.glDescription.target = GL_TEXTURE_2D; + cursor.glDescription.level = 0; + cursor.currentDesc.Width = This->wineD3DDevice->cursorWidth; + cursor.currentDesc.Height = This->wineD3DDevice->cursorHeight; + cursor.glRect.left = 0; + cursor.glRect.top = 0; + cursor.glRect.right = cursor.currentDesc.Width; + cursor.glRect.bottom = cursor.currentDesc.Height; + /* The cursor must have pow2 sizes */ + cursor.pow2Width = cursor.currentDesc.Width; + cursor.pow2Height = cursor.currentDesc.Height; /* DDBLT_KEYSRC will cause BltOverride to enable the alpha test with GL_NOTEQUAL, 0.0, * which is exactly what we want :-) */ - IWineD3DSurface_Blt(This->backBuffer[0], &destRect, This->wineD3DDevice->mouseCursor, NULL, DDBLT_KEYSRC, NULL); + IWineD3DSurface_Blt(This->backBuffer[0], &destRect, (IWineD3DSurface *) &cursor, NULL, DDBLT_KEYSRC, NULL); } if (pSourceRect || pDestRect) FIXME("Unhandled present options %p/%p\n", pSourceRect, pDestRect); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f4ae19d..5329e42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -540,7 +540,8 @@ #define NEEDS_DI UINT yHotSpot; UINT xScreenSpace; UINT yScreenSpace; - IWineD3DSurface *mouseCursor; + UINT cursorWidth, cursorHeight; + GLuint cursorTexture; /* Textures for when no other textures are mapped */ UINT dummyTextureName[MAX_TEXTURES];

1 0

Stefan Dösinger : wined3d: Avoid a false ERR.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 0fbc1fc0df9ab5811c38cd9d5dbc0110dff9ea9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fbc1fc0df9ab5811c38cd9… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jul 27 17:24:55 2006 +0200 wined3d: Avoid a false ERR. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 00d68c2..5856404 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -102,7 +102,7 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release This->dib.bitmap_data = NULL; This->resource.allocatedMemory = NULL; } - IWineD3DSurface_SetMem(iface, NULL); + if(This->Flags & SFLAG_USERPTR) IWineD3DSurface_SetMem(iface, NULL); IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); if(iface == device->ddraw_primary)

1 0

appdb/include maintainer.php
by WineHQ July 27, 2006

July 27, 2006

ChangeSet ID: 26881 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/27 11:38:59 Modified files: include : maintainer.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Simplify maintainer::getMaintainersForAppIdVersionId() query to be the same as the query used prior to the maintainer changes. Fixes display of loads of maintainers due to permutations in a join that wasn't properly defined Patch: http://cvs.winehq.org/patch.py?id=26881 Old revision New revision Changes Path 1.14 1.15 +2 -5 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.14 appdb/include/maintainer.php:1.15 --- appdb/include/maintainer.php:1.14 27 Jul 2006 16:38:59 -0000 +++ appdb/include/maintainer.php 27 Jul 2006 16:38:59 -0000 @@ -303,11 +303,8 @@ class maintainer if($iVersionId) { - $hResult = query_parameters("SELECT appMaintainers.userId - FROM appMaintainers, appVersion - WHERE appVersion.appId = appMaintainers.appId - AND appVersion.versionId = '?' AND appMaintainers.queued = 'false'", - $iVersionId); + $hResult = query_parameters("SELECT userId from appMaintainers WHERE appMaintainers.queued = 'false' AND ". + "appMaintainers.versionId = '?'", $iVersionId); } /* * If versionId was not supplied we fetch supermaintainers of application and maintainer of all versions.

1 0

lostwages/news 2006072701.xml
by WineHQ July 27, 2006

July 27, 2006

ChangeSet ID: 26880 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/07/27 10:59:20 Added files: news : 2006072701.xml Log message: News about Wine 0.9.18 Patch: http://cvs.winehq.org/patch.py?id=26880 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006072701.xml Index: lostwages/news/2006072701.xml diff -u -p /dev/null lostwages/news/2006072701.xml:1.1 --- /dev/null 27 Jul 2006 15:59:20 -0000 +++ lostwages/news/2006072701.xml 27 Jul 2006 15:59:20 -0000 @@ -0,0 +1,26 @@ +<news> + <date>July 27, 2006</date> + <title>Wine 0.9.18 Released</title> + <body> +<p> +A new beta version of Wine was released today. Besides the usual bugfixes, +you might notice the following changes: +<ul> + +<li> Still more work on Direct3D.</li> +<li> A lot of MSI bug fixes and improvements.</li> +<li> More compatible memory management.</li> +<li> Several fixes for Win64 support.</li> +<li> Some performance improvements. </li> +</ul> +</p><p> + Binary packages are in the process of being built and it may take a few days + for them to appear, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.18.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.122">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. +</p> + </body> +</news>

1 0

lostwages/include winehq.conf
by Alexandre Julliard July 27, 2006

July 27, 2006

ChangeSet ID: 26879 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/07/27 10:31:46 Modified files: include : winehq.conf Log message: Release 0.9.18 Patch: http://cvs.winehq.org/patch.py?id=26879 Old revision New revision Changes Path 1.40 1.41 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.40 lostwages/include/winehq.conf:1.41 --- lostwages/include/winehq.conf:1.40 27 Jul 2006 15:31:46 -0000 +++ lostwages/include/winehq.conf 27 Jul 2006 15:31:46 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.17 +snapshot_date: 0.9.18 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

Tag wine-0.9.18 : Alexandre Julliard : Release 0.9.18
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/tags/wine-0.9.18 Tag: 531f7f2bee2fe8097b05613c144703573a220f69 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=531f7f2bee2fe8097b05613c14… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 16:55:50 2006 +0200 Release 0.9.18

1 0

Alexandre Julliard : Release 0.9.18.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: f9cd714ea95847f35a9e7f485d8492945e2d11ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9cd714ea95847f35a9e7f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 16:55:50 2006 +0200 Release 0.9.18. --- ANNOUNCE | 15 ChangeLog | 2450 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 4 files changed, 2468 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f9cd714ea95847f35a9…

1 0