February 2010 - Wine-commits

José Manuel Ferrer Ortiz : localspl: New Spanish translations.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: efa97230c13306f1e7e689915f71ba7c1375d94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa97230c13306f1e7e689915… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:13:29 2010 +0100 localspl: New Spanish translations. --- dlls/localspl/Makefile.in | 1 + dlls/localspl/spl_Es.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 9fa087d..6409454 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ spl_Da.rc \ spl_De.rc \ spl_En.rc \ + spl_Es.rc \ spl_Fr.rc \ spl_Ko.rc \ spl_Lt.rc \ diff --git a/dlls/localspl/spl_Es.rc b/dlls/localspl/spl_Es.rc new file mode 100644 index 0000000..9b9a558 --- /dev/null +++ b/dlls/localspl/spl_Es.rc @@ -0,0 +1,32 @@ +/* + * Spanish resources for localspl + * + * Copyright 2010 José Manuel Ferrer Ortiz + * + * 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 "localspl_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Puerto local" + IDS_LOCALMONITOR "Monitor local" +}

1 0

José Manuel Ferrer Ortiz : mapi32: New Spanish translations.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: bd5f4637a15a9d95849a9346d1fdb76936bf2441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5f4637a15a9d95849a9346d… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:14:07 2010 +0100 mapi32: New Spanish translations. --- dlls/mapi32/Es.rc | 33 +++++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Es.rc b/dlls/mapi32/Es.rc new file mode 100644 index 0000000..534f4d4 --- /dev/null +++ b/dlls/mapi32/Es.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 Spanish resources +* +* Copyright 2010 José Manuel Ferrer Ortiz +* +* 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 "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "El envío de correo ha fallado debido a que no tiene instalado un cliente de correo MAPI." + IDS_SEND_MAIL, "Enviar correo" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 2ce3313..46139bd 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Es.rc \ Fr.rc \ Lt.rc \ Ru.rc \

1 0

Alexandre Julliard : runtest: Fix handling of test binaries in the programs directory.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 96346ed62ef1d51df38f5073309172bb58c68c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96346ed62ef1d51df38f50733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:49:08 2010 +0100 runtest: Fix handling of test binaries in the programs directory. --- tools/runtest | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/runtest b/tools/runtest index 86f8680..79bd2f7 100755 --- a/tools/runtest +++ b/tools/runtest @@ -91,14 +91,22 @@ done if [ -z "$program" ]; then # try to autodetect the test program name based on the working directory working_path=`pwd` - working_basename=`basename "$working_path"` - if [ "$working_basename" = "tests" ]; then - parent_path=`dirname "$working_path"` - parent_basename=`basename "$parent_path"` - program="${parent_basename}_test.exe.so" - elif [ -d "tests" ]; then - program="tests/${working_basename}_test.exe.so" - fi + case $working_path in + */dlls/*/tests) + parent_path=`dirname "$working_path"` + program=`basename "$parent_path"`_test.exe.so + ;; + */dlls/*) + program=tests/`basename "$working_path"`_test.exe.so + ;; + */programs/*/tests) + parent_path=`dirname "$working_path"` + program=`basename "$parent_path"`.exe_test.exe.so + ;; + */programs/*) + program=tests/`basename "$working_path"`.exe_test.exe.so + ;; + esac fi if [ ! -f "$program" ]; then echo "Can't find the test program, use the -p argument to specify one" 1>&2

1 0

Christian Costa : d3dx9_36: Implement D3DXCreateTexture.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 82d70540857d868691db0fecc65c254b0ebc58ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d70540857d868691db0fecc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:47:50 2010 +0100 d3dx9_36: Implement D3DXCreateTexture. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 88ac1d7..36eca4a 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ shader.c \ sprite.c \ surface.c \ + texture.c \ util.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 37334e7..43551b2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -92,7 +92,7 @@ @ stub D3DXCreateTeapot @ stub D3DXCreateTextA @ stub D3DXCreateTextW -@ stub D3DXCreateTexture +@ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stub D3DXCreateTextureFromFileA @ stub D3DXCreateTextureFromFileExA @ stub D3DXCreateTextureFromFileExW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c new file mode 100644 index 0000000..f47853a --- /dev/null +++ b/dlls/d3dx9_36/texture.c @@ -0,0 +1,37 @@ +/* + * Copyright 2010 Christian Costa + * + * 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 "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + LPDIRECT3DTEXTURE9 *ppTexture) +{ + FIXME("(%p, %d, %d, %d, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, + pool, ppTexture); + + return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); +}

1 0

Vincent Povirk : ole32: Add error checking to StorageBaseImpl_CreateStorage .
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: d420a858da7db4948b7163809e1107bbe95d7eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d420a858da7db4948b7163809… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 13 12:46:18 2010 -0600 ole32: Add error checking to StorageBaseImpl_CreateStorage. --- dlls/ole32/storage32.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a7c12b5..88e0524 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1132,15 +1132,22 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( /* * Create a new directory entry for the storage */ - StorageBaseImpl_CreateDirEntry(This, &newEntry, &newEntryRef); + hr = StorageBaseImpl_CreateDirEntry(This, &newEntry, &newEntryRef); + if (FAILED(hr)) + return hr; /* * Insert the new directory entry into the parent storage's tree */ - insertIntoTree( + hr = insertIntoTree( This, This->storageDirEntry, newEntryRef); + if (FAILED(hr)) + { + StorageBaseImpl_DestroyDirEntry(This, newEntryRef); + return hr; + } /* * Open it to get a pointer to return.

1 0

André Hentschel : cmd: Improve German translation.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: d00f0316463eb53fffff2edbdc9809876dc6a4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00f0316463eb53fffff2edbd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 14 21:43:31 2010 +0100 cmd: Improve German translation. --- programs/cmd/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 0e4fc44..2e83338 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -233,7 +233,7 @@ mit PUSHD gespeicherten.\n" Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" - WCMD_ALLHELP, "CMD eingebauten Befehle sind:\n\ + WCMD_ALLHELP, "In CMD eingebaute Befehle sind:\n\ ATTRIB\t\tZeigt oder ändert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ CD (CHDIR)\tWechselt in ein Verzeichnis\n\

1 0

Alexander Nicolaysen Sørnes : dsound/ tests: Test querying for KsPropertySet on primary buffer.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 9c88bd8d245c667979fe99c5e6aa78b2cae0ae07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c88bd8d245c667979fe99c5e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 15 00:59:27 2010 +0100 dsound/tests: Test querying for KsPropertySet on primary buffer. --- dlls/dsound/tests/ds3d.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 8ae0efa..ad380d8 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1158,13 +1158,12 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "to create a 3D primary buffer: %08x\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; + LPDIRECTSOUNDBUFFER temp_buffer=NULL; rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " "failed to get a 3D listener: %08x\n",rc); if (rc==DS_OK && listener!=NULL) { - LPDIRECTSOUNDBUFFER temp_buffer=NULL; - /* Checking the COM interface */ rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); @@ -1213,6 +1212,16 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } + todo_wine { + temp_buffer = NULL; + rc=IDirectSoundBuffer_QueryInterface(primary, + &IID_IKsPropertySet,(LPVOID *)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); + } + /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, "

