August 2007 - Wine-commits - list.winehq.org

Paul Vriens : winecfg: Show version again in About box.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 2d87d2e89e059376933034a651c184c6d2198a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d87d2e89e059376933034a65… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 19:16:16 2007 +0200 winecfg: Show version again in About box. --- programs/winecfg/winecfg.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 974cf9b..f83f45e 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Stefan Dösinger : ddraw: Implement IDirect3DDevice7:: DrawIndexedPrimitiveStrided.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 89dccc7c7c73c8497d6370a16c4a251de797f114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dccc7c7c73c8497d6370a16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 27 14:39:55 2007 +0200 ddraw: Implement IDirect3DDevice7::DrawIndexedPrimitiveStrided. --- dlls/ddraw/device.c | 106 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/device.c | 23 ++++++++- include/wine/wined3d_interface.h | 2 + 3 files changed, 126 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d0cfcdf..56e5cf3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3621,12 +3621,110 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, DWORD Flags) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); - FIXME("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x): stub!\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); + WineDirect3DVertexStridedData WineD3DStrided; + int i; + UINT PrimitiveCount; + HRESULT hr; + + TRACE("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x)\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); - /* I'll implement it as soon as I find a app to test it. - * This needs an additional method in IWineD3DDevice. + memset(&WineD3DStrided, 0, sizeof(WineD3DStrided)); + /* Get the strided data right. the wined3d structure is a bit bigger + * Watch out: The contents of the strided data are determined by the fvf, + * not by the members set in D3DDrawPrimStrideData. So it's valid + * to have diffuse.lpvData set to 0xdeadbeef if the diffuse flag is + * not set in the fvf. */ - return D3D_OK; + if(VertexType & D3DFVF_POSITION_MASK) + { + WineD3DStrided.u.s.position.lpData = D3DDrawPrimStrideData->position.lpvData; + WineD3DStrided.u.s.position.dwStride = D3DDrawPrimStrideData->position.dwStride; + WineD3DStrided.u.s.position.dwType = WINED3DDECLTYPE_FLOAT3; + if (VertexType & D3DFVF_XYZRHW) + { + WineD3DStrided.u.s.position.dwType = WINED3DDECLTYPE_FLOAT4; + WineD3DStrided.u.s.position_transformed = TRUE; + } else + WineD3DStrided.u.s.position_transformed = FALSE; + } + + if(VertexType & D3DFVF_NORMAL) + { + WineD3DStrided.u.s.normal.lpData = D3DDrawPrimStrideData->normal.lpvData; + WineD3DStrided.u.s.normal.dwStride = D3DDrawPrimStrideData->normal.dwStride; + WineD3DStrided.u.s.normal.dwType = WINED3DDECLTYPE_FLOAT3; + } + + if(VertexType & D3DFVF_DIFFUSE) + { + WineD3DStrided.u.s.diffuse.lpData = D3DDrawPrimStrideData->diffuse.lpvData; + WineD3DStrided.u.s.diffuse.dwStride = D3DDrawPrimStrideData->diffuse.dwStride; + WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_SHORT4; + } + + if(VertexType & D3DFVF_SPECULAR) + { + WineD3DStrided.u.s.specular.lpData = D3DDrawPrimStrideData->specular.lpvData; + WineD3DStrided.u.s.specular.dwStride = D3DDrawPrimStrideData->specular.dwStride; + WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_SHORT4; + } + + for( i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); i++) + { + WineD3DStrided.u.s.texCoords[i].lpData = D3DDrawPrimStrideData->textureCoords[i].lpvData; + WineD3DStrided.u.s.texCoords[i].dwStride = D3DDrawPrimStrideData->textureCoords[i].dwStride; + switch(GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)) + { + case 1: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT1; break; + case 2: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT2; break; + case 3: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT3; break; + case 4: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT4; break; + default: ERR("Unexpected texture coordinate size %d\n", + GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)); + } + } + + /* Get the primitive count */ + switch(PrimitiveType) + { + case D3DPT_POINTLIST: + PrimitiveCount = IndexCount; + break; + + case D3DPT_LINELIST: + PrimitiveCount = IndexCount / 2; + break; + + case D3DPT_LINESTRIP: + PrimitiveCount = IndexCount - 1; + break; + + case D3DPT_TRIANGLELIST: + PrimitiveCount = IndexCount / 3; + break; + + case D3DPT_TRIANGLESTRIP: + PrimitiveCount = IndexCount - 2; + break; + + case D3DPT_TRIANGLEFAN: + PrimitiveCount = IndexCount - 2; + break; + + default: return DDERR_INVALIDPARAMS; + } + + /* WineD3D doesn't need the FVF here */ + EnterCriticalSection(&ddraw_cs); + hr = IWineD3DDevice_DrawIndexedPrimitiveStrided(This->wineD3DDevice, + PrimitiveType, + PrimitiveCount, + &WineD3DStrided, + VertexCount, + Indices, + WINED3DFMT_INDEX16); + LeaveCriticalSection(&ddraw_cs); + return hr; } static HRESULT WINAPI diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 65c5382..5f894bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4755,7 +4755,27 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveStrided (IWineD3DDevice *i This->up_strided = NULL; return WINED3D_OK; } - /* Yet another way to update a texture, some apps use this to load default textures instead of using surface/texture lock/unlock */ + +static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided(IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData, UINT NumVertices, CONST void *pIndexData, WINED3DFORMAT IndexDataFormat) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + DWORD idxSize = (IndexDataFormat == WINED3DFMT_INDEX32 ? 4 : 2); + + /* Mark the state dirty until we have nicer tracking + * its fine to change baseVertexIndex because that call is only called by ddraw which does not need + * that value. + */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); + This->stateBlock->streamIsUP = TRUE; + This->stateBlock->baseVertexIndex = 0; + This->up_strided = DrawPrimStrideData; + drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* startvertexidx */, 0 /* numindices */, 0 /* startidx */, idxSize, pIndexData, 0 /* minindex */); + This->up_strided = NULL; + return WINED3D_OK; +} + + +/* Yet another way to update a texture, some apps use this to load default textures instead of using surface/texture lock/unlock */ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, IWineD3DBaseTexture *pSourceTexture, IWineD3DBaseTexture *pDestinationTexture){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; HRESULT hr = WINED3D_OK; @@ -6667,6 +6687,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_DrawPrimitiveUP, IWineD3DDeviceImpl_DrawIndexedPrimitiveUP, IWineD3DDeviceImpl_DrawPrimitiveStrided, + IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided, IWineD3DDeviceImpl_DrawRectPatch, IWineD3DDeviceImpl_DrawTriPatch, IWineD3DDeviceImpl_DeletePatch, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 3823515..35430b9 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -472,6 +472,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(DrawPrimitiveUP)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, CONST void * pVertexStreamZeroData, UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertexIndices, UINT PrimitiveCount, CONST void * pIndexData, WINED3DFORMAT IndexDataFormat, CONST void * pVertexStreamZeroData, UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData, UINT NumVertices, CONST void *pIndexData, WINED3DFORMAT IndexDataFormat) PURE; STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; @@ -611,6 +612,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) #define IWineD3DDevice_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) #define IWineD3DDevice_DrawPrimitiveStrided(p,a,b,c) (p)->lpVtbl->DrawPrimitiveStrided(p,a,b,c) +#define IWineD3DDevice_DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f) (p)->lpVtbl->DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f) #define IWineD3DDevice_DrawRectPatch(p,a,b,c) (p)->lpVtbl->DrawRectPatch(p,a,b,c) #define IWineD3DDevice_DrawTriPatch(p,a,b,c) (p)->lpVtbl->DrawTriPatch(p,a,b,c) #define IWineD3DDevice_DeletePatch(p,a) (p)->lpVtbl->DeletePatch(p,a)

