June 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Create directories right before installing files.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: dcb501decd8a40032200c917b5017f75cf362ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb501decd8a40032200c917b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 9 12:08:42 2010 +0200 msi: Create directories right before installing files. --- dlls/msi/action.c | 37 ------------------------------------- dlls/msi/files.c | 29 +++++++++++++++++++++-------- dlls/msi/msipriv.h | 1 - dlls/msi/tests/install.c | 5 +---- 4 files changed, 22 insertions(+), 50 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0505d33..565ef66 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1003,43 +1003,6 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } -/* FIXME: probably should merge this with the above function */ -static UINT msi_create_directory( MSIPACKAGE* package, LPCWSTR dir ) -{ - UINT rc = ERROR_SUCCESS; - MSIFOLDER *folder; - LPWSTR install_path; - - install_path = resolve_folder(package, dir, FALSE, FALSE, TRUE, &folder); - if (!install_path) - return ERROR_FUNCTION_FAILED; - - /* create the path */ - if (folder->State == 0) - { - create_full_pathW(install_path); - folder->State = 2; - } - msi_free(install_path); - - return rc; -} - -UINT msi_create_component_directories( MSIPACKAGE *package ) -{ - MSICOMPONENT *comp; - - /* create all the folders required by the components are going to install */ - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) - { - if (comp->ActionRequest != INSTALLSTATE_LOCAL) - continue; - msi_create_directory( package, comp->Directory ); - } - - return ERROR_SUCCESS; -} - static UINT ACTION_CreateFolders(MSIPACKAGE *package) { static const WCHAR ExecSeqQuery[] = diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 052a158..91ec43e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -174,6 +174,24 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) return gle; } +static UINT msi_create_directory( MSIPACKAGE *package, const WCHAR *dir ) +{ + MSIFOLDER *folder; + WCHAR *install_path; + + install_path = resolve_folder( package, dir, FALSE, FALSE, TRUE, &folder ); + if (!install_path) + return ERROR_FUNCTION_FAILED; + + if (folder->State == 0) + { + create_full_pathW( install_path ); + folder->State = 2; + } + msi_free( install_path ); + return ERROR_SUCCESS; +} + static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -193,6 +211,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, return FALSE; msi_file_update_ui(package, f, szInstallFiles); + msi_create_directory(package, f->Component->Directory); *path = strdupW(f->TargetPath); *attrs = f->Attributes; @@ -224,14 +243,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) schedule_install_files(package); - /* - * Despite MSDN specifying that the CreateFolders action - * should be called before InstallFiles, some installers don't - * do that, and they seem to work correctly. We need to create - * directories here to make sure that the files can be copied. - */ - msi_create_component_directories( package ); - mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -273,6 +284,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) debugstr_w(file->TargetPath)); msi_file_update_ui(package, file, szInstallFiles); + msi_create_directory(package, file->Component->Directory); + rc = copy_install_file(package, file, source); if (rc != ERROR_SUCCESS) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cf9e690..819d8bc 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1002,7 +1002,6 @@ extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR); extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); -extern UINT msi_create_component_directories( MSIPACKAGE *package ); extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); extern UINT msi_get_local_package_name(LPWSTR path, LPCWSTR suffix); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b78918c..6702f13 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3981,10 +3981,7 @@ static void test_caborder(void) ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); - todo_wine - { - ok(!delete_pf("msitest", FALSE), "File is installed\n"); - } + ok(!delete_pf("msitest", FALSE), "File is installed\n"); delete_cab_files(); DeleteFile(msifile);

1 0

Hans Leidekker : msi: Directly pass the disk id to installfiles_cb.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 5ecbc4f8cad6a277c4edc9f397be31a765bc804d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecbc4f8cad6a277c4edc9f39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 9 12:09:06 2010 +0200 msi: Directly pass the disk id to installfiles_cb. The MEDIAINFO structure is modified by the cabinet_next_cabinet callback if there's a continuous cabinet in the installer. --- dlls/msi/files.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 91ec43e..fc92f14 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -196,7 +196,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { static MSIFILE *f = NULL; - MSIMEDIAINFO *mi = user; + UINT_PTR disk_id = (UINT_PTR)user; if (action == MSICABEXTRACT_BEGINEXTRACT) { @@ -207,7 +207,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, return FALSE; } - if (f->disk_id != mi->disk_id || (f->state != msifs_missing && f->state != msifs_overwrite)) + if (f->disk_id != disk_id || (f->state != msifs_missing && f->state != msifs_overwrite)) return FALSE; msi_file_update_ui(package, f, szInstallFiles); @@ -265,7 +265,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) data.mi = mi; data.package = package; data.cb = installfiles_cb; - data.user = mi; + data.user = (PVOID)(UINT_PTR)mi->disk_id; if (file->IsCompressed && !msi_cabextract(package, mi, &data))

