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

Sven Baars : reg: Fix Dutch translation.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 9ad9012fcf6c37a7e07d9be063f19ef794a03760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad9012fcf6c37a7e07d9be06… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon May 31 23:01:47 2010 +0200 reg: Fix Dutch translation. --- programs/reg/Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc index c34e395..22a72a4 100644 --- a/programs/reg/Nl.rc +++ b/programs/reg/Nl.rc @@ -30,8 +30,8 @@ STRINGTABLE STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n" STRING_SUCCESS, "De bewerking is succesvol voltooid\n" - STRING_INVALID_KEY, "Fout: Foutieve sleutel naam\n" - STRING_INVALID_CMDLINE, "Fout: Foutieve commando regel parameters\n" + STRING_INVALID_KEY, "Fout: Foutieve sleutelnaam\n" + STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n" STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" - STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registry sleutel of waarde niet vinden\n" + STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n" }

1 0

Nikolay Sivov : oleaut32: Copy bytes instead of WCHARs in VarBstrCat.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 9a5098bbb49c748a93c7a247697b2ac7220dd3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5098bbb49c748a93c7a2476… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 1 02:20:08 2010 +0400 oleaut32: Copy bytes instead of WCHARs in VarBstrCat. --- dlls/oleaut32/tests/vartype.c | 46 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/vartype.c | 11 +++++---- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c46ad8a..361342e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5486,12 +5486,17 @@ static void test_VarBstrCat(void) static const WCHAR s1[] = { 'a',0 }; static const WCHAR s2[] = { 'b',0 }; static const WCHAR s1s2[] = { 'a',0,'b',0 }; + static const char str1A[] = "Have "; + static const char str2A[] = "A Cigar"; HRESULT ret; BSTR str1, str2, res; + UINT len; - /* Crash +if (0) +{ + /* Crash */ ret = VarBstrCat(NULL, NULL, NULL); - */ +} /* Concatenation of two NULL strings works */ ret = VarBstrCat(NULL, NULL, &res); @@ -5543,6 +5548,43 @@ static void test_VarBstrCat(void) SysFreeString(str2); SysFreeString(str1); + + /* Concatenation of ansi BSTRs, both odd byte count not including termination */ + str1 = SysAllocStringByteLen(str1A, sizeof(str1A)-1); + str2 = SysAllocStringByteLen(str2A, sizeof(str2A)-1); + len = SysStringLen(str1); + ok(len == (sizeof(str1A)-1)/sizeof(WCHAR), "got length %u\n", len); + len = SysStringLen(str2); + ok(len == (sizeof(str2A)-1)/sizeof(WCHAR), "got length %u\n", len); + + ret = VarBstrCat(str1, str2, &res); + ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); + ok(res != NULL, "Expected a string\n"); + len = (sizeof(str1A) + sizeof(str2A) - 2)/sizeof(WCHAR); + ok(SysStringLen(res) == len, "got %d, expected %u\n", SysStringLen(res), len); + ok(!memcmp(res, "Have A Cigar", sizeof(str1A) + sizeof(str2A) - 1), "got (%s)\n", (char*)res); + SysFreeString(res); + + SysFreeString(str2); + SysFreeString(str1); + + /* Concatenation of ansi BSTRs, both 1 byte length not including termination */ + str1 = SysAllocStringByteLen(str1A, 1); + str2 = SysAllocStringByteLen(str2A, 1); + len = SysStringLen(str1); + ok(len == 0, "got length %u\n", len); + len = SysStringLen(str2); + ok(len == 0, "got length %u\n", len); + + ret = VarBstrCat(str1, str2, &res); + ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); + ok(res != NULL, "Expected a string\n"); + ok(SysStringLen(res) == 1, "got %d, expected 1\n", SysStringLen(res)); + ok(!memcmp(res, "HA", 2), "got (%s)\n", (char*)res); + SysFreeString(res); + + SysFreeString(str2); + SysFreeString(str1); } /* IUnknown */ diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 1aa71fb..8f54eae 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6932,20 +6932,21 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft, BSTR pbstrRight, BSTR *pbstrOut) if (!pbstrOut) return E_INVALIDARG; - lenLeft = pbstrLeft ? SysStringLen(pbstrLeft) : 0; - lenRight = pbstrRight ? SysStringLen(pbstrRight) : 0; + /* use byte length here to properly handle ansi-allocated BSTRs */ + lenLeft = pbstrLeft ? SysStringByteLen(pbstrLeft) : 0; + lenRight = pbstrRight ? SysStringByteLen(pbstrRight) : 0; - *pbstrOut = SysAllocStringLen(NULL, lenLeft + lenRight); + *pbstrOut = SysAllocStringByteLen(NULL, lenLeft + lenRight); if (!*pbstrOut) return E_OUTOFMEMORY; (*pbstrOut)[0] = '\0'; if (pbstrLeft) - memcpy(*pbstrOut, pbstrLeft, lenLeft * sizeof(WCHAR)); + memcpy(*pbstrOut, pbstrLeft, lenLeft); if (pbstrRight) - memcpy(*pbstrOut + lenLeft, pbstrRight, lenRight * sizeof(WCHAR)); + memcpy((CHAR*)*pbstrOut + lenLeft, pbstrRight, lenRight); TRACE("%s\n", debugstr_wn(*pbstrOut, SysStringLen(*pbstrOut))); return S_OK;

1 0

André Hentschel : wineusr: Sync the WINEDLLOVERRIDES examples with the manpage.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: docs Branch: master Commit: 77e40b7fec8d419cf4ab38db85b0eaea0ce0828f URL: http://source.winehq.org/git/docs.git/?a=commit;h=77e40b7fec8d419cf4ab38db8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 19:09:56 2010 +0200 wineusr: Sync the WINEDLLOVERRIDES examples with the manpage. --- en/wineusr-running.sgml | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index dd3d090..9c5ae2f 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -248,13 +248,32 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" to use the WINEDLLOVERRIDES environment variable to set them. </para> <para> - For example, if you wanted wine to use native ole32.dll, - oleaut32.dll and rpcrt4 you could run <command>wine</command> like this: + Examples: </para> <screen> -<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="ole32,oleaut32,rpcrt4=n" wine <replaceable>program_name</replaceable></userinput> +<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32,shell32=n,b" wine <replaceable>program_name</replaceable></userinput> </screen> <para> + Try to load comdlg32 and shell32 as native windows dll first and try + the builtin version if the native load fails. + </para> + <screen> +<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32,shell32=n;c:\\foo\\bar\\baz=b" wine <replaceable>program_name</replaceable></userinput> + </screen> + <para> + Try to load the libraries comdlg32 and shell32 as native windows dlls. + Furthermore, if an application request to load c:\foo\bar\baz.dll load + the builtin library baz. + </para> + <screen> +<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" wine <replaceable>program_name</replaceable></userinput> + </screen> + <para> + Try to load comdlg32 as builtin first and try the native version if + the builtin load fails; load shell32 always as builtin and comctl32 + always as native. Oleaut32 will be disabled. + </para> + <para> For more information about DLL overrides, please refer to the <link linkend="winecfg-dll-overrides">DLL overrides</link> section of this guide. </para>

1 0