1 0

appdb/include appData.php
by WineHQ 08 Aug '07

08 Aug '07

ChangeSet ID: 31320 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/07 19:55:27 Modified files: include : appData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Order appData entries by the application name, otherwise the order is based on when the application was added to the database and this grouping doesn't work well for screenshots. Patch: http://cvs.winehq.org/patch.py?id=31320 Old revision New revision Changes Path 1.33 1.34 +35 -29 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.33 appdb/include/appData.php:1.34 --- appdb/include/appData.php:1.33 8 Aug 2007 0:55:27 -0000 +++ appdb/include/appData.php 8 Aug 2007 0:55:27 -0000 @@ -366,7 +366,8 @@ class appData AND appData.queued = '?' AND - appData.type = '?'"; + appData.type = '?' + ORDER BY appFamily.appName"; if(!$iRows && !$iStart) { $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, @@ -386,37 +387,42 @@ class appData if($iStart || $iRows) $sLimit = " LIMIT ?,?"; - $sQuery = "(SELECT DISTINCT appData.* FROM appData, - appFamily, appVersion WHERE - appFamily.appId = appVersion.appId - AND - ( + $sQuery = + "( + SELECT DISTINCT appData.* FROM appData, + appFamily, appVersion WHERE + appFamily.appId = appVersion.appId + AND + ( appData.appId = appFamily.appId + ) + AND + appVersion.queued = 'false' + AND + appFamily.queued = 'false' + AND + appData.queued = '?' + AND + appData.type = '?' ORDER BY appFamily.appName $sLimit ) - AND - appVersion.queued = 'false' - AND - appFamily.queued = 'false' - AND - appData.queued = '?' - AND - appData.type = '?'$sLimit) UNION - ( - SELECT DISTINCT appData.* FROM appData, - appFamily, appVersion WHERE - appFamily.appId = appVersion.appId - AND + UNION ( - appData.versionId = appVersion.versionId - ) - AND - appVersion.queued = 'false' - AND - appFamily.queued = 'false' - AND - appData.queued = '?' - AND - appData.type = '?'$sLimit)"; + SELECT DISTINCT appData.* FROM appData, + appFamily, appVersion WHERE + appFamily.appId = appVersion.appId + AND + ( + appData.versionId = appVersion.versionId + ) + AND + appVersion.queued = 'false' + AND + appFamily.queued = 'false' + AND + appData.queued = '?' + AND + appData.type = '?' ORDER BY appFamily.appName $sLimit + )"; if(!$iRows && !$iStart) { $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType,