1 0

Damjan Jovanovic : winemenubuilder: Also extract .lnk icons from file types 's open handler.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 9954735e430ea09f0dd6cd640bdafff8b410544a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9954735e430ea09f0dd6cd640… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 8 22:05:04 2010 +0200 winemenubuilder: Also extract .lnk icons from file types's open handler. --- programs/winemenubuilder/winemenubuilder.c | 30 ++++++++++++++++++--------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 276c4e4..3abfc39 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -819,10 +819,11 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName) { - int ret = 1; + int ret = 0; WCHAR *extension; WCHAR *icon = NULL; WCHAR *comma; + WCHAR *executable = NULL; int index = 0; char *output_path = NULL; @@ -831,21 +832,30 @@ static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName) goto end; icon = assoc_query(ASSOCSTR_DEFAULTICON, extension, NULL); - if (icon == NULL) - goto end; - - comma = strrchrW(icon, ','); - if (comma) + if (icon) + { + comma = strrchrW(icon, ','); + if (comma) + { + *comma = 0; + index = atoiW(comma + 1); + } + output_path = extract_icon(icon, index, NULL, FALSE); + WINE_TRACE("defaulticon %s -> icon %s\n", wine_dbgstr_w(icon), wine_dbgstr_a(output_path)); + } + else { - *comma = 0; - index = atoiW(comma + 1); + executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, NULL); + if (executable) + output_path = extract_icon(executable, 0, NULL, FALSE); + WINE_TRACE("executable %s -> icon %s\n", wine_dbgstr_w(executable), wine_dbgstr_a(output_path)); } - output_path = extract_icon(icon, index, NULL, FALSE); if (output_path) - ret = rename(output_path, szXPMFileName); + ret = (rename(output_path, szXPMFileName) == 0); end: HeapFree(GetProcessHeap(), 0, icon); + HeapFree(GetProcessHeap(), 0, executable); HeapFree(GetProcessHeap(), 0, output_path); return ret; }

1 0

Łukasz Wojniłowicz : user32: Update the Polish translation.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: c2f55b3434168464408c83e78c25f7dd3655db07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f55b3434168464408c83e78… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Jun 8 15:50:26 2010 +0200 user32: Update the Polish translation. --- dlls/user32/resources/user32_Pl.rc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/resources/user32_Pl.rc b/dlls/user32/resources/user32_Pl.rc index 9ccb96d..884c15a 100644 --- a/dlls/user32/resources/user32_Pl.rc +++ b/dlls/user32/resources/user32_Pl.rc @@ -1,5 +1,6 @@ /* * Copyright 1997 Mikolaj Zalewski + * Copyright 2010 �ukasz Wojni�owicz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,7 +43,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM "W&ytnij", WM_CUT MENUITEM "&Kopiuj", WM_COPY MENUITEM "&Wklej", WM_PASTE - MENUITEM "&Usu\xf1", WM_CLEAR + MENUITEM "&Usu�", WM_CLEAR MENUITEM SEPARATOR MENUITEM "&Zaznacz wszystko", EM_SETSEL END @@ -60,9 +61,9 @@ BEGIN PUSHBUTTON "&Ignoruj", 5, 215, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Tak", 6, 263, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nie", 7, 311, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 359, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 407, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 455, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Spr�buj ponownie", 10, 359, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Kontynuuj", 11, 407, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Pomoc", 9, 455, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122

1 0

Jose Rostagno : shell32: Fix Spanish translation.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 15b6f4df03d53032a07687f5c86a63af62a59ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b6f4df03d53032a07687f5c… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 8 14:29:08 2010 -0300 shell32: Fix Spanish translation. --- dlls/shell32/shell32_Es.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc index 176c677..9873c28 100644 --- a/dlls/shell32/shell32_Es.rc +++ b/dlls/shell32/shell32_Es.rc @@ -287,9 +287,11 @@ STRINGTABLE IDS_NEWFOLDER "Nueva carpeta" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Panel de Control de Wine" + IDS_CPANEL_NAME "Nombre" + IDS_CPANEL_DESCRIPTION "Descripci�n" + + IDS_SHLEXEC_NOASSOC "No hay un programa de Windows configurado para abrir este tipo de archivo." } STRINGTABLE

1 0

Jose Rostagno : write: Add Spanish translation.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 1f97fbcbbce711b95f24365abd3cb909d43ab731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f97fbcbbce711b95f24365ab… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 8 14:38:54 2010 -0300 write: Add Spanish translation. --- programs/write/Es.rc | 32 ++++++++++++++++++++++++++++++++ programs/write/Makefile.in | 1 + 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/programs/write/Es.rc b/programs/write/Es.rc new file mode 100644 index 0000000..6e41bd0 --- /dev/null +++ b/programs/write/Es.rc @@ -0,0 +1,32 @@ +/* + * Spanish language support + * + * Copyright 2010 José Rostagno + * + * 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 "resources.h" + +/*UTF-8*/ +#pragma code_page(65001) + + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Fallo inicio Wordpad" +} diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index b89f338..5ac2c78 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ Da.rc \ De.rc \ En.rc \ + Es.rc \ Fr.rc \ It.rc \ Ja.rc \

