September 2010 - Wine-commits

Luca Bennati : inetcpl.cpl: Add Italian translation.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 5fd0bfe364df6726e394dfadf6b65719662419fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd0bfe364df6726e394dfadf… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Sep 10 13:59:09 2010 +0200 inetcpl.cpl: Add Italian translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_It.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 93bf2ac..66151e7 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ RC_SRCS = \ cpl_De.rc \ cpl_En.rc \ + cpl_It.rc \ inetcpl.rc SVG_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc new file mode 100644 index 0000000..81e3044 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -0,0 +1,33 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Luca Bennati <lucak3(a)gmail.com + * + * 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 "inetcpl.h" + +/* UTF-8 */ +#pragma codepage(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Impostazioni di Internet" + IDS_CPL_INFO "Configura il browser Internet di Wine e le relative impostazioni" +END

1 0

Vincent Povirk : ws2_32: Add a test for selecting invalid sockets.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: e1705151a95949cef15f3cb583831ca0e2323a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1705151a95949cef15f3cb58… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 12 16:17:09 2010 -0500 ws2_32: Add a test for selecting invalid sockets. --- dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 631fcda..16c6fcb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1939,6 +1939,32 @@ static void test_select(void) broken(thread_params.ReadKilled == 0), /*Win98*/ "closesocket did not wakeup select\n"); + /* Test selecting invalid handles */ + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + FD_SET(INVALID_SOCKET, &readfds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + + FD_ZERO(&readfds); + FD_SET(INVALID_SOCKET, &writefds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &writefds), "FD should not be set\n"); + + FD_ZERO(&writefds); + FD_SET(INVALID_SOCKET, &exceptfds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); } static DWORD WINAPI AcceptKillThread(select_thread_params *par)

1 0