1 0

tools/winetest gather
by Jeremy Newman 07 Aug '07

07 Aug '07

ChangeSet ID: 31319 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/07 16:54:21 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Show crashed winetest in the single/group results Patch: http://cvs.winehq.org/patch.py?id=31319 Old revision New revision Changes Path 1.23 1.24 +14 -0 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.23 tools/winetest/gather:1.24 --- tools/winetest/gather:1.23 7 Aug 2007 21:54:21 -0000 +++ tools/winetest/gather 7 Aug 2007 21:54:21 -0000 @@ -112,6 +112,8 @@ foreach my $file (glob "$datadir/$build/ } else { $group->{extrema}->{$testname} = [$error, $error]; } + } elsif ($todo eq "-") { + $testref->{crash} = $testname; } my $prevdigest = \$group->{digests}->{$testname}; $$prevdigest = ($count eq "failed" || $error || $skipped || @@ -132,9 +134,14 @@ foreach my $group (@groups) { # Make sure missing tests are shown in the group results $group->{digests}->{$testname} = "differ"; my ($dll, $subtest) = split(/:/, $testname); + my $crash = $test->{crash}; if (exists $test->{dllmissing}->{$dll}) { # Mark this test as missing because of a missing dll $test->{results}->{$testname} = ["dll missing", "-", "-", "-"]; + } elsif (defined $crash && $testname gt $crash) { + # Mark this test as missing because of what looks like a winetest crash. + # The cause of that is most likely a partial report file. + $test->{results}->{$testname} = ["winetest crash", "-", "-", "-"]; } else { # Mark this test as missing for an unknown reason $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; @@ -239,6 +246,13 @@ sub singletest { onMouseOver="No tests run as $dll.dll is not present on this system" >0</a></td> EOF + } elsif ($count eq "winetest crash") { + print OUT <<"EOF"; + <td class="skip_fail"><a + title="Test did not run as winetest crashed" + onMouseOver="Test did not run as winetest crashed"; + >.</a></td> +EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; <td class="skip_fail"><a

1 0

