January 2013 - Wine-Devel - list.winehq.org

Re: kernel32/tests : added tests for copyfileex try6

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=24237 Your paranoid android. === WNT4WSSP6 (32 bit path) === Timeout

Jan. 31, 2013

Re: [website] Added Simplified Chinese translation

by Jactry

Thanks for your work and remind. I will notice it next time. :-) 2013/2/1 Jeremy Newman <jnewman(a)codeweavers.com> > Nice work. I did end up moving a few things around, and had to patch my > language detection function, but it worked when I switched my browser over > to zn-ch. > > I fixed the image as well. > > Also, please set your text editor to output 4 spaces instead of tabs. > > Thanks! > > -N > > > On 01/30/2013 09:34 PM, Jactry Zeng wrote: > >> Hi folks, >> this is Simplified Chinese translation for Wine's website, it's my first >> patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. >> I appreciate for any comment. :-) >> > >

Jan. 31, 2013

Re: [website] Added Simplified Chinese translation

by Jeremy Newman

Nice work. I did end up moving a few things around, and had to patch my language detection function, but it worked when I switched my browser over to zn-ch. I fixed the image as well. Also, please set your text editor to output 4 spaces instead of tabs. Thanks! -N On 01/30/2013 09:34 PM, Jactry Zeng wrote: > Hi folks, > this is Simplified Chinese translation for Wine's website, it's my first > patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. > I appreciate for any comment. :-)

Jan. 31, 2013

Re: [website] Added simplified chinese

by Hin-Tak Leung

--- On Wed, 30/1/13, Jactry <jactry92(a)gmail.com> wrote: From: Jactry <jactry92(a)gmail.com> Subject: Re: [website] Added simplified chinese To: "Jeremy Newman" <jnewman(a)codeweavers.com> Cc: "wine-devel" <wine-devel(a)winehq.org> Date: Wednesday, 30 January, 2013, 16:28 Hi Jeremy, 2013/1/30 Jeremy Newman <jnewman(a)codeweavers.com>:>Patch looks good to me. Since I cannot read it, I need someone else here on wine devel to vouch for the >translation. Just to make sure it is legit and not a very tricky spam or just a pass through google translate. So happy to hear that. But please ignore this patch first and I will send a newer soon. There was some wrong in the first patch... >You will also need to add a string to the $this->languages array in the data class (include/data.php) Thanks for your remind. And I found that was anthor problem: the folder of Simplified Chinese in "templates" named "zh_CN", but the picture in "images/lang/" named "zh.png". I think "zh.png" should be renamed as "zh_CN.png". ( In general, something about "Simplified Chinese" was signed as "zh_CN" and "zh_TW" was left for "Traditional Chinese")In glibc 2.16, the following locales are defined: zh zh-CN zh_HK zh_TW.Big5 zh_CN zh_CN.GB2312 zh_TW Not to forget zh_HK... I also seem to have come across zh_SG (for Singapore) although I cannot remember what context. 2013/1/30 Jeremy Newman <jnewman(a)codeweavers.com> Patch looks good to me. Since I cannot read it, I need someone else here on wine devel to vouch for the translation. Just to make sure it is legit and not a very tricky spam or just a pass through google translate. You will also need to add a string to the $this->languages array in the data class (include/data.php) I also noticed we are still using .cvsignore files, oops. Those should get moved to .gitignore, but I can do that later. -N On Tue 29 Jan 2013 08:34:28 AM CST, Jactry wrote: -----Inline Attachment Follows-----

Jan. 31, 2013