Frédéric Delanoy : shdocvw: Update French translation.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 3d9794628a90162c25b055956fc00fe7961efe23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9794628a90162c25b055956… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 15 19:11:09 2010 +0200 shdocvw: Update French translation. --- dlls/shdocvw/Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc index c3a409c..1e17409 100644 --- a/dlls/shdocvw/Fr.rc +++ b/dlls/shdocvw/Fr.rc @@ -54,6 +54,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "&Aperçu avant impression...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Propriétés...", ID_BROWSE_PROPERTIES + MENUITEM "&Quitter", ID_BROWSE_QUIT } POPUP "&Afficher" {

1 0

Frédéric Delanoy : shell32: Update French translation.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 0df8892d596206475c3b03e67094e49113d745b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df8892d596206475c3b03e67… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 15 19:11:10 2010 +0200 shell32: Update French translation. --- dlls/shell32/shell32_Fr.rc | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 3769947..a88fa2f 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -281,14 +281,34 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\Historique" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "Mes images" IDS_PROGRAM_FILES_COMMON "Program Files\\Fichiers communs" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Fichiers communs" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Menu Démarrer\\Programmes\\Outils d'administration" - IDS_COMMON_MUSIC "Documents\\Ma musique" - IDS_COMMON_PICTURES "Documents\\Mes images" - IDS_COMMON_VIDEO "Documents\\Mes vidéos" + IDS_COMMON_MUSIC "Musique" + IDS_COMMON_PICTURES "Images" + IDS_COMMON_VIDEO "Vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CONTACTS "Contacts" + IDS_LINKS "Liens" + IDS_PHOTO_ALBUMS "Images\\Diaporamas" + IDS_PLAYLISTS "Musique\\Listes de lecture" + IDS_PUBLIC_DOWNLOADS "Téléchargements" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Bibliothèques" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Sonneries" + IDS_SAMPLE_MUSIC "Musique\\Échantillons" + IDS_SAMPLE_PICTURES "Images\\Échantillons" + IDS_SAMPLE_PLAYLISTS "Musique\\Exemples de listes de lecture" + IDS_SAMPLE_VIDEOS "Vidéos\\Échantillons" + IDS_SAVED_GAMES "Jeux sauvegardés" + IDS_SAVED_SEARCHES "Recherches" + IDS_USER_PROFILES "Utilisateurs" + IDS_COMMON_OEM_LINKS "Liens OEM" + IDS_DOCUMENTS "Documents" + IDS_DOWNLOADS "Téléchargements" IDS_NEWFOLDER "Nouveau dossier"

1 0

Mikko Rasa : secur32: Validate buffers passed to schan_DecryptMessage.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: b424b3431ee4c07bfcdc54f58175f49b1f78780d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b424b3431ee4c07bfcdc54f58… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:07 2010 +0300 secur32: Validate buffers passed to schan_DecryptMessage. --- dlls/secur32/schannel.c | 50 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 7a3bb3c..70458fa 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1144,6 +1144,49 @@ static int schan_decrypt_message_get_next_buffer(const struct schan_transport *t return -1; } +static int schan_validate_decrypt_buffer_desc(PSecBufferDesc message) +{ + int data_idx = -1; + unsigned int empty_count = 0; + unsigned int i; + + if (message->cBuffers < 4) + { + WARN("Less than four buffers passed\n"); + return -1; + } + + for (i = 0; i < message->cBuffers; ++i) + { + SecBuffer *b = &message->pBuffers[i]; + if (b->BufferType == SECBUFFER_DATA) + { + if (data_idx != -1) + { + WARN("More than one data buffer passed\n"); + return -1; + } + data_idx = i; + } + else if (b->BufferType == SECBUFFER_EMPTY) + ++empty_count; + } + + if (data_idx == -1) + { + WARN("No data buffer passed\n"); + return -1; + } + + if (empty_count < 3) + { + WARN("Less than three empty buffers passed\n"); + return -1; + } + + return data_idx; +} + static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { @@ -1164,12 +1207,9 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle dump_buffer_desc(message); - idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_DATA); + idx = schan_validate_decrypt_buffer_desc(message); if (idx == -1) - { - WARN("No data buffer passed\n"); - return SEC_E_INTERNAL_ERROR; - } + return SEC_E_INVALID_TOKEN; buffer = &message->pBuffers[idx]; data_size = buffer->cbBuffer;

1 0

Mikko Rasa : secur32: Fill header and trailer buffers in schan_DecryptMessage.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 149ffe130f682be1a5f1cbd91a3202f1c5ec4b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=149ffe130f682be1a5f1cbd91… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:08 2010 +0300 secur32: Fill header and trailer buffers in schan_DecryptMessage. --- dlls/secur32/schannel.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 70458fa..0e8b9e2 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1187,6 +1187,19 @@ static int schan_validate_decrypt_buffer_desc(PSecBufferDesc message) return data_idx; } +static void schan_decrypt_fill_buffer(PSecBufferDesc message, ULONG buffer_type, void *data, ULONG size) +{ + int idx; + SecBuffer *buffer; + + idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_EMPTY); + buffer = &message->pBuffers[idx]; + + buffer->BufferType = buffer_type; + buffer->pvBuffer = data; + buffer->cbBuffer = size; +} + static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { @@ -1198,6 +1211,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle ssize_t received = 0; ssize_t ret; int idx; + char *buf_ptr; TRACE("context_handle %p, message %p, message_seq_no %d, quality %p\n", context_handle, message, message_seq_no, quality); @@ -1252,10 +1266,19 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %zd bytes\n", received); - memcpy(buffer->pvBuffer, data, received); - buffer->cbBuffer = received; + buf_ptr = buffer->pvBuffer; + memcpy(buf_ptr + 5, data, received); HeapFree(GetProcessHeap(), 0, data); + schan_decrypt_fill_buffer(message, SECBUFFER_DATA, + buf_ptr + 5, received); + + schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, + buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + + buffer->BufferType = SECBUFFER_STREAM_HEADER; + buffer->cbBuffer = 5; + return SEC_E_OK; }

1 0

Mikko Rasa : secur32: Only process full TLS frames in schan_DecryptMessage.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: b335e94788647afa013b5e58791f176b2a459e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b335e94788647afa013b5e587… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:09 2010 +0300 secur32: Only process full TLS frames in schan_DecryptMessage. --- dlls/secur32/schannel.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0e8b9e2..78757ac 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -105,6 +105,7 @@ struct schan_transport; struct schan_buffers { SIZE_T offset; + SIZE_T limit; const SecBufferDesc *desc; int current_buffer_idx; BOOL allow_buffer_resize; @@ -492,6 +493,7 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *)) { s->offset = 0; + s->limit = 0; s->desc = desc; s->current_buffer_idx = -1; s->allow_buffer_resize = FALSE; @@ -599,6 +601,16 @@ static ssize_t schan_pull(gnutls_transport_ptr_t transport, void *buff, size_t b return -1; } + if (t->in.limit != 0 && t->in.offset + buff_len >= t->in.limit) + { + buff_len = t->in.limit - t->in.offset; + if (buff_len == 0) + { + pgnutls_transport_set_errno(t->ctx->session, EAGAIN); + return -1; + } + } + memcpy(buff, b, buff_len); t->in.offset += buff_len; @@ -1208,10 +1220,11 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle SecBuffer *buffer; SIZE_T data_size; char *data; + unsigned expected_size; ssize_t received = 0; ssize_t ret; int idx; - char *buf_ptr; + unsigned char *buf_ptr; TRACE("context_handle %p, message %p, message_seq_no %d, quality %p\n", context_handle, message, message_seq_no, quality); @@ -1225,12 +1238,22 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle if (idx == -1) return SEC_E_INVALID_TOKEN; buffer = &message->pBuffers[idx]; + buf_ptr = buffer->pvBuffer; + + expected_size = 5 + ((buf_ptr[3] << 8) | buf_ptr[4]); + if(buffer->cbBuffer < expected_size) + { + TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); + TRACE("Returning SEC_E_INCOMPLETE_MESSAGE\n"); + return SEC_E_INCOMPLETE_MESSAGE; + } data_size = buffer->cbBuffer; data = HeapAlloc(GetProcessHeap(), 0, data_size); transport.ctx = ctx; init_schan_buffers(&transport.in, message, schan_decrypt_message_get_next_buffer); + transport.in.limit = expected_size; init_schan_buffers(&transport.out, NULL, NULL); pgnutls_transport_set_ptr(ctx->session, (gnutls_transport_ptr_t)&transport); @@ -1266,7 +1289,6 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %zd bytes\n", received); - buf_ptr = buffer->pvBuffer; memcpy(buf_ptr + 5, data, received); HeapFree(GetProcessHeap(), 0, data); @@ -1276,6 +1298,10 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + if(buffer->cbBuffer > expected_size) + schan_decrypt_fill_buffer(message, SECBUFFER_EXTRA, + buf_ptr + expected_size, buffer->cbBuffer - expected_size); + buffer->BufferType = SECBUFFER_STREAM_HEADER; buffer->cbBuffer = 5;