Dmitry Timoshkov : include: winres.h no longer exists in PSDK, fix winresrc .h includes.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 197f4059ab2af5f13f9c56faa26e3b4af902f869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197f4059ab2af5f13f9c56faa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 7 15:30:43 2007 +0900 include: winres.h no longer exists in PSDK, fix winresrc.h includes. --- include/Makefile.in | 1 - include/winres.h | 25 ------------------------- include/winresrc.h | 8 ++++---- programs/clock/rsrc.rc | 3 ++- programs/cmd/wcmdrc.rc | 3 +++ programs/cmdlgtst/cmdlgr.rc | 5 ++++- programs/net/rsrc.rc | 3 ++- programs/oleview/rsrc.rc | 4 +++- programs/progman/rsrc.rc | 4 +++- programs/regedit/rsrc.rc | 4 +++- programs/start/rsrc.rc | 3 ++- programs/taskmgr/taskmgr.rc | 5 ++++- programs/uninstaller/rsrc.rc | 4 +++- programs/view/viewrc.rc | 3 ++- programs/winecfg/winecfg.rc | 4 ++-- programs/winefile/rsrc.rc | 4 +++- programs/winemine/rsrc.rc | 4 +++- programs/winetest/resource.h | 2 ++ programs/winetest/winetest.rc | 6 ++++-- programs/winhelp/rsrc.rc | 3 ++- programs/wordpad/rsrc.rc | 4 +++- programs/write/rsrc.rc | 3 ++- programs/xcopy/rsrc.rc | 3 ++- 23 files changed, 58 insertions(+), 50 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index f3702d5..6c3a31d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -378,7 +378,6 @@ SRCDIR_INCLUDES = \ winnt.h \ winperf.h \ winreg.h \ - winres.h \ winresrc.h \ winscard.h \ winsmcrd.h \ diff --git a/include/winres.h b/include/winres.h deleted file mode 100644 index 19012da..0000000 --- a/include/winres.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2000 Francois Gouget - * - * 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 - */ - -#include <winresrc.h> - -#ifdef IDC_STATIC -#undef IDC_STATIC -#endif -#define IDC_STATIC (-1) - diff --git a/include/winresrc.h b/include/winresrc.h index 49325e0..51ab5bc 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -35,10 +35,10 @@ #define _WIN32_WINNT 0x0500 #endif -#include <winuser.h> -#include <commctrl.h> -#include <dde.h> -#include <winnt.h> +/* FIXME: #include <winuser.rh> */ +/* FIXME: #include <commctrl.rh> */ +/* FIXME: #include <dde.rh> */ +/* FIXME: #include <winnt.rh> */ #include <dlgs.h> #include <winver.h> diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc index 8275028..092293f 100644 --- a/programs/clock/rsrc.rc +++ b/programs/clock/rsrc.rc @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> #include "clock_res.h" diff --git a/programs/cmd/wcmdrc.rc b/programs/cmd/wcmdrc.rc index c449f58..93194d7 100644 --- a/programs/cmd/wcmdrc.rc +++ b/programs/cmd/wcmdrc.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #include "wcmd.h" #include "Cs.rc" diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc index 949bd2a..e4164b9 100644 --- a/programs/cmdlgtst/cmdlgr.rc +++ b/programs/cmdlgtst/cmdlgr.rc @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + #include "cmdlgtst.h" #include "Cs.rc" diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 0f4b1da..3125252 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index a00ab6b..6cf7fb3 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" #include "De.rc" diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc index 5b052e3..91d38c1 100644 --- a/programs/progman/rsrc.rc +++ b/programs/progman/rsrc.rc @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "progman.h" #include "accel.rc" diff --git a/programs/regedit/rsrc.rc b/programs/regedit/rsrc.rc index 3601930..da9d068 100644 --- a/programs/regedit/rsrc.rc +++ b/programs/regedit/rsrc.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" +#include <windef.h> +#include <winuser.h> + #include "resource.h" /* define language neutral resources */ diff --git a/programs/start/rsrc.rc b/programs/start/rsrc.rc index cc8666f..9f59c76 100644 --- a/programs/start/rsrc.rc +++ b/programs/start/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index a89d666..41bc1dc 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -19,7 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #include "resource.h" /* Language resources */ diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 5e64715..701e031 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -22,7 +22,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" #include "Bg.rc" #include "Cs.rc" diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 93a2d01..0473067 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resource.h" #include "Cs.rc" diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 34ed703..974cf9b 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,12 +20,12 @@ * */ -#include "config.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winnls.h" -#include "winresrc.h" +#include "winuser.h" +#include "commctrl.h" #include "resource.h" #include "Bg.rc" diff --git a/programs/winefile/rsrc.rc b/programs/winefile/rsrc.rc index f7e14a9..5259936 100644 --- a/programs/winefile/rsrc.rc +++ b/programs/winefile/rsrc.rc @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" /* define language neutral resources */ diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 6a9ed32..0490d85 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" #include "Cs.rc" diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index 6941796..61fe35c 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -24,6 +24,8 @@ #define IDD_ABOUT 101 #define IDD_TAG 102 +#define IDC_STATIC -1 + #define IDC_ST0 1000 #define IDC_PB0 1001 #define IDC_ST1 1002 diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 4cf35a9..ff6e2c2 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> -#include <winres.h> +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #include "resource.h" IDD_TAG DIALOG 0, 0, 150, 65 diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index ebf5e34..7a1f5e2 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "winhelp.h" #include "winhelp_res.h" diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 0ef3ff5..89fb4f2 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winuser.h> + #include "resource.h" MAINACCELTABLE ACCELERATORS diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index 6e63eee..ea4377c 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index 23f778c..234a4cb 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> + #include "xcopy.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Paul Vriens : winecfg: Fix virtual desktop selection.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: a15b9fb860648f392c39f575d9b2efc314b3e705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15b9fb860648f392c39f575d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 12:38:11 2007 +0200 winecfg: Fix virtual desktop selection. --- programs/winecfg/winecfg.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index a3e5e07..4c86514 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -363,9 +363,12 @@ char *get_reg_key(HKEY root, const char *path, const char *name, const char *def wRet = get_reg_keyW(root, wpath, wname, wdef); - len = WideCharToMultiByte(CP_ACP, 0, wRet, -1, szRet, 0, NULL, NULL); - szRet = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, wRet, -1, szRet, len, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, wRet, -1, NULL, 0, NULL, NULL); + if (len) + { + szRet = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, wRet, -1, szRet, len, NULL, NULL); + } HeapFree(GetProcessHeap(), 0, wpath); HeapFree(GetProcessHeap(), 0, wname); @@ -397,7 +400,7 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons assert( path != NULL ); - WINE_TRACE("path=%s, name=%s, value=%p\n", wine_dbgstr_w(path), + WINE_TRACE("path=%s, name=%s, value=%s\n", wine_dbgstr_w(path), wine_dbgstr_w(name), wine_dbgstr_w(value)); /* firstly, see if we already set this setting */

