January 2010 - Wine-commits

Hans Leidekker : msi: Name and arguments in the service control table are formatted strings.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 7c9cb1e1be3d78aafadcce55864e071718f7a08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9cb1e1be3d78aafadcce558… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 28 11:05:34 2010 +0100 msi: Name and arguments in the service control table are formatted strings. --- dlls/msi/action.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3280e82..783acb4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4466,8 +4466,8 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) MSIPACKAGE *package = param; MSICOMPONENT *comp; SC_HANDLE scm, service = NULL; - LPCWSTR name, *vector = NULL; - LPWSTR args; + LPCWSTR *vector = NULL; + LPWSTR name, args; DWORD event, numargs; UINT r = ERROR_FUNCTION_FAILED; @@ -4475,9 +4475,9 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) return ERROR_SUCCESS; - name = MSI_RecordGetString(rec, 2); + deformat_string(package, MSI_RecordGetString(rec, 2), &name); + deformat_string(package, MSI_RecordGetString(rec, 4), &args); event = MSI_RecordGetInteger(rec, 3); - args = strdupW(MSI_RecordGetString(rec, 4)); if (!(event & msidbServiceControlEventStart)) return ERROR_SUCCESS; @@ -4510,6 +4510,7 @@ done: CloseServiceHandle(service); CloseServiceHandle(scm); + msi_free(name); msi_free(args); msi_free(vector); return r; @@ -4594,7 +4595,6 @@ static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); - args = strdupW(MSI_RecordGetString(rec, 4)); scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm)

1 0

