October 2010 - Wine-Commits

Yaron Shahrabani : msvfw32: Added Hebrew translation.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: 27c5a8e15cd9b622ac8460bab66b3e568d1c2f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c5a8e15cd9b622ac8460bab… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Oct 26 13:41:37 2010 +0200 msvfw32: Added Hebrew translation. --- dlls/msvfw32/Makefile.in | 1 + dlls/msvfw32/msvfw32_He.rc | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 43f7c5d..65b406b 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ msvfw32_En.rc \ msvfw32_Es.rc \ msvfw32_Fr.rc \ + msvfw32_He.rc \ msvfw32_Hu.rc \ msvfw32_It.rc \ msvfw32_Ko.rc \ diff --git a/dlls/msvfw32/msvfw32_He.rc b/dlls/msvfw32/msvfw32_He.rc new file mode 100644 index 0000000..f7f6745 --- /dev/null +++ b/dlls/msvfw32/msvfw32_He.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Yaron Shahrabani <sh.yaron(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 "msvideo_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "דחיסת וידאו" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "אישור",IDOK,129,2,49,14 + PUSHBUTTON "ביטול",IDCANCEL,129,18,49,14 + + LTEXT "&מדחס:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "ה&גדרה...",882,129,36,49,14 + PUSHBUTTON "על &אודות...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&איכות הדחיסה:",886,9,34,80,8 + + CONTROL "&שקופית מפתח בכול",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "שקופיות",889,103,62,26,10 + + CONTROL "קצב ה&נתונים",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "ק״ב/שנייה",896,102,78,26,10 +} + +STRINGTABLE +{ + IDS_FULLFRAMES "כל השקופיות (ללא דחיסה)" +}

1 0

André Hentschel : include: Define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: 6798bc2c8e84d3647a8083e645308ccc291fac49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6798bc2c8e84d3647a8083e64… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 26 21:50:31 2010 +0200 include: Define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index a56e4ad..3c38acc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -524,6 +524,7 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_ALPHA64 7 #define PROCESSOR_ARCHITECTURE_MSIL 8 #define PROCESSOR_ARCHITECTURE_AMD64 9 +#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* Wine extension */

1 0

Carl Raffaele : comdlg32: Removed 16 bit dependency.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: 2484b731510be165c12416c4ecea53d9febe169c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2484b731510be165c12416c4e… Author: Carl Raffaele <cjraffae(a)mtu.edu> Date: Mon Oct 25 20:54:35 2010 -0400 comdlg32: Removed 16 bit dependency. --- dlls/comdlg32/cdlg.h | 1 - dlls/comdlg32/fontdlg.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index b56c167..686baea 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -22,7 +22,6 @@ #define _WINE_DLL_CDLG_H #include "dlgs.h" -#include "wownt32.h" /* Common dialogs implementation globals */ #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 83400fc..321bfc6 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -754,7 +754,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) { j=SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,j,0); SendMessageW(hDlg,WM_COMMAND,cmb2, - MAKELONG(HWND_16(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE)); + MAKELONG(LOWORD(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE)); } } CFn_ReleaseDC(lpcf, hdc);

1 0

André Hentschel : bugzilla: Fix title for Quicksearch inclusion.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: bugzilla Branch: master Commit: 16c94f7ec29fb644715b3d9d787f12a148f40235 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=16c94f7ec29fb644715b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 24 16:41:50 2010 +0200 bugzilla: Fix title for Quicksearch inclusion. --- template/en/default/global/header.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 12b3237..52cae30 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -229,7 +229,7 @@ [%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %] <link rel="search" type="application/opensearchdescription+xml" - title="[% terms.Bugzilla %]" href="./search_plugin.cgi"> + title="WineHQ Bugzilla" href="./search_plugin.cgi"> <link rel="stylesheet" href="styles.css" type="text/css" media="screen"> <script language="JavaScript" src="jquery.js" type="text/javascript"></script> <script language="JavaScript" src="utils.js" type="text/javascript"></script>

1 0