1 0

Jose Rostagno : jscript: Add Spanish translation.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: bd992d3aebb5c86c6bf1e3ef965899b07e59fc74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd992d3aebb5c86c6bf1e3ef9… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 8 15:00:32 2010 -0300 jscript: Add Spanish translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Es.rc | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index d91c644..647412c 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -9,6 +9,7 @@ RC_SRCS = \ jscript_Da.rc \ jscript_De.rc \ jscript_En.rc \ + jscript_Es.rc \ jscript_Fr.rc \ jscript_It.rc \ jscript_Ko.rc \ diff --git a/dlls/jscript/jscript_Es.rc b/dlls/jscript/jscript_Es.rc new file mode 100644 index 0000000..4808109 --- /dev/null +++ b/dlls/jscript/jscript_Es.rc @@ -0,0 +1,50 @@ +/* + * Copyright 2010 José Rostagno + * + * 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 "resource.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Error al convertir objeto a tipo primitivo" + IDS_INVALID_CALL_ARG "Llamada a procedimiento no válido o argumento" + IDS_CREATE_OBJ_ERROR "Servidor de automatización no puede crear el objeto" + IDS_NO_PROPERTY "El objeto no acepta esta propiedad o método" + IDS_ARG_NOT_OPT "Argumento no opcional" + IDS_SYNTAX_ERROR "Error de sintaxis" + IDS_SEMICOLON "Esperado ';'" + IDS_LBRACKET "Esperado '('" + IDS_RBRACKET "Esperado ')'" + IDS_UNTERMINATED_STR "Constante de cadena no terminada" + IDS_NOT_FUNC "Función esperada" + IDS_NOT_DATE "'[objeto]' no es un objeto fecha" + IDS_NOT_NUM "Numero esperado" + IDS_OBJECT_EXPECTED "Objeto esperado" + IDS_ILLEGAL_ASSIGN "Asignación ilegal" + IDS_UNDEFINED "'|' no está definido" + IDS_NOT_BOOL "Objeto Booleano esperado" + IDS_JSCRIPT_EXPECTED "Objeto JScript esperado" + IDS_REGEXP_SYNTAX_ERROR "Error de sintaxis en la expresion regular" + IDS_URI_INVALID_CHAR "URI a codificar contiene caracteres no válidos" + IDS_INVALID_LENGTH "La longitud del arreglo debe ser un entero positivo finito" + IDS_ARRAY_EXPECTED "Objeto Arreglo esperado" +}

1 0

Mariusz Pluciński : gameux: Add declaration of IGameStatistics interface.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: f2ad630540c5c7029c339e7d93acc2bba0e08056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ad630540c5c7029c339e7d9… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sat May 29 20:17:26 2010 +0200 gameux: Add declaration of IGameStatistics interface. --- include/gameux.idl | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index 4700d75..b531fed 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -54,7 +54,59 @@ library gameuxLib HRESULT UpdateGame([in] GUID instanceID); - HRESULT VerifyAccess([in] BSTR sGDFBinaryPath, [out] BOOL* pHasAccess); + HRESULT VerifyAccess([in] BSTR sGDFBinaryPath, + [out] BOOL* pHasAccess); + }; + + [ + object, + uuid(3887C9CA-04A0-42ae-BC4C-5FA6C7721145) + ] + interface IGameStatistics : IUnknown + { + HRESULT GetMaxCategoryLength( + [retval, out] UINT* cch); + + HRESULT GetMaxNameLength( + [retval, out] UINT* cch); + + HRESULT GetMaxValueLength( + [retval, out] UINT* cch); + + HRESULT GetMaxCategories( + [retval, out] WORD* pMax); + + HRESULT GetMaxStatsPerCategory( + [retval, out] WORD* pMax); + + HRESULT SetCategoryTitle( + [in] WORD categoryIndex, + [string, in] LPCWSTR title); + + HRESULT GetCategoryTitle( + [in] WORD categoryIndex, + [retval, string, out] LPWSTR* pTitle); + + HRESULT GetStatistic( + [in] WORD categoryIndex, + [in] WORD statIndex, + [string, unique, out, in] LPWSTR* pName, + [string, unique, out, in] LPWSTR* pValue); + + HRESULT SetStatistic( + [in] WORD categoryIndex, + [in] WORD statIndex, + [string, in] LPCWSTR name, + [string, in] LPCWSTR value); + + HRESULT Save( + [in] BOOL trackChanges); + + HRESULT SetLastPlayedCategory( + [in] UINT categoryIndex); + + HRESULT GetLastPlayedCategory( + [retval, out] UINT* pCategoryIndex); }; [ @@ -64,4 +116,12 @@ library gameuxLib { [default] interface IGameExplorer; }; + + [ + uuid(DBC85A2C-C0DC-4961-B6E2-D28B62C11AD4) + ] + coclass GameStatistics + { + [default] interface IGameStatistics; + }; }

1 0

Andrew Eikum : regedit: Escape the value name portion during export.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 4a6ed21094214b96373c8efc9786b1ae8a65550b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6ed21094214b96373c8efc9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 7 16:07:48 2010 -0500 regedit: Escape the value name portion during export. --- programs/regedit/regproc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c46edc6..f210879 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1126,6 +1126,11 @@ static void export_hkey(FILE *file, HKEY key, if ((*val_name_buf)[0]) { const WCHAR val_start[] = {'"','%','s','"','=',0}; + line_len = 0; + REGPROC_export_string(line_buf, line_buf_size, &line_len, *val_name_buf, lstrlenW(*val_name_buf)); + REGPROC_resize_char_buffer(val_name_buf, val_name_size, lstrlenW(*line_buf) + 1); + lstrcpyW(*val_name_buf, *line_buf); + line_len = 3 + lstrlenW(*val_name_buf); REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); sprintfW(*line_buf, val_start, *val_name_buf);

1 0

Mariusz Pluciński : gameux: Add declaration of IGameStatisticsMgr interface.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 10a5414afe5513956f2f30adda0fa93c687a154c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a5414afe5513956f2f30add… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sat May 29 20:28:26 2010 +0200 gameux: Add declaration of IGameStatisticsMgr interface. --- include/gameux.idl | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index b531fed..07b9870 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -39,6 +39,18 @@ library gameuxLib GIS_ALL_USERS = 3 } GAME_INSTALL_SCOPE; + typedef enum + { + GAMESTATS_OPEN_OPENORCREATE = 0, + GAMESTATS_OPEN_OPENONLY = 1 + } GAMESTATS_OPEN_TYPE; + + typedef enum + { + GAMESTATS_OPEN_CREATED = 0, + GAMESTATS_OPEN_OPENED = 1 + } GAMESTATS_OPEN_RESULT; + [ object, uuid(E7B2FB72-D728-49B3-A5F2-18EBF5F1349E) @@ -110,6 +122,22 @@ library gameuxLib }; [ + object, + uuid(AFF3EA11-E70E-407d-95DD-35E612C41CE2) + ] + interface IGameStatisticsMgr : IUnknown + { + HRESULT GetGameStatistics( + [string, in] LPCWSTR GDFBinaryPath, + [in] GAMESTATS_OPEN_TYPE openType, + [out] GAMESTATS_OPEN_RESULT* pOpenResult, + [retval, out] IGameStatistics** ppiStats); + + HRESULT RemoveGameStatistics( + [string, in] LPCWSTR GDFBinaryPath); + }; + + [ uuid(9A5EA990-3034-4D6F-9128-01F3C61022BC) ] coclass GameExplorer

1 0