Igor Paliychuk : hhctrl.ocx: Add Ukrainian translations.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 16ff05f8ab6aa827ee2ae1fe3b6a7b887c838d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ff05f8ab6aa827ee2ae1fe3… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 21:53:45 2010 +0200 hhctrl.ocx: Add Ukrainian translations. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/Uk.rc | 75 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index c4f9d49..7e3bf52 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ Si.rc \ Sv.rc \ Tr.rc \ + Uk.rc \ Zh.rc \ version.rc diff --git a/dlls/hhctrl.ocx/Uk.rc b/dlls/hhctrl.ocx/Uk.rc new file mode 100644 index 0000000..40d96b8 --- /dev/null +++ b/dlls/hhctrl.ocx/Uk.rc @@ -0,0 +1,75 @@ +/* + * HTML Help resources + * Ukrainian Language Support + * + * Copyright 2005 James Hawkins + * Copyright 2007 Artem Reznikov + * Copyright 2010 Igor Paliychuk + * + * 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_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Зміст" + IDS_INDEX "&Вказівник" + IDS_SEARCH "&Пошук" + IDS_FAVORITES "&Обране" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Показувати" + IDTB_CONTRACT "Приховати" + IDTB_STOP "Зупинити" + IDTB_REFRESH "Оновити" + IDTB_BACK "Назад" + IDTB_HOME "Додому" + IDTB_SYNC "Синхронізувати" + IDTB_PRINT "Друк" + IDTB_OPTIONS "Параметри" + IDTB_FORWARD "Вперед" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Налаштування" + IDTB_ZOOM "Збільшення" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END + +LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Зміст" + IDS_INDEX "&Вказівник" + IDS_SEARCH "&Пошук" + IDS_FAVORITES "&Обране" +END

1 0

Igor Paliychuk : mpr: Add Ukrainian translations.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: bfd9a31008a6e25ee89f0ee3976314b0e8754157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd9a31008a6e25ee89f0ee39… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:00:20 2010 +0200 mpr: Add Ukrainian translations. --- dlls/mpr/Makefile.in | 1 + dlls/mpr/mpr_Uk.rc | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index 98cd7e9..7150b54 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -37,6 +37,7 @@ RC_SRCS = \ mpr_Si.rc \ mpr_Sv.rc \ mpr_Tr.rc \ + mpr_Uk.rc \ mpr_Zh.rc \ version.rc diff --git a/dlls/mpr/mpr_Uk.rc b/dlls/mpr/mpr_Uk.rc new file mode 100644 index 0000000..67b781d --- /dev/null +++ b/dlls/mpr/mpr_Uk.rc @@ -0,0 +1,52 @@ +/* + * MPR dll Ukrainian resources + * + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2007 Artem Reznikov + * + * 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 "mprres.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Вся Мережа" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Введіть Мережний Пароль" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Будь ласка, введіть Ваші ім'я та пароль:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Проксі", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Користувач", -1, 40, 66, 50, 10 + LTEXT "Пароль", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Зберегти цей пароль (небезпечно)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Скасувати", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

Igor Paliychuk : msacm32: Add Ukrainian translations.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 1da6d263b51238aaa84a4d0de183c37da5d855b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da6d263b51238aaa84a4d0de… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:01:23 2010 +0200 msacm32: Add Ukrainian translations. --- dlls/msacm32/Makefile.in | 1 + dlls/msacm32/msacm_Uk.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index 78dfef8..fc1e44f 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -36,6 +36,7 @@ RC_SRCS = \ msacm_Si.rc \ msacm_Sv.rc \ msacm_Tr.rc \ + msacm_Uk.rc \ msacm_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/msacm32/msacm_Uk.rc b/dlls/msacm32/msacm_Uk.rc new file mode 100644 index 0000000..8a205f4 --- /dev/null +++ b/dlls/msacm32/msacm_Uk.rc @@ -0,0 +1,61 @@ +/* + * Ukraianian resource file for MS ACM + * + * Copyright 2007 Artem Reznikov + * + * 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 "wineacm.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sound Selection" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Ім'я:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "Зберегти &як...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Видалити", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Формат:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Властивості:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Довідка", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END

1 0

Alexandre Julliard : wineboot: Add a wrapper function for RegSetValueExW.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 4e2827aa3362f428f021037ca2d0e5e4f53a6f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2827aa3362f428f021037ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 13:08:59 2010 +0100 wineboot: Add a wrapper function for RegSetValueExW. --- programs/wineboot/wineboot.c | 50 ++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 28c88a5..e6c6e08 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -158,6 +158,12 @@ done: return ret; } +/* wrapper for RegSetValueExW */ +static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value ) +{ + return RegSetValueExW( hkey, name, 0, REG_SZ, (BYTE *)value, (strlenW(value) + 1) * sizeof(WCHAR) ); +} + /* create the volatile hardware registry keys */ static void create_hardware_registry_keys(void) { @@ -192,7 +198,7 @@ static void create_hardware_registry_keys(void) KEY_ALL_ACCESS, NULL, &system_key, NULL )) return; - RegSetValueExW( system_key, IdentifierW, 0, REG_SZ, (const BYTE *)SysidW, sizeof(SysidW) ); + set_reg_value( system_key, IdentifierW, SysidW ); if (RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) @@ -209,19 +215,16 @@ static void create_hardware_registry_keys(void) if (!RegCreateKeyExW( cpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { - RegSetValueExW( hkey, IdentifierW, 0, REG_SZ, - (const BYTE *)idW, (strlenW(idW) + 1) * sizeof(WCHAR) ); + set_reg_value( hkey, IdentifierW, idW ); /*TODO; report amd's properly*/ - RegSetValueExW( hkey, VendorIdentifierW, 0, REG_SZ, - (const BYTE *)VenidIntelW, sizeof(VenidIntelW) ); + set_reg_value( hkey, VendorIdentifierW, VenidIntelW ); RegSetValueExW( hkey, mhzKeyW, 0, REG_DWORD, (BYTE *)&power_info.MaxMhz, sizeof(DWORD) ); RegCloseKey( hkey ); } if (!RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { - RegSetValueExW( hkey, IdentifierW, 0, REG_SZ, - (const BYTE *)idW, (strlenW(idW) + 1) * sizeof(WCHAR) ); + set_reg_value( hkey, IdentifierW, idW ); RegCloseKey( hkey ); } } @@ -258,21 +261,21 @@ static void create_environment_registry_keys( void ) if (RegCreateKeyW( HKEY_LOCAL_MACHINE, EnvironW, &env_key )) return; sprintfW( buffer, PercentDW, NtCurrentTeb()->Peb->NumberOfProcessors ); - RegSetValueExW( env_key, NumProcW, 0, REG_SZ, (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + set_reg_value( env_key, NumProcW, buffer ); /* TODO: currently hardcoded x86, add different processors */ - RegSetValueExW( env_key, ProcArchW, 0, REG_SZ, (const BYTE *)x86W, sizeof(x86W) ); + set_reg_value( env_key, ProcArchW, x86W ); /* TODO: currently hardcoded Intel, add different processors */ sprintfW( buffer, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); - RegSetValueExW( env_key, ProcIdW, 0, REG_SZ, (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + set_reg_value( env_key, ProcIdW, buffer ); sprintfW( buffer, PercentDW, sci.Level ); - RegSetValueExW( env_key, ProcLvlW, 0, REG_SZ, (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + set_reg_value( env_key, ProcLvlW, buffer ); /* Properly report model/stepping */ sprintfW( buffer, Percent04XW, sci.Revision ); - RegSetValueExW( env_key, ProcRevW, 0, REG_SZ, (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + set_reg_value( env_key, ProcRevW, buffer ); RegCloseKey( env_key ); } @@ -291,7 +294,7 @@ static void create_volatile_environment_registry_key(void) static const WCHAR ConsoleW[] = {'C','o','n','s','o','l','e',0}; static const WCHAR EmptyW[] = {0}; WCHAR path[MAX_PATH]; - WCHAR computername[MAX_COMPUTERNAME_LENGTH + 1 + 2] = {'\\','\\'}; + WCHAR computername[MAX_COMPUTERNAME_LENGTH + 1 + 2]; DWORD size = MAX_COMPUTERNAME_LENGTH + 1; HKEY hkey; HRESULT hr; @@ -301,32 +304,33 @@ static void create_volatile_environment_registry_key(void) return; hr = SHGetFolderPathW( NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path ); - if (SUCCEEDED(hr)) - RegSetValueExW( hkey, AppDataW, 0, REG_SZ, (const BYTE *)path, (strlenW(path) + 1) * sizeof(WCHAR) ); + if (SUCCEEDED(hr)) set_reg_value( hkey, AppDataW, path ); - RegSetValueExW( hkey, ClientNameW, 0, REG_SZ, (const BYTE *)ConsoleW, sizeof(ConsoleW) ); + set_reg_value( hkey, ClientNameW, ConsoleW ); /* Write the profile path's drive letter and directory components into * HOMEDRIVE and HOMEPATH respectively. */ hr = SHGetFolderPathW( NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, path ); if (SUCCEEDED(hr)) { - RegSetValueExW( hkey, HomePathW, 0, REG_SZ, (const BYTE *)&path[2], (strlenW(path) + 1 - 2) * sizeof(WCHAR) ); + set_reg_value( hkey, HomePathW, path + 2 ); path[2] = '\0'; - RegSetValueExW( hkey, HomeDriveW, 0, REG_SZ, (const BYTE *)path, 3 * sizeof(WCHAR) ); + set_reg_value( hkey, HomeDriveW, path ); } - RegSetValueExW( hkey, HomeShareW, 0, REG_SZ, (const BYTE *)EmptyW, sizeof(EmptyW) ); + set_reg_value( hkey, HomeShareW, EmptyW ); hr = SHGetFolderPathW( NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path ); if (SUCCEEDED(hr)) - RegSetValueExW( hkey, LocalAppDataW, 0, REG_SZ, (const BYTE *)path, (strlenW(path) + 1) * sizeof(WCHAR) ); + set_reg_value( hkey, LocalAppDataW, path ); if (GetComputerNameW(&computername[2], &size)) - RegSetValueExW( hkey, LogonServerW, 0, REG_SZ, (const BYTE *)computername, (size + 1 + 2) * sizeof(WCHAR) ); - - RegSetValueExW( hkey, SessionNameW, 0, REG_SZ, (const BYTE *)ConsoleW, sizeof(ConsoleW) ); + { + computername[0] = computername[1] = '\\'; + set_reg_value( hkey, LogonServerW, computername ); + } + set_reg_value( hkey, SessionNameW, ConsoleW ); RegCloseKey( hkey ); }

1 0

Alexandre Julliard : wineboot: Set the USERNAME and USERPROFILE variables in the volatile environment.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: fd0efd92e077a8098a22f6b0130c36eb9d5347c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0efd92e077a8098a22f6b01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 13:01:00 2010 +0100 wineboot: Set the USERNAME and USERPROFILE variables in the volatile environment. --- programs/wineboot/wineboot.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index e6c6e08..7c4b14b 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -291,11 +291,13 @@ static void create_volatile_environment_registry_key(void) static const WCHAR LocalAppDataW[] = {'L','O','C','A','L','A','P','P','D','A','T','A',0}; static const WCHAR LogonServerW[] = {'L','O','G','O','N','S','E','R','V','E','R',0}; static const WCHAR SessionNameW[] = {'S','E','S','S','I','O','N','N','A','M','E',0}; + static const WCHAR UserNameW[] = {'U','S','E','R','N','A','M','E',0}; + static const WCHAR UserProfileW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; static const WCHAR ConsoleW[] = {'C','o','n','s','o','l','e',0}; static const WCHAR EmptyW[] = {0}; WCHAR path[MAX_PATH]; WCHAR computername[MAX_COMPUTERNAME_LENGTH + 1 + 2]; - DWORD size = MAX_COMPUTERNAME_LENGTH + 1; + DWORD size; HKEY hkey; HRESULT hr; @@ -313,17 +315,22 @@ static void create_volatile_environment_registry_key(void) hr = SHGetFolderPathW( NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, path ); if (SUCCEEDED(hr)) { + set_reg_value( hkey, UserProfileW, path ); set_reg_value( hkey, HomePathW, path + 2 ); path[2] = '\0'; set_reg_value( hkey, HomeDriveW, path ); } + size = sizeof(path); + if (GetUserNameW( path, &size )) set_reg_value( hkey, UserNameW, path ); + set_reg_value( hkey, HomeShareW, EmptyW ); hr = SHGetFolderPathW( NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path ); if (SUCCEEDED(hr)) set_reg_value( hkey, LocalAppDataW, path ); + size = sizeof(computername) - 2; if (GetComputerNameW(&computername[2], &size)) { computername[0] = computername[1] = '\\';

1 0

Alexandre Julliard : kernel32: Treat PWD as a special environment variable.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 2c0e31cfdcb2325c0d11ce07ecdb81fa0724b8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0e31cfdcb2325c0d11ce07e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 12:22:24 2010 +0100 kernel32: Treat PWD as a special environment variable. --- dlls/kernel32/process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 92d645c..0c60ce5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -119,6 +119,7 @@ static inline int contains_path( LPCWSTR name ) static inline int is_special_env_var( const char *var ) { return (!strncmp( var, "PATH=", sizeof("PATH=")-1 ) || + !strncmp( var, "PWD=", sizeof("PWD=")-1 ) || !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) || !strncmp( var, "TMP=", sizeof("TMP=")-1 ));

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_GetMessageFromFile .
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 568b0025c7c2fc4e7b9af8bd4cbd756af8d8e1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=568b0025c7c2fc4e7b9af8bd4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:35:07 2010 -0800 wintrust: Return error directly from SOFTPUB_GetMessageFromFile. --- dlls/wintrust/softpub.c | 44 +++++++++++++++++++------------------------- 1 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index a6edfe2..680afcd 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -146,9 +146,10 @@ static DWORD SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) /* Assumes data->u.pPDSip has been loaded, and data->u.pPDSip->pSip allocated. * Calls data->u.pPDSip->pSip->pfGet to construct data->hMsg. */ -static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, +static DWORD SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, LPCWSTR filePath) { + DWORD err = ERROR_SUCCESS; BOOL ret; LPBYTE buf = NULL; DWORD size = 0; @@ -156,10 +157,7 @@ static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, data->u.pPDSip->psSipSubjectInfo = data->psPfns->pfnAlloc(sizeof(SIP_SUBJECTINFO)); if (!data->u.pPDSip->psSipSubjectInfo) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } + return ERROR_OUTOFMEMORY; data->u.pPDSip->psSipSubjectInfo->cbSize = sizeof(SIP_SUBJECTINFO); data->u.pPDSip->psSipSubjectInfo->pgSubjectType = &data->u.pPDSip->gSubject; @@ -169,17 +167,11 @@ static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, ret = data->u.pPDSip->pSip->pfGet(data->u.pPDSip->psSipSubjectInfo, &data->dwEncoding, 0, &size, 0); if (!ret) - { - SetLastError(TRUST_E_NOSIGNATURE); - return FALSE; - } + return TRUST_E_NOSIGNATURE; buf = data->psPfns->pfnAlloc(size); if (!buf) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } + return ERROR_OUTOFMEMORY; ret = data->u.pPDSip->pSip->pfGet(data->u.pPDSip->psSipSubjectInfo, &data->dwEncoding, 0, &size, buf); @@ -188,12 +180,18 @@ static BOOL SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, data->hMsg = CryptMsgOpenToDecode(data->dwEncoding, 0, 0, data->hProv, NULL, NULL); if (data->hMsg) + { ret = CryptMsgUpdate(data->hMsg, buf, size, TRUE); + if (!ret) + err = GetLastError(); + } } + else + err = GetLastError(); data->psPfns->pfnFree(buf); - TRACE("returning %d\n", ret); - return ret; + TRACE("returning %d\n", err); + return err; } static BOOL SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) @@ -339,12 +337,10 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_GetSIP(data); if (err) goto error; - if (!SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, - data->pWintrustData->u.pFile->pcwszFilePath)) - { - err = GetLastError(); + err = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, + data->pWintrustData->u.pFile->pcwszFilePath); + if (err) goto error; - } if (!SOFTPUB_CreateStoreFromMessage(data)) { err = GetLastError(); @@ -381,12 +377,10 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_GetSIP(data); if (err) goto error; - if (!SOFTPUB_GetMessageFromFile(data, catalog, - data->pWintrustData->u.pCatalog->pcwszCatalogFilePath)) - { - err = GetLastError(); + err = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, + data->pWintrustData->u.pFile->pcwszFilePath); + if (err) goto error; - } if (!SOFTPUB_CreateStoreFromMessage(data)) { err = GetLastError();

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_CreateStoreFromMessage.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 8085ea5fe07afa67a16cfb76af45fbf70d7c5078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8085ea5fe07afa67a16cfb76a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:37:59 2010 -0800 wintrust: Return error directly from SOFTPUB_CreateStoreFromMessage. --- dlls/wintrust/softpub.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 680afcd..a9f8f29 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -194,20 +194,23 @@ static DWORD SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, return err; } -static BOOL SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret = FALSE; + DWORD err = ERROR_SUCCESS; HCERTSTORE store; store = CertOpenStore(CERT_STORE_PROV_MSG, data->dwEncoding, data->hProv, CERT_STORE_NO_CRYPT_RELEASE_FLAG, data->hMsg); if (store) { - ret = data->psPfns->pfnAddStore2Chain(data, store); + if (!data->psPfns->pfnAddStore2Chain(data, store)) + err = GetLastError(); CertCloseStore(store, 0); } - TRACE("returning %d\n", ret); - return ret; + else + err = GetLastError(); + TRACE("returning %d\n", err); + return err; } static DWORD SOFTPUB_DecodeInnerContent(CRYPT_PROVIDER_DATA *data) @@ -341,11 +344,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) data->pWintrustData->u.pFile->pcwszFilePath); if (err) goto error; - if (!SOFTPUB_CreateStoreFromMessage(data)) - { - err = GetLastError(); + err = SOFTPUB_CreateStoreFromMessage(data); + if (err) goto error; - } if (!SOFTPUB_DecodeInnerContent(data)) err = GetLastError(); error: @@ -381,11 +382,9 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) data->pWintrustData->u.pFile->pcwszFilePath); if (err) goto error; - if (!SOFTPUB_CreateStoreFromMessage(data)) - { - err = GetLastError(); + err = SOFTPUB_CreateStoreFromMessage(data); + if (err) goto error; - } if (!SOFTPUB_DecodeInnerContent(data)) err = GetLastError(); /* FIXME: this loads the catalog file, but doesn't validate the member. */

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_DecodeInnerContent .
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 6099adf79a639a9652d38424c9f4fa1c235c0b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6099adf79a639a9652d38424c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:40:32 2010 -0800 wintrust: Return error directly from SOFTPUB_DecodeInnerContent. --- dlls/wintrust/softpub.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index a9f8f29..2524df3 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -216,56 +216,70 @@ static DWORD SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) static DWORD SOFTPUB_DecodeInnerContent(CRYPT_PROVIDER_DATA *data) { BOOL ret; - DWORD size; + DWORD size, err = ERROR_SUCCESS; LPSTR oid = NULL; LPBYTE buf = NULL; ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, NULL, &size); if (!ret) + { + err = GetLastError(); goto error; + } oid = data->psPfns->pfnAlloc(size); if (!oid) { - SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; + err = ERROR_OUTOFMEMORY; goto error; } ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, oid, &size); if (!ret) + { + err = GetLastError(); goto error; + } ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, NULL, &size); if (!ret) + { + err = GetLastError(); goto error; + } buf = data->psPfns->pfnAlloc(size); if (!buf) { - SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; + err = ERROR_OUTOFMEMORY; goto error; } ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, buf, &size); if (!ret) + { + err = GetLastError(); goto error; + } ret = CryptDecodeObject(data->dwEncoding, oid, buf, size, 0, NULL, &size); if (!ret) + { + err = GetLastError(); goto error; + } data->u.pPDSip->psIndirectData = data->psPfns->pfnAlloc(size); if (!data->u.pPDSip->psIndirectData) { - SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; + err = ERROR_OUTOFMEMORY; goto error; } ret = CryptDecodeObject(data->dwEncoding, oid, buf, size, 0, data->u.pPDSip->psIndirectData, &size); + if (!ret) + err = GetLastError(); error: - TRACE("returning %d\n", ret); + TRACE("returning %d\n", err); data->psPfns->pfnFree(oid); data->psPfns->pfnFree(buf); - return ret; + return err; } static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) @@ -347,8 +361,8 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_CreateStoreFromMessage(data); if (err) goto error; - if (!SOFTPUB_DecodeInnerContent(data)) - err = GetLastError(); + err = SOFTPUB_DecodeInnerContent(data); + error: return err; } @@ -385,8 +399,7 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_CreateStoreFromMessage(data); if (err) goto error; - if (!SOFTPUB_DecodeInnerContent(data)) - err = GetLastError(); + err = SOFTPUB_DecodeInnerContent(data); /* FIXME: this loads the catalog file, but doesn't validate the member. */ error: CloseHandle(catalog);

1 0