1 0

Jason Edmeades : dpnet: Implement directplay lobbied application stubs.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 3b597af01eb88a8d3edbd29fa40931be347fe06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b597af01eb88a8d3edbd29fa… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Jul 30 22:41:59 2007 +0100 dpnet: Implement directplay lobbied application stubs. --- dlls/dpnet/Makefile.in | 1 + dlls/dpnet/dpnet_main.c | 5 +- dlls/dpnet/dpnet_private.h | 15 +++- dlls/dpnet/lobbiedapp.c | 193 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dpnet/regsvr.c | 11 +++ 5 files changed, 222 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b597af01eb88a8d3edbd…

1 0

Huw Davies : wininet: Fix the case when Proxy or ProxyBypass is NULL.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: dc881a258e0881e1a20417f5dbfdd72535a025e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc881a258e0881e1a20417f5d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 7 10:33:20 2007 +0100 wininet: Fix the case when Proxy or ProxyBypass is NULL. --- dlls/wininet/internet.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fb6970b..b6a29a5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2100,25 +2100,19 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d proxyBytesRequired); pPI->dwAccessType = lpwai->dwAccessType; + pPI->lpszProxy = NULL; + pPI->lpszProxyBypass = NULL; if (lpwai->lpszProxy) { lstrcpyW(proxy, lpwai->lpszProxy); + pPI->lpszProxy = proxy; } - else - { - *proxy = 0; - } - pPI->lpszProxy = proxy; if (lpwai->lpszProxyBypass) { lstrcpyW(proxy_bypass, lpwai->lpszProxyBypass); + pPI->lpszProxyBypass = proxy_bypass; } - else - { - *proxy_bypass = 0; - } - pPI->lpszProxyBypass = proxy_bypass; bSuccess = TRUE; } *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOW) + @@ -2147,28 +2141,22 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d proxyBytesRequired); pPI->dwAccessType = lpwai->dwAccessType; + pPI->lpszProxy = NULL; + pPI->lpszProxyBypass = NULL; if (lpwai->lpszProxy) { WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxy, -1, proxy, proxyBytesRequired, NULL, NULL); + pPI->lpszProxy = proxy; } - else - { - *proxy = '\0'; - } - pPI->lpszProxy = proxy; if (lpwai->lpszProxyBypass) { WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxyBypass, -1, proxy_bypass, proxyBypassBytesRequired, NULL, NULL); + pPI->lpszProxyBypass = proxy_bypass; } - else - { - *proxy_bypass = '\0'; - } - pPI->lpszProxyBypass = proxy_bypass; bSuccess = TRUE; } *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOA) +