Re: kernel32/tests : added tests for copyfileex try5

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=24228 Your paranoid android. === WNT4WSSP6 (32 bit path) === Timeout === W2KPROSP4 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === WXPPROSP3 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W2K3R2SESP2 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === WVISTAADM (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W2K8SE (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W7PRO (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W7PROX64 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === TEST64_W7SP1 (32 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === W7PROX64 (64 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1 === TEST64_W7SP1 (64 bit path) === path.c:1814: Test failed: Expected GetFileAttributesEx to return zero, got 1

Jan. 31, 2013

Re: [3/3] msi: Improve parsing of the supported platforms string.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=24227 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:6051: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

Jan. 31, 2013

Re: Makedll.rules.in: Explicitly specify DLL name when building importlib

by Alexandre Julliard

Jacek Caban <jacek(a)codeweavers.com> writes: > The above is not really a reason to put it in Wine. However, I thought > that this behaviour is logical consequence of having MODULE and > IMPORTLIB separately in Makefiles (as opposed to, say, IMPORTLIB=1 and > using MODULE for its name), so I sent the patch. IMPORTLIB can be different, but it has no effect, the library name is taken from the spec file name which has to match MODULE. -- Alexandre Julliard julliard(a)winehq.org

Jan. 31, 2013

Re: Makedll.rules.in: Explicitly specify DLL name when building importlib

by Jacek Caban

On 01/30/13 20:09, Alexandre Julliard wrote: > Jacek Caban <jacek(a)codeweavers.com> writes: > >> --- >> dlls/Makedll.rules.in | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) > Why do you need this? My use case is not really valid as is for Wine. I was experimenting with running parts of Wine on Windows, but I needed to change some DLL names. With this patch it's as easy as changing MODULE in Makefile.in files and copying .spec file. This way I get renamed DLLs built correctly and other DLLs depending on the new name without touching anything else. The above is not really a reason to put it in Wine. However, I thought that this behaviour is logical consequence of having MODULE and IMPORTLIB separately in Makefiles (as opposed to, say, IMPORTLIB=1 and using MODULE for its name), so I sent the patch. Jacek

Jan. 31, 2013

Re: fusion: Allow null to be the value of the public key

by Hans Leidekker

On Thu, 2013-01-31 at 19:35 +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c > index 162a76b..2c4b379 100644 > --- a/dlls/fusion/asmname.c > +++ b/dlls/fusion/asmname.c > @@ -561,6 +561,10 @@ static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) > { > int i; > BYTE val; > + static WCHAR nullstr[] = {'n','u','l','l',0}; This should be const. > + if(lstrcmpiW(pubkey, nullstr) == 0) > + return S_OK; Please add a test to show that it's case insensitive. > if (lstrlenW(pubkey) < CHARS_PER_PUBKEY) > return FUSION_E_INVALID_NAME; > diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c > index e97cfbe..79f8709 100644 > --- a/dlls/fusion/tests/asmcache.c > +++ b/dlls/fusion/tests/asmcache.c > @@ -1016,6 +1016,10 @@ static void test_QueryAssemblyInfo(void) > 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', > '2','d','0','3','6','1','7','b','1','c','3','1','e','2','f','5',',', > 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; > + static const WCHAR nullpublickey[] = { > + 'm','s','c','o','r','l','i','n',',','v','e','r','s','i','o','n','=','0', > + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','l', > + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; > > size = MAX_PATH; > hr = pGetCachePath(ASM_CACHE_GAC, asmpath, &size); > @@ -1386,6 +1390,17 @@ static void test_QueryAssemblyInfo(void) > "Assembly path was changed\n"); > ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); > > + /* display name is "mscorlib.dll,version=0.0.0.0,publicKeyToken=null,culture=neutral" */ This comment doesn't agree with the string initialized above. > + INIT_ASM_INFO(); > + lstrcpyW(name, nullpublickey); > + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); > + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); You should check the return value of QueryAssemblyInfo but CreateAssemblyNameObject is actually a better way to test this.

Jan. 31, 2013

Re: fusion: Allow null to be the value of the public key

by Nikolay Sivov

On 1/31/2013 12:35, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > fusion: Allow null to be the value of the public key > + static const WCHAR nullpublickey[] = { > + 'm','s','c','o','r','l','i','n',',','v','e','r','s','i','o','n','=','0', > + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','l', > + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; You have 'nul' here, not 'null'.

Jan. 31, 2013