wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

André Hentschel : shell32/tests: Fix checking the child strings.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 4e862b8440f4b8f15d6bc655ae5afdce2ba23d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e862b8440f4b8f15d6bc655a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 30 21:20:40 2011 +0200 shell32/tests: Fix checking the child strings. --- dlls/shell32/tests/shlexec.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 31b0930..bae0c21 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -680,6 +680,11 @@ static void _okChildString(const char* file, int line, const char* key, const ch { char* result; result=getChildString("Arguments", key); + if (!result) + { + ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + return; + } ok_(file, line)(lstrcmpiA(result, expected) == 0, "%s expected '%s', got '%s'\n", key, expected, result); } @@ -688,6 +693,11 @@ static void _okChildPath(const char* file, int line, const char* key, const char { char* result; result=getChildString("Arguments", key); + if (!result) + { + ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + return; + } ok_(file, line)(StrCmpPath(result, expected) == 0, "%s expected '%s', got '%s'\n", key, expected, result); }

1 0

Alistair Leslie-Hughes : uxtheme: Set last error on NULL pointer.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 81079ef35b0da17de0b3d75022be26f712740d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079ef35b0da17de0b3d7502… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 23:15:25 2011 +1000 uxtheme: Set last error on NULL pointer. --- dlls/uxtheme/system.c | 6 ++++++ dlls/uxtheme/tests/system.c | 12 ++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2d5b41e..6ee1dac 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -641,6 +641,12 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) HTHEME hTheme = NULL; TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags); + if(!pszClassList) + { + SetLastError(E_POINTER); + return NULL; + } + if(flags) FIXME("unhandled flags: %x\n", flags); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 0aaadbd..8dd413b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -192,8 +192,7 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeData(NULL, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -232,8 +231,7 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeData(hWnd, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -359,8 +357,7 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(NULL, NULL, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -399,8 +396,7 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, NULL, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError());

1 0

Marcus Meissner : ntdll: Handle errno also for non ENOENT errors on lseek ( Coverity).
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 956487434d02c1911a942bed1a3949719fe54d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956487434d02c1911a942bed1… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 16:41:29 2011 +0200 ntdll: Handle errno also for non ENOENT errors on lseek (Coverity). --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 548189c..5d6d2cc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1547,9 +1547,9 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U else { old_pos = lseek( fd, 0, SEEK_CUR ); - if (old_pos == -1 && errno == ENOENT) + if (old_pos == -1) { - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = (errno == ENOENT) ? STATUS_NO_MORE_FILES : FILE_GetNtStatus(); res = 0; goto done; }

1 0

Marcus Meissner : msi: Check return value of msi_string2idW (Coverity).
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ee12b4feed8885a4c22716eade4154101ec5577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee12b4feed8885a4c22716ead… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 18:17:21 2011 +0200 msi: Check return value of msi_string2idW (Coverity). --- dlls/msi/streams.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 56b38e3..71616e9 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -296,10 +296,12 @@ static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *n static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) { LPCWSTR str; - UINT i, id, data; + UINT r, i, id, data; str = MSI_RecordGetString(rec, 1); - msi_string2idW(sv->db->strings, str, &id); + r = msi_string2idW(sv->db->strings, str, &id); + if (r != ERROR_SUCCESS) + return r; for (i = 0; i < sv->num_rows; i++) {

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: bd70b79125f77eee82f555b1a595fa35519ae0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd70b79125f77eee82f555b1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 30 20:12:47 2011 +0200 po: Update French translation. --- po/fr.po | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/po/fr.po b/po/fr.po index 270622e..f2319c9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-08-24 14:25+0100\n" +"PO-Revision-Date: 2011-08-30 20:11+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -803,9 +803,8 @@ msgid "Initials" msgstr "Initiales" #: crypt32.rc:80 -#, fuzzy msgid "Surname" -msgstr "Utilisateur" +msgstr "Nom de famille" #: crypt32.rc:81 msgid "Domain Component" @@ -8252,6 +8251,16 @@ msgid "" "Specifying no file type after the equal sign removes the current " "association, if any.\n" msgstr "" +"ASSOC affiche ou modifie les associations d'extensions de fichiers\n" +"\n" +"Syntaxe : ASSOC [.ext[=[typeFichier]]]\n" +"\n" +"ASSOC sans paramètre affiche les associations d'extensions de fichiers en " +"cours.\n" +"Si utilisé uniquement avec une extension de fichier, affiche l'association " +"actuelle.\n" +"Si aucun type de fichiers n'est spécifié après le signe égal, supprimer " +"l'association courante, si elle existe.\n" #: cmd.rc:243 msgid "" @@ -8266,6 +8275,17 @@ msgid "" "Specifying no open command after the equal sign removes the command string " "associated to the specified file type.\n" msgstr "" +"FTYPE affiche ou modifie les commandes d'ouvertures associées à des types de " +"fichiers\n" +"\n" +"Syntaxe : FTYPE [typeFichier[=[commandeOuverture]]]\n" +"\n" +"Sans paramètre, affiche les types de fichiers pour lesquels des chaînes de " +"commande d'ouverture sont actuellement définies.\n" +"Si seul un type de fichier est utilisé, affiche la chaîne de commande " +"d'ouverture associée, si elle existe.\n" +"Ne spécifier aucune commande après le signe égal supprime la commande " +"d'ouverture associée au type de fichier spécifié.\n" #: cmd.rc:245 msgid "MORE displays output of files or piped input in pages.\n" @@ -8291,7 +8311,6 @@ msgstr "" "au système d'exploitation ou au shell où vous avez invoqué cmd.\n" #: cmd.rc:288 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8330,6 +8349,7 @@ msgid "" "Enter HELP <command> for further information on any of the above commands\n" msgstr "" "Les commandes intégrées de CMD sont :\n" +"ASSOC\t\tAffiche ou modifie les associations d'extensions de fichiers\n" "ATTRIB\t\tAffiche ou modifie les attributs de fichiers DOS\n" "CALL\t\tInvoque un fichier batch à l'intérieur d'un autre\n" "CD (CHDIR)\tChange le répertoire courant\n" @@ -8343,6 +8363,8 @@ msgstr "" "ECHO\t\tAffiche du texte sur la console\n" "ENDLOCAL\tMet fin aux modifications locales de l'environnement dans un\n" "\t\tfichier batch\n" +"FTYPE\t\tAffiche ou modifie les commandes d'ouvertures associées à des\n" +"\t\ttypes de fichiers\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" "MD (MKDIR)\tCrée un répertoire\n" "MORE\t\tAffiche du texte par pages\n" @@ -8615,7 +8637,6 @@ msgid "Default gateway" msgstr "Passerelle par défaut" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8627,12 +8648,11 @@ msgid "" msgstr "" "La syntaxe de cette commande est :\n" "\n" -"NET HELP commande\n" +"NET commande [arguments]\n" " -ou-\n" "NET commande /HELP\n" "\n" -" Les commandes disponibles sont :\n" -" NET HELP NET START NET STOP NET USE\n" +"où « commande » peut être HELP, START, STOP ou USE\n" #: net.rc:28 msgid "" @@ -8643,6 +8663,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"La syntaxe de cette commande est :\n" +"\n" +"NET START [service]\n" +"\n" +"Affiche la liste des services en cours d'exécution si « service » est omis. " +"Sinon, « service » est le nom du service à démarrer.\n" #: net.rc:29 msgid "" @@ -8652,6 +8678,11 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" +"La syntaxe de cette commande est :\n" +"\n" +"NET STOP service\n" +"\n" +"où « service » est le nom du service à arrêter.\n" #: net.rc:30 msgid "Stopping dependent service: %s\n" @@ -8736,9 +8767,8 @@ msgid "Reconnecting" msgstr "Reconnexion" #: net.rc:40 -#, fuzzy msgid "The following services are running:\n" -msgstr "Les services dépendants sont en cours d'exécution\n" +msgstr "Les services suivants sont en cours d'exécution :\n" #: notepad.rc:27 msgid "&New\tCtrl+N" @@ -10428,7 +10458,6 @@ msgid "Drives" msgstr "Lecteurs" #: winecfg.rc:41 -#, fuzzy msgid "Select the Unix target directory, please." msgstr "Veuillez sélectionner le répertoire Unix cible."

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateCylinder.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: bae50905c513decb3fd3755771a7c1492f65887d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae50905c513decb3fd375577… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:04:40 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateCylinder. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6fc3ef5..d07d4bd 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4232,14 +4232,14 @@ HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, FLOAT radius1, FLOAT return hr; } - hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, 0, (LPVOID *)&vertices); if (FAILED(hr)) { cylinder->lpVtbl->Release(cylinder); return hr; } - hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, 0, (LPVOID *)&faces); if (FAILED(hr)) { cylinder->lpVtbl->UnlockVertexBuffer(cylinder);

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateSphere.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: d6a7c2cce0a009e788539c5dfa50a072a370ce0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a7c2cce0a009e788539c5df… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:03:52 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateSphere. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c5ad7b9..6fc3ef5 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4060,14 +4060,14 @@ HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT sli return hr; } - hr = sphere->lpVtbl->LockVertexBuffer(sphere, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = sphere->lpVtbl->LockVertexBuffer(sphere, 0, (LPVOID *)&vertices); if (FAILED(hr)) { sphere->lpVtbl->Release(sphere); return hr; } - hr = sphere->lpVtbl->LockIndexBuffer(sphere, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = sphere->lpVtbl->LockIndexBuffer(sphere, 0, (LPVOID *)&faces); if (FAILED(hr)) { sphere->lpVtbl->UnlockVertexBuffer(sphere);

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXLoadMeshFromXInMemory.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 1150c1558ea43f4240844e331e404a0ed55b539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1150c1558ea43f4240844e331… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 18:55:45 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXLoadMeshFromXInMemory. --- dlls/d3dx9_36/mesh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 2462422..c5ad7b9 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3722,7 +3722,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, concat_vertex_size = D3DXGetDeclVertexSize(concat_decl, 0); - hr = concat_mesh->lpVtbl->LockVertexBuffer(concat_mesh, D3DLOCK_DISCARD, (void**)&concat_vertices); + hr = concat_mesh->lpVtbl->LockVertexBuffer(concat_mesh, 0, (void**)&concat_vertices); if (FAILED(hr)) goto cleanup; LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry) @@ -3775,7 +3775,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, concat_mesh->lpVtbl->UnlockVertexBuffer(concat_mesh); concat_vertices = NULL; - hr = concat_mesh->lpVtbl->LockIndexBuffer(concat_mesh, D3DLOCK_DISCARD, &concat_indices); + hr = concat_mesh->lpVtbl->LockIndexBuffer(concat_mesh, 0, &concat_indices); if (FAILED(hr)) goto cleanup; index_offset = 0; @@ -3814,7 +3814,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, DWORD *concat_attrib_buffer = NULL; DWORD offset = 0; - hr = concat_mesh->lpVtbl->LockAttributeBuffer(concat_mesh, D3DLOCK_DISCARD, &concat_attrib_buffer); + hr = concat_mesh->lpVtbl->LockAttributeBuffer(concat_mesh, 0, &concat_attrib_buffer); if (FAILED(hr)) goto cleanup; LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry)

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in load_skin_mesh_from_xof.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 41b6f4aec16a81896a0c5394071fcda86b9e91e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b6f4aec16a81896a0c53940… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 17:21:30 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in load_skin_mesh_from_xof. --- dlls/d3dx9_36/mesh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index ed42883..2462422 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2966,7 +2966,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, hr = D3DXCreateMeshFVF(mesh_data.num_tri_faces, total_vertices, options, mesh_data.fvf, device, &d3dxmesh); if (FAILED(hr)) goto cleanup; - hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, D3DLOCK_DISCARD, &vertices); + hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, 0, &vertices); if (FAILED(hr)) goto cleanup; out_ptr = vertices; @@ -3008,7 +3008,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, } d3dxmesh->lpVtbl->UnlockVertexBuffer(d3dxmesh); - hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, D3DLOCK_DISCARD, (void**)&indices); + hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, 0, (void**)&indices); if (FAILED(hr)) goto cleanup; index_in_ptr = mesh_data.indices; @@ -3037,7 +3037,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, if (mesh_data.material_indices) { DWORD *attrib_buffer = NULL; - hr = d3dxmesh->lpVtbl->LockAttributeBuffer(d3dxmesh, D3DLOCK_DISCARD, &attrib_buffer); + hr = d3dxmesh->lpVtbl->LockAttributeBuffer(d3dxmesh, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup; for (i = 0; i < mesh_data.num_poly_faces; i++) {

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in OptimizeInPlace.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 342faea03591e2d13851be798b5b61f9a68f9be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342faea03591e2d13851be798… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 16:48:18 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in OptimizeInPlace. It does not make sense to use D3DLOCK_DISCARD for locking a newly created vertex buffer because it will be allocated, freed, and then allocated again. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9a0fd03..ed42883 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1293,7 +1293,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag hr = IDirect3DVertexBuffer9_Lock(This->vertex_buffer, 0, 0, (void**)&orig_vertices, D3DLOCK_READONLY); if (FAILED(hr)) goto cleanup; - hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, (void**)&new_vertices, D3DLOCK_DISCARD); + hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, (void**)&new_vertices, 0); if (FAILED(hr)) { IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); goto cleanup;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011