1 0

Maarten Lankhorst : dsound: Make hardware acceleration work again.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: cdbd17bdb85a80d62acec036a0314e7343e30d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbd17bdb85a80d62acec036a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Aug 7 11:00:17 2007 +0200 dsound: Make hardware acceleration work again. --- dlls/dsound/capture.c | 3 +-- dlls/dsound/dsound.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2ee27ae..833c039 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1584,7 +1584,7 @@ HRESULT DirectSoundCaptureDevice_Initialize( /* Disable the direct sound driver to force emulation if requested. */ device->driver = NULL; - if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + if (ds_hw_accel != DS_HW_ACCEL_EMULATION) { err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&(device->driver),0)); if ( (err != DS_OK) && (err != DSERR_UNSUPPORTED) ) { @@ -1594,7 +1594,6 @@ HRESULT DirectSoundCaptureDevice_Initialize( } err = DS_OK; - /* Get driver description */ if (device->driver) { TRACE("using DirectSound driver\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index cc693cb..0cb66ca 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1414,7 +1414,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->driver = NULL; /* DRV_QUERYDSOUNDIFACE is a "Wine extension" to get the DSound interface */ - if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + if (ds_hw_accel != DS_HW_ACCEL_EMULATION) waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&device->driver, 0); /* Get driver description */

1 0

Misha Koshelev : urlmon/tests: Keep track of download state in tests.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 84cf17c3e91cef51a5f4539e57236fdb79302bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cf17c3e91cef51a5f4539e5… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Aug 6 23:08:49 2007 -0500 urlmon/tests: Keep track of download state in tests. --- dlls/urlmon/tests/url.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a28c32c..ef3bd30 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -124,6 +124,12 @@ static enum { MK_TEST } test_protocol; +static enum { + BEFORE_DOWNLOAD, + DOWNLOADING, + END_DOWNLOAD +} download_state; + static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) { HRESULT hr; @@ -549,21 +555,31 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP break; case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(OnProgress_MIMETYPEAVAILABLE); + ok(download_state == BEFORE_DOWNLOAD, "Download state was %d, expected BEFORE_DOWNLOAD\n", + download_state); break; case BINDSTATUS_BEGINDOWNLOADDATA: CHECK_EXPECT(OnProgress_BEGINDOWNLOADDATA); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, urls[test_protocol]), "wrong szStatusText\n"); + ok(download_state == BEFORE_DOWNLOAD, "Download state was %d, expected BEFORE_DOWNLOAD\n", + download_state); + download_state = DOWNLOADING; break; case BINDSTATUS_DOWNLOADINGDATA: CHECK_EXPECT2(OnProgress_DOWNLOADINGDATA); + ok(download_state == DOWNLOADING, "Download state was %d, expected DOWNLOADING\n", + download_state); break; case BINDSTATUS_ENDDOWNLOADDATA: CHECK_EXPECT(OnProgress_ENDDOWNLOADDATA); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, urls[test_protocol]), "wrong szStatusText\n"); + ok(download_state == DOWNLOADING, "Download state was %d, expected DOWNLOADING\n", + download_state); + download_state = END_DOWNLOAD; break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: ok(szStatusText != NULL, "szStatusText == NULL\n"); @@ -613,6 +629,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR BYTE buf[512]; CHECK_EXPECT2(OnDataAvailable); + ok(download_state == DOWNLOADING || download_state == END_DOWNLOAD, + "Download state was %d, expected DOWNLOADING or END_DOWNLOAD\n", + download_state); data_available = TRUE; if (0) @@ -770,6 +789,7 @@ static void test_BindToStorage(int protocol, BOOL emul) test_protocol = protocol; emulate_protocol = emul; + download_state = BEFORE_DOWNLOAD; stopped_binding = FALSE; data_available = FALSE;

1 0