1 0

Christian Costa : d3drm: Remove wrong description.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 739c1177d9c0b8d28b226ad09fb033c83d53bd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739c1177d9c0b8d28b226ad09… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:49:03 2010 +0100 d3drm: Remove wrong description. --- dlls/d3drm/d3drm.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 849efea..72eb864 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -3,9 +3,6 @@ * * Copyright 2010 Christian Costa * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * 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

1 0

Christian Costa : d3drm: Make IDirect3DRMMeshBuilderImpl_Load handle normals and texture coordinates .
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: e0756602a4d1a247dddd94c707354636c370af25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0756602a4d1a247dddd94c70… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:48:50 2010 +0100 d3drm: Make IDirect3DRMMeshBuilderImpl_Load handle normals and texture coordinates. Implement IDirect3DRMMeshBuilderImpl_GetTextureCoordinates. --- dlls/d3drm/meshbuilder.c | 98 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 94 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index e5d1307..6eb5d1b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -35,6 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { + D3DVALUE u; + D3DVALUE v; +} Coords2d; + +typedef struct { const IDirect3DRMMeshBuilderVtbl *lpVtbl; LONG ref; DWORD nb_vertices; @@ -44,6 +49,8 @@ typedef struct { DWORD nb_faces; DWORD face_data_size; LPVOID pFaceData; + DWORD nb_coords2d; + Coords2d* pCoords2d; } IDirect3DRMMeshBuilderImpl; typedef struct { @@ -54,8 +61,11 @@ typedef struct { static const struct IDirect3DRMMeshBuilderVtbl Direct3DRMMeshBuilder_Vtbl; -static const GUID GUID_Header = { 0x3D82AB43, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; -static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; +static const GUID GUID_Header = { 0x3D82AB43, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; +static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; +static const GUID GUID_MeshTextureCoords = { 0xF6F23F40, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; +static const GUID GUID_MeshMaterialList = { 0xF6F23F42, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; +static const GUID GUID_MeshNormals = { 0xF6F23F43, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; static char templates[] = { "xof 0302txt 0064" @@ -426,6 +436,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if LPDIRECTXFILE pDXFile = NULL; LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEDATA pData = NULL; + LPDIRECTXFILEOBJECT pObject = NULL; + LPDIRECTXFILEDATA pData2 = NULL; const GUID* pGuid; DWORD size; Header* pHeader; @@ -442,6 +454,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if This->pNormals = NULL; HeapFree(GetProcessHeap(), 0, This->pFaceData); This->pFaceData = NULL; + HeapFree(GetProcessHeap(), 0, This->pCoords2d); + This->pCoords2d = NULL; if (loadflags == D3DRMLOAD_FROMMEMORY) { @@ -536,6 +550,73 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if This->pFaceData = HeapAlloc(GetProcessHeap(), 0, This->face_data_size); memcpy(This->pFaceData, ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD), This->face_data_size); + while (1) + { + hr = IDirectXFileData_GetNextObject(pData, &pObject); + if (hr == DXFILEERR_NOMOREOBJECTS) + { + FIXME("no more object\n"); + break; + } + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFileObject_QueryInterface(pObject, &IID_IDirectXFileData, (void**)&pData2); + IDirectXFileObject_Release(pObject); + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFileData_GetType(pData2, &pGuid); + if (hr != DXFILE_OK) + { + IDirectXFileData_Release(pData2); + goto end; + } + + FIXME("toto: Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + + if (!IsEqualGUID(pGuid, &GUID_MeshNormals)) + { + DWORD tmp; + + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + This->nb_normals = *(DWORD*)ptr; + tmp = *(DWORD*)(ptr + sizeof(DWORD) + This->nb_normals * sizeof(D3DVECTOR)); + + FIXME("MeshNormals: nb_normals = %d, nb_faces_normals = %d\n", This->nb_normals, tmp); + + This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); + memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); + } + else if(!IsEqualGUID(pGuid, &GUID_MeshTextureCoords)) + { + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + This->nb_coords2d = *(DWORD*)ptr; + + FIXME("MeshTextureCoords: nb_coords2d = %d\n", This->nb_coords2d); + + This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d)); + memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); + + } + else if(!IsEqualGUID(pGuid, &GUID_MeshMaterialList)) + { + FIXME("MeshMaterialList not supported yet, ignoring...\n"); + } + else + { + FIXME("Unknown GUID %s, ignoring...\n", debugstr_guid(pGuid)); + } + + IDirectXFileData_Release(pData2); + } + ret = D3DRM_OK; end: @@ -546,19 +627,22 @@ end: if (pDXFile) IDirectXFile_Release(pDXFile); - if (hr != D3DRM_OK) + if (ret != D3DRM_OK) { /* Clean mesh data */ This->nb_vertices = 0; This->nb_normals = 0; This->nb_faces = 0; This->face_data_size = 0; + This->nb_coords2d = 0; HeapFree(GetProcessHeap(), 0, This->pVertices); This->pVertices = NULL; HeapFree(GetProcessHeap(), 0, This->pNormals); This->pNormals = NULL; HeapFree(GetProcessHeap(), 0, This->pFaceData); This->pFaceData = NULL; + HeapFree(GetProcessHeap(), 0, This->pCoords2d); + This->pCoords2d = NULL; } return ret; @@ -826,7 +910,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_GetTextureCoordinates(IDirect3D FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v); - return E_NOTIMPL; + if (index >= This->nb_coords2d) + return D3DRMERR_NOTFOUND; + + *u = This->pCoords2d[index].u; + *v = This->pCoords2d[index].v; + + return D3DRM_OK; } static int WINAPI IDirect3DRMMeshBuilderImpl_AddVertex(IDirect3DRMMeshBuilder* iface, D3DVALUE x, D3DVALUE y, D3DVALUE z)

1 0

Hans Leidekker : msi: Implement the RemoveShortcuts standard action.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 2276c291fc455c035078503cff970865d5dc866c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2276c291fc455c035078503cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 10:20:01 2010 +0100 msi: Implement the RemoveShortcuts standard action. --- dlls/msi/action.c | 164 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 107 insertions(+), 57 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6ee3007..4ddfc82 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3027,19 +3027,47 @@ static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) return rc; } +static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) +{ + static const WCHAR szlnk[] = {'.','l','n','k',0}; + LPCWSTR directory, extension; + LPWSTR link_folder, link_file, filename; + + directory = MSI_RecordGetString( row, 2 ); + link_folder = resolve_folder( package, directory, FALSE, FALSE, TRUE, NULL ); + + /* may be needed because of a bug somewhere else */ + create_full_pathW( link_folder ); + + filename = msi_dup_record_field( row, 3 ); + reduce_to_longfilename( filename ); + + extension = strchrW( filename, '.' ); + if (!extension || strcmpiW( extension, szlnk )) + { + int len = strlenW( filename ); + filename = msi_realloc( filename, len * sizeof(WCHAR) + sizeof(szlnk) ); + memcpy( filename + len, szlnk, sizeof(szlnk) ); + } + link_file = build_directory_name( 2, link_folder, filename ); + msi_free( link_folder ); + msi_free( filename ); + + return link_file; +} + static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; - LPWSTR target_file, target_folder, filename; - LPCWSTR buffer, extension; + LPWSTR link_file, deformated, path; + LPCWSTR component, target; MSICOMPONENT *comp; - static const WCHAR szlnk[]={'.','l','n','k',0}; IShellLinkW *sl = NULL; IPersistFile *pf = NULL; HRESULT res; - buffer = MSI_RecordGetString(row,4); - comp = get_loaded_component(package,buffer); + component = MSI_RecordGetString(row, 4); + comp = get_loaded_component(package, component); if (!comp) return ERROR_SUCCESS; @@ -3048,10 +3076,8 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) TRACE("Skipping shortcut creation due to disabled component\n"); comp->Action = comp->Installed; - return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; ui_actiondata(package,szCreateShortcuts,row); @@ -3072,31 +3098,10 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) goto err; } - buffer = MSI_RecordGetString(row,2); - target_folder = resolve_folder(package, buffer,FALSE,FALSE,TRUE,NULL); - - /* may be needed because of a bug somewhere else */ - create_full_pathW(target_folder); - - filename = msi_dup_record_field( row, 3 ); - reduce_to_longfilename(filename); - - extension = strchrW(filename,'.'); - if (!extension || strcmpiW(extension,szlnk)) + target = MSI_RecordGetString(row, 5); + if (strchrW(target, '[')) { - int len = strlenW(filename); - filename = msi_realloc(filename, len * sizeof(WCHAR) + sizeof(szlnk)); - memcpy(filename + len, szlnk, sizeof(szlnk)); - } - target_file = build_directory_name(2, target_folder, filename); - msi_free(target_folder); - msi_free(filename); - - buffer = MSI_RecordGetString(row,5); - if (strchrW(buffer,'[')) - { - LPWSTR deformated; - deformat_string(package,buffer,&deformated); + deformat_string(package, target, &deformated); IShellLinkW_SetPath(sl,deformated); msi_free(deformated); } @@ -3108,17 +3113,16 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) if (!MSI_RecordIsNull(row,6)) { - LPWSTR deformated; - buffer = MSI_RecordGetString(row,6); - deformat_string(package,buffer,&deformated); + LPCWSTR arguments = MSI_RecordGetString(row, 6); + deformat_string(package, arguments, &deformated); IShellLinkW_SetArguments(sl,deformated); msi_free(deformated); } if (!MSI_RecordIsNull(row,7)) { - buffer = MSI_RecordGetString(row,7); - IShellLinkW_SetDescription(sl,buffer); + LPCWSTR description = MSI_RecordGetString(row, 7); + IShellLinkW_SetDescription(sl, description); } if (!MSI_RecordIsNull(row,8)) @@ -3126,20 +3130,18 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) if (!MSI_RecordIsNull(row,9)) { - LPWSTR Path; INT index; + LPCWSTR icon = MSI_RecordGetString(row, 9); - buffer = MSI_RecordGetString(row,9); - - Path = build_icon_path(package,buffer); + path = build_icon_path(package, icon); index = MSI_RecordGetInteger(row,10); /* no value means 0 */ if (index == MSI_NULL_INTEGER) index = 0; - IShellLinkW_SetIconLocation(sl,Path,index); - msi_free(Path); + IShellLinkW_SetIconLocation(sl, path, index); + msi_free(path); } if (!MSI_RecordIsNull(row,11)) @@ -3147,18 +3149,19 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) if (!MSI_RecordIsNull(row,12)) { - LPWSTR Path; - buffer = MSI_RecordGetString(row,12); - Path = resolve_folder(package, buffer, FALSE, FALSE, TRUE, NULL); - if (Path) - IShellLinkW_SetWorkingDirectory(sl,Path); - msi_free(Path); + LPCWSTR wkdir = MSI_RecordGetString(row, 12); + path = resolve_folder(package, wkdir, FALSE, FALSE, TRUE, NULL); + if (path) + IShellLinkW_SetWorkingDirectory(sl, path); + msi_free(path); } - TRACE("Writing shortcut to %s\n",debugstr_w(target_file)); - IPersistFile_Save(pf,target_file,FALSE); + link_file = get_link_file(package, row); - msi_free(target_file); + TRACE("Writing shortcut to %s\n", debugstr_w(link_file)); + IPersistFile_Save(pf, link_file, FALSE); + + msi_free(link_file); err: if (pf) @@ -3193,6 +3196,59 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package) return rc; } +static UINT ITERATE_RemoveShortcuts( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + LPWSTR link_file; + LPCWSTR component; + MSICOMPONENT *comp; + + component = MSI_RecordGetString( row, 4 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT )) + { + TRACE("Skipping, component not scheduled for uninstall\n"); + + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_ABSENT; + + ui_actiondata( package, szRemoveShortcuts, row ); + + link_file = get_link_file( package, row ); + + TRACE("Removing shortcut file %s\n", debugstr_w( link_file )); + if (!DeleteFileW( link_file )) + { + WARN("Failed to remove shortcut file %u\n", GetLastError()); + } + msi_free( link_file ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','S','h','o','r','t','c','u','t','`',0}; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveShortcuts, package ); + msiobj_release( &view->hdr ); + + return rc; +} + static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = param; @@ -6473,12 +6529,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveRegistryValues", table ); } -static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'S','h','o','r','t','c','u','t',0 }; - return msi_unimplemented_action_stub( package, "RemoveShortcuts", table ); -} - static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) { static const WCHAR table[] = { 'D','i','r','e','c','t','o','r','y',0 };

1 0