Detlef Riekenberg : wer/tests: Add initial tests.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: d8a5bc929d01ab6fafeba3ff80e6bceb061e8b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a5bc929d01ab6fafeba3ff8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 26 11:37:17 2010 +0200 wer/tests: Add initial tests. --- configure | 3 +- configure.ac | 3 +- dlls/wer/Makefile.in | 1 + dlls/wer/tests/Makefile.in | 7 +++ dlls/wer/tests/main.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ include/werapi.h | 2 + 6 files changed, 124 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dcb9203..32efe7f 100755 --- a/configure +++ b/configure @@ -14988,7 +14988,8 @@ wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox -wine_fn_config_dll wer enable_wer +wine_fn_config_dll wer enable_wer wer +wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wiaservc enable_wiaservc wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 8bae871..7b6818b 100644 --- a/configure.ac +++ b/configure.ac @@ -2734,7 +2734,8 @@ WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) -WINE_CONFIG_DLL(wer) +WINE_CONFIG_DLL(wer,,[wer]) +WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wiaservc) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in index 772182f..e90dcc0 100644 --- a/dlls/wer/Makefile.in +++ b/dlls/wer/Makefile.in @@ -1,4 +1,5 @@ MODULE = wer.dll +IMPORTLIB = wer C_SRCS = \ main.c diff --git a/dlls/wer/tests/Makefile.in b/dlls/wer/tests/Makefile.in new file mode 100644 index 0000000..07ed264 --- /dev/null +++ b/dlls/wer/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = wer.dll +IMPORTS = wer + +C_SRCS = \ + main.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c new file mode 100644 index 0000000..183974f --- /dev/null +++ b/dlls/wer/tests/main.c @@ -0,0 +1,110 @@ +/* + * Unit test suite for windows error reporting in Vista and above + * + * Copyright 2010 Detlef Riekenberg + * + * 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 <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" + +#include "werapi.h" +#include "wine/test.h" + +static const WCHAR empty[] = {0}; +static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; + +/* ###### */ + +static void test_WerAddExcludedApplication(void) +{ + HRESULT hr; + + /* clean state */ + hr = WerRemoveExcludedApplication(winetest_wer, FALSE); + if (hr == E_NOTIMPL) { + skip("Wer*ExcludedApplication not implemented\n"); + return; + } + ok((hr == S_OK) || (hr == E_FAIL) || __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND), + "got 0x%x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); + + hr = WerAddExcludedApplication(NULL, FALSE); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + hr = WerAddExcludedApplication(empty, FALSE); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + hr = WerAddExcludedApplication(winetest_wer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + /* app already in the list */ + hr = WerAddExcludedApplication(winetest_wer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + + /* cleanup */ + hr = WerRemoveExcludedApplication(winetest_wer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); +} + +/* #### */ + +static void test_WerRemoveExcludedApplication(void) +{ + HRESULT hr; + + /* clean state */ + hr = WerRemoveExcludedApplication(winetest_wer, FALSE); + if (hr == E_NOTIMPL) { + skip("Wer*ExcludedApplication not implemented\n"); + return; + } + + ok((hr == S_OK) || (hr == E_FAIL) || __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND), + "got 0x%x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); + + hr = WerAddExcludedApplication(winetest_wer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + hr = WerRemoveExcludedApplication(NULL, FALSE); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + hr = WerRemoveExcludedApplication(empty, FALSE); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + hr = WerRemoveExcludedApplication(winetest_wer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* app not in the list */ + hr = WerRemoveExcludedApplication(winetest_wer, FALSE); + ok((hr == E_FAIL) || __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND), + "got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); + +} + +/* ########################### */ + +START_TEST(main) +{ + test_WerAddExcludedApplication(); + test_WerRemoveExcludedApplication(); +} diff --git a/include/werapi.h b/include/werapi.h index 7ac03f3..54616db 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -32,7 +32,9 @@ typedef enum _WER_REGISTER_FILE_TYPE WerRegFileTypeMax } WER_REGISTER_FILE_TYPE; +HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); +HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); #ifdef __cplusplus }

1 0

Detlef Riekenberg : wer: Add a stub for WerRemoveExcludedApplication.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: ac194c387316a0fcf46fee7896d276cae3a2d677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac194c387316a0fcf46fee789… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 26 11:37:16 2010 +0200 wer: Add a stub for WerRemoveExcludedApplication. --- dlls/wer/main.c | 20 ++++++++++++++++++++ dlls/wer/wer.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 740462f..a283bae 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -49,3 +49,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * WerRemoveExcludedApplication (wer.@) + * + * remove an application from the exclusion list + * + * PARAMS + * exeName [i] The application name + * allUsers [i] for all users (TRUE) or for the current user (FALSE) + * + * RESULTS + * SUCCESS S_OK + * FAILURE A HRESULT error code + * + */ +HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) +{ + FIXME("(%s, %d) :stub\n",debugstr_w(exeName), allUsers); + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index d240a90..b50eb47 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -62,7 +62,7 @@ @ stub WerpSubmitReportFromStore @ stub WerpSvcReportFromMachineQueue @ stdcall WerAddExcludedApplication(wstr long) -@ stub WerRemoveExcludedApplication +@ stdcall WerRemoveExcludedApplication(wstr long) @ stub WerReportAddDump @ stub WerReportAddFile @ stub WerReportCloseHandle

1 0

David Hedberg : shlwapi: Fix UrlGetPart to also return unknown schemes.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 6b897513ff66e152cf5f9202877c81796046aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b897513ff66e152cf5f92028… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Oct 26 13:07:59 2010 +0200 shlwapi: Fix UrlGetPart to also return unknown schemes. --- dlls/shlwapi/tests/url.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/url.c | 6 ++++- 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index febe23d..21e2f80 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -620,6 +620,9 @@ static void test_UrlGetPart(void) const char* http_url = "http://user:pass 123(a)www.wine hq.org"; const char* res_url = "res://some.dll/find.dlg"; const char* about_url = "about:blank"; + const char* excid_url = "x-excid://36C00000/guid:{048B4E89-2E92-496F-A837-33BA02FF6D32}/Message.htm"; + const char* foo_url = "foo://bar-url/test"; + const char* short_url = "ascheme:"; CHAR szPart[INTERNET_MAX_URL_LENGTH]; DWORD dwSize; @@ -656,6 +659,20 @@ static void test_UrlGetPart(void) ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); + if(pUrlGetPartW) + { + const WCHAR hiW[] = {'h','i',0}; + WCHAR bufW[5]; + + /* UrlGetPartW returns S_OK instead of S_FALSE */ + dwSize = sizeof szPart; + bufW[0]='x'; bufW[1]=0; + res = pUrlGetPartW(hiW, bufW, &dwSize, URL_PART_SCHEME, 0); + todo_wine ok(res==S_OK, "UrlGetPartW(\"hi\") returned %08X\n", res); + ok(bufW[0] == 0, "UrlGetPartW(\"hi\") return \"%c\"\n", bufW[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); + } + dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); @@ -677,6 +694,10 @@ static void test_UrlGetPart(void) test_url_part(about_url, URL_PART_SCHEME, 0, "about"); + test_url_part(excid_url, URL_PART_SCHEME, 0, "x-excid"); + test_url_part(foo_url, URL_PART_SCHEME, 0, "foo"); + test_url_part(short_url, URL_PART_SCHEME, 0, "ascheme"); + dwSize = sizeof(szPart); res = pUrlGetPartA(about_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); @@ -707,6 +728,34 @@ static void test_UrlGetPart(void) szPart[0] = 'x'; szPart[1] = '\0'; res = pUrlGetPartA("index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==E_FAIL, "returned %08x\n", res); + ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); + ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_QUERY, 0); + ok(res==S_FALSE, "returned %08x\n", res); + ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==E_FAIL, "returned %08x\n", res); + ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); + ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_QUERY, 0); + ok(res==S_FALSE, "returned %08x\n", res); + ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 04e80f9..adfbb09 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1967,6 +1967,10 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) else cont = FALSE; } + + if(*start != ':') + *size = 0; + break; case USERPASS: @@ -2190,7 +2194,7 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, switch (dwPart) { case URL_PART_SCHEME: - if (!pl.szScheme || scheme == URL_SCHEME_UNKNOWN) { + if (!pl.szScheme) { *pcchOut = 0; return S_FALSE; }

1 0

Hans Leidekker : msi: Open the log file once per package.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: f3e7ed44f18ea66571d2ae2897bba821e85c3851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e7ed44f18ea66571d2ae289… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 26 12:42:34 2010 +0200 msi: Open the log file once per package. --- dlls/msi/msi.c | 12 +++++++----- dlls/msi/msi_main.c | 3 ++- dlls/msi/msipriv.h | 3 ++- dlls/msi/package.c | 32 ++++++++++++++------------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 11d1174..85bdc96 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1766,24 +1766,26 @@ UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes) UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes) { - HANDLE file = INVALID_HANDLE_VALUE; - TRACE("%08x %s %08x\n", dwLogMode, debugstr_w(szLogFile), attributes); + msi_free(gszLogFile); + gszLogFile = NULL; if (szLogFile) { - lstrcpyW(gszLogFile,szLogFile); + HANDLE file; + if (!(attributes & INSTALLLOGATTRIBUTES_APPEND)) DeleteFileW(szLogFile); file = CreateFileW(szLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) + { + gszLogFile = strdupW(szLogFile); CloseHandle(file); + } else ERR("Unable to enable log %s (%u)\n", debugstr_w(szLogFile), GetLastError()); } - else - gszLogFile[0] = '\0'; return ERROR_SUCCESS; } diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index df29184..27df1a5 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -44,7 +44,7 @@ INSTALLUI_HANDLERW gUIHandlerW = NULL; INSTALLUI_HANDLER_RECORD gUIHandlerRecord = NULL; DWORD gUIFilter = 0; LPVOID gUIContext = NULL; -WCHAR gszLogFile[MAX_PATH]; +WCHAR *gszLogFile = NULL; HINSTANCE msi_hInstance; static WCHAR msi_path[MAX_PATH]; @@ -78,6 +78,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) if (msi_typelib) ITypeLib_Release( msi_typelib ); msi_dialog_unregister_class(); msi_free_handle_table(); + msi_free( gszLogFile ); break; } return TRUE; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 30910de..4d9fea7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -331,6 +331,7 @@ typedef struct tagMSIPACKAGE struct list folders; LPWSTR ActionFormat; LPWSTR LastAction; + HANDLE log_file; struct list classes; struct list extensions; @@ -879,7 +880,7 @@ extern INSTALLUI_HANDLERW gUIHandlerW; extern INSTALLUI_HANDLER_RECORD gUIHandlerRecord; extern DWORD gUIFilter; extern LPVOID gUIContext; -extern WCHAR gszLogFile[MAX_PATH]; +extern WCHAR *gszLogFile; extern HINSTANCE msi_hInstance; /* action related functions */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8fcf6ff..f3f5071 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -295,6 +295,7 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) msiobj_release( &package->db->hdr ); free_package_structures(package); + CloseHandle( package->log_file ); } static UINT create_temp_property_table(MSIPACKAGE *package) @@ -1121,6 +1122,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) if (package->WordCount & msidbSumInfoSourceTypeAdminImage) msi_load_admin_properties( package ); + + package->log_file = INVALID_HANDLE_VALUE; } return package; @@ -1551,6 +1554,10 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) msi_adjust_privilege_properties( package ); } + if (gszLogFile) + package->log_file = CreateFileW( gszLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + *pPackage = package; return ERROR_SUCCESS; } @@ -1657,17 +1664,13 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, {'S','e','t','P','r','o','g','r','e','s','s',0}; static const WCHAR szActionText[] = {'A','c','t','i','o','n','T','e','x','t',0}; - DWORD log_type = 0; LPWSTR message; - DWORD sz; - DWORD total_size = 0; - INT i; - INT rc; + DWORD sz, total_size = 0, log_type = 0; + INT i, rc = 0; char *msg; int len; TRACE("%x\n", eMessageType); - rc = 0; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ERROR) log_type |= INSTALLLOGMODE_ERROR; @@ -1773,19 +1776,12 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MsiCloseHandle( rec ); } - if (!rc && gszLogFile[0] && (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) + if (!rc && package->log_file != INVALID_HANDLE_VALUE && + (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) { - DWORD write; - HANDLE log_file = CreateFileW(gszLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - - if (log_file != INVALID_HANDLE_VALUE) - { - SetFilePointer(log_file,0, NULL, FILE_END); - WriteFile(log_file,msg,strlen(msg),&write,NULL); - WriteFile(log_file,"\n",1,&write,NULL); - CloseHandle(log_file); - } + DWORD written; + WriteFile( package->log_file, msg, len - 1, &written, NULL ); + WriteFile( package->log_file, "\n", 1, &written, NULL ); } msi_free( msg ); msi_free( message );

1 0

Paul Vriens : credui: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 99815c3afae24442d4dc7a27533faaffc6414fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99815c3afae24442d4dc7a275… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 26 13:29:05 2010 +0200 credui: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/credui/Makefile.in | 1 + dlls/credui/credui_Sr.rc | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index b43e147..09bfacb 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ credui_Ro.rc \ credui_Ru.rc \ credui_Si.rc \ + credui_Sr.rc \ credui_Sv.rc \ credui_Uk.rc \ credui_Zh.rc diff --git a/dlls/credui/credui_Sr.rc b/dlls/credui/credui_Sr.rc new file mode 100644 index 0000000..6b579ab --- /dev/null +++ b/dlls/credui/credui_Sr.rc @@ -0,0 +1,86 @@ +/* + * Serbian language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2010 Đorđe Vasiljević + * + * 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 "credui_resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_CREDDIALOG DIALOG 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Корисничко име:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Лозинка:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Запамти лозинку",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "У реду",IDOK,97,128,50,14 + PUSHBUTTON "Откажи",IDCANCEL,156,128,50,14 +END + +STRINGTABLE +{ + IDS_TITLEFORMAT "Повежи се са %s" + IDS_MESSAGEFORMAT "Повезивање на %s" + IDS_INCORRECTPASSWORDTITLE "Пријављивање није успело" + IDS_INCORRECTPASSWORD "Проверите да ли су подаци\nкоје сте унели исправни." + IDS_CAPSLOCKONTITLE "Caps Lock је укључен" + IDS_CAPSLOCKON "Caps Lock може бити разлог неисправности унетих података.\n\nПритисните тастер Caps Lock на тастатури да бисте искључили велика слова пре\nуношења лозинке." +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_CREDDIALOG DIALOG 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Korisničko ime:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Lozinka:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Zapamti lozinku",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "U redu",IDOK,97,128,50,14 + PUSHBUTTON "Otkaži",IDCANCEL,156,128,50,14 +END + +STRINGTABLE +{ + IDS_TITLEFORMAT "Poveži se sa %s" + IDS_MESSAGEFORMAT "Povezivanje na %s" + IDS_INCORRECTPASSWORDTITLE "Prijavljivanje nije uspelo" + IDS_INCORRECTPASSWORD "Proverite da li su podaci\nkoje ste uneli ispravni." + IDS_CAPSLOCKONTITLE "Caps Lock je uključen" + IDS_CAPSLOCKON "Caps Lock može biti razlog neispravnosti unetih podataka.\n\nPritisnite taster Caps Lock na tastaturi da biste isključili velika slova pre\nunošenja lozinke." +}

1 0

Sven Baars : jscript: Update the Dutch translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: e30ad6b9114a74b177671c224f5409f161d68255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30ad6b9114a74b177671c224… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Oct 26 14:15:28 2010 +0200 jscript: Update the Dutch translation. --- dlls/jscript/jscript_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index 0e5798b..3311ba4 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -26,6 +26,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Fout bij het omzetten van het object naar een primitief type" IDS_INVALID_CALL_ARG "Ongeldige procedure-aanroep of argument" + IDS_SUBSCRIPT_OUT_OF_RANGE "Index buiten bereik" IDS_CREATE_OBJ_ERROR "Automatiseringsserver kan het object niet creëren" IDS_NO_PROPERTY "Dit object ondersteunt deze eigenschap of methode niet" IDS_UNSUPPORTED_ACTION "Dit object ondersteunt deze actie niet" @@ -42,6 +43,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Ongeldige toekenning" IDS_UNDEFINED "'|' is ongedefinieerd" IDS_NOT_BOOL "Boolean object verwacht" + IDS_NOT_VBARRAY "VBArray object verwacht" IDS_JSCRIPT_EXPECTED "JScript object verwacht" IDS_REGEXP_SYNTAX_ERROR "Syntax fout in reguliere expressie" IDS_URI_INVALID_CHAR "De te coderen URI bevat ongeldige tekens"

1 0