1 0

Mikko Rasa : secur32: Fill a SECBUFFER_MISSING buffer if the message is not complete.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 506af9205d62af2bd58e40c8b5f956e041a0ba8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=506af9205d62af2bd58e40c8b… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:10 2010 +0300 secur32: Fill a SECBUFFER_MISSING buffer if the message is not complete. --- dlls/secur32/schannel.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 78757ac..199c7ce 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1244,6 +1244,15 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle if(buffer->cbBuffer < expected_size) { TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); + buffer->BufferType = SECBUFFER_MISSING; + buffer->cbBuffer = expected_size - buffer->cbBuffer; + + /* This is a bit weird, but windows does it too */ + idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_EMPTY); + buffer = &message->pBuffers[idx]; + buffer->BufferType = SECBUFFER_MISSING; + buffer->cbBuffer = expected_size - buffer->cbBuffer; + TRACE("Returning SEC_E_INCOMPLETE_MESSAGE\n"); return SEC_E_INCOMPLETE_MESSAGE; }

1 0

Mariusz Pluciński : gameux/tests: Add basic test for InstallGame and UninstallGame.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 7c121d53aef1d6027c108f600dfcaf1fabb3f015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c121d53aef1d6027c108f600… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Sep 15 00:57:02 2010 +0200 gameux/tests: Add basic test for InstallGame and UninstallGame. --- dlls/gameux/tests/gameexplorer.c | 45 ++++++++++++++++++++++++++++++++++++- dlls/gameux/tests/test.gdf.xml | 9 +++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 3e86239..3a72d20 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -368,7 +368,7 @@ static void _validateGameRegistryKey(int line, /******************************************************************************* * Test routines */ -static void test_create(BOOL* gameExplorerAvailable) +static void test_create(BOOL* gameExplorerAvailable, BOOL* gameExplorer2Available) { HRESULT hr; @@ -391,6 +391,7 @@ static void test_create(BOOL* gameExplorerAvailable) if(ge2) { ok( hr == S_OK, "IGameExplorer2 creating failed (result false)\n"); + *gameExplorer2Available = TRUE; IGameExplorer2_Release(ge2); } else @@ -477,21 +478,61 @@ static void test_add_remove_game(void) IGameExplorer_Release(ge); } } +void test_install_uninstall_game(void) +{ + HRESULT hr; + + IGameExplorer2* ge2 = NULL; + WCHAR sExeName[MAX_PATH]; + WCHAR sExePath[MAX_PATH]; + DWORD dwExeNameLen; + + hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer2, (LPVOID*)&ge2); + ok(ge2 != NULL, "cannot create coclass IGameExplorer2\n"); + ok(hr == S_OK, "cannot create coclass IGameExplorer2\n"); + + if(ge2) + { + /* prepare path to binary */ + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); + lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); + + trace("prepared EXE name: %s\n", wine_dbgstr_w(sExeName)); + trace("prepared EXE path: %s\n", wine_dbgstr_w(sExePath)); + + + hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); + + if(SUCCEEDED(hr)) + { + hr = IGameExplorer2_UninstallGame(ge2, sExeName); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); + } + + IGameExplorer2_Release(ge2); + } +} START_TEST(gameexplorer) { HRESULT r; BOOL gameExplorerAvailable = FALSE; + BOOL gameExplorer2Available = FALSE; if(_loadDynamicRoutines()) { r = CoInitialize( NULL ); ok( r == S_OK, "failed to init COM\n"); - test_create(&gameExplorerAvailable); + test_create(&gameExplorerAvailable, &gameExplorer2Available); if(gameExplorerAvailable) test_add_remove_game(); + + if(gameExplorer2Available) + test_install_uninstall_game(); } else /* this is not a failure, because both procedures loaded by address diff --git a/dlls/gameux/tests/test.gdf.xml b/dlls/gameux/tests/test.gdf.xml index 981abd3..c8959fc 100644 --- a/dlls/gameux/tests/test.gdf.xml +++ b/dlls/gameux/tests/test.gdf.xml @@ -27,5 +27,14 @@ xmlns="urn:schemas-microsoft-com:GameDescription.v1"> <Version> <VersionNumber versionNumber="1.0.0.0"/> </Version> + <ExtendedProperties> + <GameTasks> + <Play> + <Primary> + <FileTask path="gameux_crosstest.exe" arguments="" /> + </Primary> + </Play> + </GameTasks> + </ExtendedProperties> </GameDefinition> </GameDefinitionFile>

1 0

Mariusz Pluciński : gameux/tests: Add verification of registry content for InstallGame and UninstallGame.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: c84cf4189c094a398a6a30c24005f6dce1ca7709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84cf4189c094a398a6a30c24… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Sep 15 01:21:37 2010 +0200 gameux/tests: Add verification of registry content for InstallGame and UninstallGame. --- dlls/gameux/tests/gameexplorer.c | 156 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 148 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 3a72d20..8553890 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -33,6 +33,9 @@ #include "wine/test.h" +/* function from Shell32, not defined in header */ +extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); + /******************************************************************************* * Pointers used instead of direct calls. These procedures are not available on * older system, which causes problem while loading test binary. @@ -68,7 +71,8 @@ static BOOL _loadDynamicRoutines(void) * * Parameters: * installScope [I] the scope which was used in AddGame/InstallGame call - * gameInstanceId [I] game instance GUID + * gameInstanceId [I] game instance GUID. If NULL, then only + * path to scope is returned * lpRegistryPath [O] pointer which will receive address to string * containing expected registry path. Path * is relative to HKLM registry key. It @@ -138,14 +142,17 @@ static HRESULT _buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, else hr = E_INVALIDARG; - /* put game's instance id on the end of path */ - if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); - - if(SUCCEEDED(hr)) + /* put game's instance id on the end of path, but only if id was passes */ + if(gameInstanceId) { - lstrcatW(sRegistryPath, sBackslash); - lstrcatW(sRegistryPath, sInstanceId); + if(SUCCEEDED(hr)) + hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + + if(SUCCEEDED(hr)) + { + lstrcatW(sRegistryPath, sBackslash); + lstrcatW(sRegistryPath, sInstanceId); + } } if(SUCCEEDED(hr)) @@ -366,6 +373,128 @@ static void _validateGameRegistryKey(int line, } /******************************************************************************* + * _LoadRegistryString + * + * Helper function, loads string from registry value and allocates buffer for it + * + * Parameters: + * hRootKey [I] base key for reading. Should be opened + * with KEY_READ permission + * lpRegistryKey [I] name of registry key, subkey of root key + * lpRegistryValue [I] name of registry value + * lpValue [O] pointer where address of received + * value will be stored. Value should be + * freed by CoTaskMemFree call + */ +static HRESULT _LoadRegistryString(HKEY hRootKey, + LPCWSTR lpRegistryKey, + LPCWSTR lpRegistryValue, + LPWSTR* lpValue) +{ + HRESULT hr; + DWORD dwSize; + + *lpValue = NULL; + + hr = HRESULT_FROM_WIN32(_RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, + RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + + if(SUCCEEDED(hr)) + { + *lpValue = CoTaskMemAlloc(dwSize); + if(!*lpValue) + hr = E_OUTOFMEMORY; + } + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(_RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, + RRF_RT_REG_SZ, NULL, *lpValue, &dwSize)); + + return hr; +} +/******************************************************************************* + * _findGameInstanceId + * + * Helper funtion. Searches for instance identifier of given game in given + * installation scope. + * + * Parameters: + * line [I] line to display messages + * sGDFBinaryPath [I] path to binary containing GDF + * installScope [I] game install scope to search in + * pInstanceId [O] instance identifier of given game + */ +static void _findGameInstanceId(int line, + LPWSTR sGDFBinaryPath, + GAME_INSTALL_SCOPE installScope, + GUID* pInstanceId) +{ + static const WCHAR sConfigGDFBinaryPath[] = + {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; + + HRESULT hr; + BOOL found = FALSE; + LPWSTR lpRegistryPath = NULL; + HKEY hRootKey; + DWORD dwSubKeys, dwSubKeyLen, dwMaxSubKeyLen, i; + LPWSTR lpName = NULL, lpValue = NULL; + + hr = _buildGameRegistryPath(installScope, NULL, &lpRegistryPath); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot get registry path to given scope: %d\n", installScope); + + if(SUCCEEDED(hr)) + /* enumerate all subkeys of received one and search them for value "ConfigGGDFBinaryPath" */ + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, + lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hRootKey)); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot open key registry key: %s\n", wine_dbgstr_w(lpRegistryPath)); + + if(SUCCEEDED(hr)) + { + hr = HRESULT_FROM_WIN32(RegQueryInfoKeyW(hRootKey, NULL, NULL, NULL, + &dwSubKeys, &dwMaxSubKeyLen, NULL, NULL, NULL, NULL, NULL, NULL)); + + if(SUCCEEDED(hr)) + { + ++dwMaxSubKeyLen; /* for string terminator */ + lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); + if(!lpName) hr = E_OUTOFMEMORY; + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name"); + } + + if(SUCCEEDED(hr)) + { + for(i=0; i<dwSubKeys && !found; ++i) + { + dwSubKeyLen = dwMaxSubKeyLen; + hr = HRESULT_FROM_WIN32(RegEnumKeyExW(hRootKey, i, lpName, &dwSubKeyLen, + NULL, NULL, NULL, NULL)); + + if(SUCCEEDED(hr)) + hr = _LoadRegistryString(hRootKey, lpName, + sConfigGDFBinaryPath, &lpValue); + + if(SUCCEEDED(hr)) + if(lstrcmpW(lpValue, sGDFBinaryPath)==0) + { + /* key found, let's copy instance id and exit */ + hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + ok(SUCCEEDED(hr), "cannot convert subkey to guid: %s\n", + wine_dbgstr_w(lpName)); + + found = TRUE; + } + CoTaskMemFree(lpValue); + } + } + + CoTaskMemFree(lpName); + RegCloseKey(hRootKey); + } + + CoTaskMemFree(lpRegistryPath); + todo_wine ok_(__FILE__, line)(found==TRUE, "cannot find game with GDF path %s in scope %d\n", + wine_dbgstr_w(sGDFBinaryPath), installScope); +} +/******************************************************************************* * Test routines */ static void test_create(BOOL* gameExplorerAvailable, BOOL* gameExplorer2Available) @@ -480,12 +609,16 @@ static void test_add_remove_game(void) } void test_install_uninstall_game(void) { + static const GUID applicationId = { 0x17A6558E, 0x60BE, 0x4078, + { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 }}; + HRESULT hr; IGameExplorer2* ge2 = NULL; WCHAR sExeName[MAX_PATH]; WCHAR sExePath[MAX_PATH]; DWORD dwExeNameLen; + GUID guid; hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer2, (LPVOID*)&ge2); ok(ge2 != NULL, "cannot create coclass IGameExplorer2\n"); @@ -504,13 +637,20 @@ void test_install_uninstall_game(void) hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); + /* in comparision to AddGame, InstallGame does not return instance ID, + * so we need to find it manually */ + _findGameInstanceId(__LINE__, sExeName, GIS_CURRENT_USER, &guid); if(SUCCEEDED(hr)) { + todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); + hr = IGameExplorer2_UninstallGame(ge2, sExeName); todo_wine ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); } + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); + IGameExplorer2_Release(ge2); } }

1 0