March 2007 - Wine-devel - list.winehq.org

Re: [PATCH 6/6] ole32: Implement MkParseDisplayName.
by Juan Lang 28 Mar '07

28 Mar '07

Hi Rob, +/* find a character from a set in reverse without the string having to be null-terminated */ +static inline WCHAR *memrpbrkW(const WCHAR *ptr, size_t n, const WCHAR *accept) +{ + const WCHAR *end, *ret = NULL; + for (end = ptr + n; ptr < end; ptr++) if (strchrW(accept, *ptr)) ret = ptr; + return (WCHAR *)ret; +} Maybe it's because I'm dense and I don't particularly like three levels of indent on a single line, but this doesn't seem to do what I'd expect. The for loop doesn't quit when ret is assigned, thus, this will always find the last character, from left to right, from accept in ptr, rather than the first. Don't you mean "ptr < end && !ret"? And in what sense is this "in reverse"? --Juan ____________________________________________________________________________________ Bored stiff? Loosen up... Download and play hundreds of games for free on Yahoo! Games. http://games.yahoo.com/games/front

2 2

WineD3D: Make CreateCubeTexture fail when not supported
by Felix Nawothnig 28 Mar '07

28 Mar '07

Not tested under Windows (does _anyone_ besides me have a Matrox? :) - would be nice if someone with either an MGA or an really ancient GPU could run the test on windows (if the pool=0 trace has an hr!=0 you got one of those ancient cards :). CCing to wine-devel for that reason. --- dlls/d3d8/tests/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 5 +++++ 2 files changed, 32 insertions(+), 0 deletions(-)

2 1

Re: WineD3D: Make CreateCubeTexture fail when not supported
by Duane Clark 28 Mar '07

28 Mar '07

Felix Nawothnig wrote: > Not tested under Windows (does _anyone_ besides me have a Matrox? :) - > would be nice if someone with either an MGA or an really ancient GPU > could run the test on windows (if the pool=0 trace has an hr!=0 you got > one of those ancient cards :). CCing to wine-devel for that reason. On a Matrox G550, Win2k, crosscompiled on Linux with MingW: I:\dlls\d3d8\tests>d3d8_crosstest texture texture.c:122:texture caps: 0x000041c7 texture.c:110:pool=0 hr=0x8876086c texture.c:110:pool=1 hr=0x8876086c texture.c:110:pool=2 hr=0x8876086c texture.c:110:pool=3 hr=0x00000000 texture: 57 tests executed (0 marked as todo, 0 failures), 0 skipped.

2 1

Re: Allow enabling/disabling Direct3D usage of GLSL in Winecfg + update Czech locales for Winecfg
by Stefan Dösinger 28 Mar '07

28 Mar '07

> changelog entry: Allow enabling/disabling Direct3D usage of GLSL in winecfg > changelog entry: Update Czech localization for winecfg The changelog suggests that you have 2 different changesets in one path. If they do not depend on each other, please send them in seperate patches(and mails)

3 3

Re: [2/2] wined3d: Fix GLSL cnd instruction for INF and NAN arguments
by Marty Schmidt 28 Mar '07

28 Mar '07

Can you send me a patch?? ----- Original Message ----- From: "Fabian Bieler" <der.fabe(a)gmx.net> To: <wine-patches(a)winehq.org> Sent: Thursday, March 29, 2007 1:00 PM Subject: [2/2] wined3d: Fix GLSL cnd instruction for INF and NAN arguments > > -------------------------------------------------------------------------------- >From 1bca82ab76f27dd0e636305da74ec428caf9a919 Mon Sep 17 00:00:00 2001 From: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu, 29 Mar 2007 19:59:11 +0200 Subject: [PATCH] wined3d: Fix GLSL cnd instruction for INF and NAN arguments --- dlls/wined3d/glsl_shader.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d04f45..3ceb935 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1156,26 +1156,35 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; glsl_src_param_t src2_param; - DWORD write_mask; - size_t mask_size; - - write_mask = shader_glsl_append_dst(arg->buffer, arg); + DWORD write_mask, cmp_channel = 0; + unsigned int i, j; if (shader->baseShader.hex_version < WINED3DPS_VERSION(1, 4)) { - mask_size = 1; + write_mask = shader_glsl_append_dst(arg->buffer, arg); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); - } else { - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", + src0_param.param_str, src1_param.param_str, src2_param.param_str); + return; } + /* Cycle through all source0 channels */ + for (i=0; i<4; i++) { + write_mask = 0; + /* Find the destination channels which use the current source0 channel */ + for (j=0; j<4; j++) { + if ( ((arg->src[0] >> (WINED3DSP_SWIZZLE_SHIFT + 2*j)) & 0x3) == i ) { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } + } + write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + if (!write_mask) continue; - shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); - shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - if (mask_size > 1) { - shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.5)))));\n", - src2_param.param_str, src1_param.param_str, mask_size, src0_param.param_str, mask_size); - } else { shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); } -- 1.4.4.1 -------------------------------------------------------------------------------- > >

1 0

WineD3D: Make CreateCubeTexture fail when not supported
by Luke Bratch 28 Mar '07

28 Mar '07

> Not tested under Windows (does _anyone_ besides me have a Matrox? :) - > would be nice if someone with either an MGA or an really ancient GPU > could run the test on windows (if the pool=0 trace has an hr!=0 you got > one of those ancient cards :). CCing to wine-devel for that reason. Somewhere I have an ancient Matrix MGA G200 AGP card... If this would be of any use, I'll dig it out and run any tests in Wine/Windows that you'd like? ___________________________________________________________ New Yahoo! Mail is the ultimate force in competitive emailing. Find out more at the Yahoo! Mail Championships. Plus: play games and win prizes. http://uk.rd.yahoo.com/evt=44106/*http://mail.yahoo.net/uk

2 1

Re: Alexandre Julliard : server: Add support for queuing a user APC upon async I/O completion.
by Eric Pouech 28 Mar '07

28 Mar '07

Alexandre Julliard a écrit : > Module: wine > Branch: master > Commit: c16eb8efd942bfbb0bb7f3da4c740a2e483cce28 > URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16eb8efd942bfbb0bb7f3da4… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Tue Mar 27 16:42:27 2007 +0200 > > server: Add support for queuing a user APC upon async I/O completion. > > do you have a plan, when the apc routine is used, to free the allocated async_fileio (in dlls/ntdll/file.c) ? A+ -- Eric Pouech "The problem with designing something completely foolproof is to underestimate the ingenuity of a complete idiot." (Douglas Adams)

2 2

Regression?
by Bill Medland 28 Mar '07

28 Mar '07

I just tripped over this; I think it crept in over the past couple of weeks. Anyone know what's going on? I'm not going to waste days searching for it if it is obvious to someone. wine: Call from 0x126ce72 to unimplemented function nspr4.dll.PR_GetPhysicalMemorySize, aborting wine: Unimplemented function nspr4.dll.PR_GetPhysicalMemorySize called at address 0x126ce72 (thread 0009), starting debugger... Unhandled exception: unimplemented function nspr4.dll.PR_GetPhysicalMemorySize called in 32-bit code (0x601773a9). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:601773a9 ESP:0033d6e4 EBP:0033d748 EFLAGS:00200216( - 00 - IAP1) EAX:01274c16 EBX:601b3868 ECX:00ca8898 EDX:00110024 ESI:0033d6f0 EDI:00000000 Stack dump: 0x0033d6e4: 00000000 00000000 60177374 80000100 0x0033d6f4: 00000001 00000000 0126ce72 00000002 0x0033d704: 01274c30 01274c16 00ca8898 00ca88ac 0x0033d714: 0033d734 6032ff42 00110000 00000000 0x0033d724: 00ca8898 00000000 611418ba 611418ba 0x0033d734: 0033d788 00bf6ddb 00ca8898 611418ba Backtrace: =>1 0x601773a9 stub_entry_point+0x51(dll=0x1274c30, name=0x1274c16) [/nobackup/wine/dlls/ntdll/loader.c:184] in ntdll (0x0033d748) 2 0x0126ce72 in docshell (+0x1ce72) (0x0033d760) 3 0x0126d023 in docshell (+0x1d023) (0x0033d788) 4 0x61143e50 in xpcom_core (+0x3e50) (0x0033d7b0) 5 0x61143f8d in xpcom_core (+0x3f8d) (0x0033d7c8) 6 0x6116b0f8 in xpcom_core (+0x2b0f8) (0x0033d7ec) 7 0x6116a3c3 in xpcom_core (+0x2a3c3) (0x0033dc0c) 8 0x61166792 in xpcom_core (+0x26792) (0x0033dc38) 9 0x61166a5e in xpcom_core (+0x26a5e) (0x0033dc4c) 10 0x611671c2 in xpcom_core (+0x271c2) (0x0033dc80) 11 0x61142350 in xpcom_core (+0x2350) (0x0033dcc0) 12 0x00ba6ea9 _IO_vfwprintf+0x35a9() in necko (0x0033dcec) 13 0x60dc524a nsChannel_GetContentType+0x62(iface=<register ESI not in topmost frame>, aContentType=<register EDI not in topmost frame>) [/nobackup/wine/dlls/mshtml/nsio.c:492] in mshtml (0x0033dd1c) 14 0x012224f1 in gkparser (+0x124f1) (0x0033dd90) 15 0x010a89a0 in rdf (+0x89a0) (0x0033eddc) 16 0x010a86a6 in rdf (+0x86a6) (0x0033ee0c) 17 0x01144259 in chrome (+0x4259) (0x0033ef44) 18 0x01148806 in chrome (+0x8806) (0x0033f004) 19 0x01148ac7 in chrome (+0x8ac7) (0x0033f01c) 20 0x01148e62 in chrome (+0x8e62) (0x0033f074) 21 0x01142616 in chrome (+0x2616) (0x0033f0b4) 22 0x0114104c in chrome (+0x104c) (0x0033f0f0) 23 0x611671c2 in xpcom_core (+0x271c2) (0x0033f124) 24 0x61142350 in xpcom_core (+0x2350) (0x0033f164) 25 0x011148b9 in profile (+0x48b9) (0x0033f1fc) 26 0x0111322e in profile (+0x322e) (0x0033f270) 27 0x60dc3d45 NSContainer_Create+0x9a9(doc=0x18d9a0, parent=0x0) [/nobackup/wine/dlls/mshtml/nsembed.c:317] in mshtml (0x0033f600) 28 0x60da84d6 HTMLDocument_Create+0x13a(pUnkOuter=0x0, riid=0x44db00, ppvObject=0x33f6b4) [/nobackup/wine/dlls/mshtml/htmldoc.c:1135] in mshtml (0x0033f630) 29 0x60dbe185 ClassFactory_CreateInstance+0x15(iface=<register EAX not in topmost frame>, pUnkOuter=0x0, riid=0x44db00, ppvObject=0x33f6b4) [/nobackup/wine/dlls/mshtml/main.c:149] in mshtml (0x0033f650) 30 0x605da568 CoCreateInstance+0x19c(rclsid=0x44db50, pUnkOuter=0x0, dwClsContext=0x5, iid=0x44db00, ppv=0x33f6b4) [/nobackup/wine/dlls/ole32/compobj.c:2170] in ole32 (0x0033f690) 31 0x00425375 in accpac (+0x25375) (0x0033f6bc) 32 0x00426ca0 in accpac (+0x26ca0) (0x0033f6d0) 33 0x0041a61b in accpac (+0x1a61b) (0x0033f6fc) 34 0x0041a82e in accpac (+0x1a82e) (0x0033f754) 35 0x0041950a in accpac (+0x1950a) (0x0033f77c) 36 0x6c371fb5 in mfc42 (+0x1fb5) (0x0033f7f4) 37 0x6c371cea in mfc42 (+0x1cea) (0x0033f814) 38 0x6c371c73 in mfc42 (+0x1c73) (0x0033f874) 39 0x6c372511 in mfc42 (+0x2511) (0x0033f898) 40 0x6c372528 in mfc42 (+0x2528) (0x0033f8c0) 41 0x6c37e93d in mfc42 (+0xe93d) (0x0033f928) 42 0x00411de7 in accpac (+0x11de7) (0x0033fa5c) 43 0x00402b0b in accpac (+0x2b0b) (0x0033fe48) 44 0x6c37b4f3 in mfc42 (+0xb4f3) (0x0033ff08) 45 0x602562ef start_process+0xcf(arg=0x0) [/nobackup/wine/dlls/kernel32/process.c:821] in kernel32 (0x0033ffe8) 46 0x757ccd73 wine_switch_to_stack+0x17() in libwine.so.1 (0x00000000) 0x601773a9 stub_entry_point+0x51 [/nobackup/wine/dlls/ntdll/loader.c:184] in ntdll: addl $12,%esp 184 for (;;) RtlRaiseException( &rec ); Modules: Module Address Debug info Name (146 modules) ELF 101000-16c000 Deferred libfreetype.so.6 ELF 16e000-171000 Deferred libxinerama.so.1 ELF 182000-1a8000 Deferred libfontconfig.so.1 ELF 1aa000-1c9000 Deferred libexpat.so.0 ELF 1f3000-254000 Deferred libodbc.so.1.0.0 ELF 25d000-270000 Deferred libresolv.so.2 PE 340000-349000 Deferred a4wsem PE 350000-362000 Deferred a4wmac PE 370000-3c1000 Deferred a4wrv PE 3d0000-3f0000 Deferred a4wdylib PE 400000-467000 Export accpac ELF 474000-55d000 Deferred libcrypto.so.4 PE 4a0000-6d4000 Deferred dsktpeng PE 4a0000-6d4000 Deferred dsktpeng PE 4a0000-6d4000 Deferred dsktpeng PE 4a0000-6d4000 Deferred dsktpeng PE 7f0000-819000 Deferred a4wicon ELF 879000-87c000 Deferred libcom_err.so.2 ELF 87e000-8e3000 Deferred libkrb5.so.3 ELF 8eb000-90c000 Deferred libk5crypto.so.3 PE 9e0000-9ef000 Deferred jsd3250 PE 9f0000-a59000 Deferred js3250 PE 9f0000-a59000 Deferred js3250 PE 9f0000-a59000 Deferred js3250 PE 9f0000-a59000 Deferred js3250 PE a60000-a92000 Deferred xpc3250 PE aa0000-ab6000 Deferred gkgfx ELF b42000-b45000 Deferred libxrandr.so.2 ELF b48000-b5f000 Deferred ld-linux.so.2 PE b50000-b63000 Deferred jsj3250 PE b50000-b63000 Deferred jsj3250 PE b70000-beb000 Deferred necko PE bf0000-bfc000 Deferred xppref32 PE c00000-c2e000 Deferred i18n PE c30000-c4e000 Deferred embedcomponents PE c50000-c5f000 Deferred caps ELF c8e000-cb1000 Deferred libm.so.6 ELF cb3000-cb7000 Deferred libdl.so.2 ELF cb9000-d98000 Deferred libx11.so.6 PE d70000-d88000 Deferred palmsync PE d90000-d9c000 Deferred typeaheadfind PE d90000-d9c000 Deferred typeaheadfind PE da0000-106d000 Deferred gklayout PE da0000-106d000 Deferred gklayout PE da0000-106d000 Deferred gklayout PE da0000-106d000 Deferred gklayout PE da0000-106d000 Deferred gklayout PE da0000-106d000 Deferred gklayout PE 1070000-1095000 Deferred imglib2 PE 10a0000-10ba000 Export rdf PE 10c0000-10f9000 Deferred appcomps PE 1100000-1110000 Deferred appshell PE 1110000-111e000 Export profile PE 1120000-1127000 Deferred xpcom_compat_c PE 1130000-1137000 Deferred sroaming PE 1140000-1150000 Export chrome PE 1150000-120b000 Deferred uconv PE 1210000-1248000 Export gkparser PE 1250000-127c000 Export docshell PE 10000000-1000b000 Deferred a4wcompat PE 1c000000-1c011000 Deferred a4wroto PE 1d000000-1d20e000 Deferred a4wmem32 PE 1d300000-1d5e1000 Deferred a4wapi PE 30180000-3018f000 Deferred cato3msk ELF 60141000-601cf000 Dwarf ntdll<elf> \-PE 60150000-601cf000 \ ntdll ELF 601f2000-60304000 Dwarf kernel32<elf> \-PE 60210000-60304000 \ kernel32 ELF 60304000-60363000 Deferred msvcrt<elf> \-PE 60310000-60363000 \ msvcrt ELF 60363000-603a1000 Deferred advapi32<elf> \-PE 60370000-603a1000 \ advapi32 ELF 603a1000-604bf000 Deferred user32<elf> \-PE 603c0000-604bf000 \ user32 ELF 604bf000-605aa000 Deferred shell32<elf> \-PE 604d0000-605aa000 \ shell32 ELF 605aa000-60634000 Dwarf ole32<elf> \-PE 605c0000-60634000 \ ole32 ELF 60634000-60683000 Deferred rpcrt4<elf> \-PE 60640000-60683000 \ rpcrt4 ELF 60696000-606c4000 Deferred winspool<elf> \-PE 606a0000-606c4000 \ winspool ELF 606c4000-606dc000 Deferred version<elf> \-PE 606d0000-606dc000 \ version ELF 606dc000-606f0000 Deferred lz32<elf> \-PE 606e0000-606f0000 \ lz32 ELF 606f0000-6077c000 Deferred oleaut32<elf> \-PE 60700000-6077c000 \ oleaut32 ELF 6077c000-607a0000 Deferred odbc32<elf> \-PE 60780000-607a0000 \ odbc32 ELF 607a0000-607be000 Deferred mpr<elf> \-PE 607b0000-607be000 \ mpr ELF 607be000-607e7000 Deferred ws2_32<elf> \-PE 607d0000-607e7000 \ ws2_32 ELF 607e7000-60800000 Deferred wsock32<elf> \-PE 607f0000-60800000 \ wsock32 ELF 6089a000-6091c000 Deferred winex11<elf> \-PE 608b0000-6091c000 \ winex11 ELF 60aab000-60ac7000 Deferred imm32<elf> \-PE 60ab0000-60ac7000 \ imm32 ELF 60ad0000-60b00000 Deferred uxtheme<elf> \-PE 60ae0000-60b00000 \ uxtheme ELF 60d37000-60d4b000 Deferred riched32<elf> \-PE 60d40000-60d4b000 \ riched32 ELF 60d4b000-60d8b000 Deferred riched20<elf> \-PE 60d60000-60d8b000 \ riched20 ELF 60d8b000-60df3000 Dwarf mshtml<elf> \-PE 60da0000-60df3000 \ mshtml ELF 60df3000-60e25000 Deferred urlmon<elf> \-PE 60e00000-60e25000 \ urlmon ELF 60e25000-60e66000 Deferred wininet<elf> \-PE 60e30000-60e66000 \ wininet PE 60ec0000-60ed1000 Deferred mozz PE 60ee0000-60f14000 Deferred msgbsutl PE 60f60000-60f87000 Deferred nspr4 PE 60f90000-60fe9000 Deferred nss3 PE 60ff0000-6102a000 Deferred nssckbi PE 61030000-61037000 Deferred palmsyncproxy PE 61040000-61047000 Deferred plc4 PE 61050000-61056000 Deferred plds4 PE 61060000-61068000 Deferred npnul32 PE 61070000-6108a000 Deferred smime3 PE 61090000-610ea000 Deferred softokn3 PE 610f0000-6110b000 Deferred ssl3 PE 61110000-61116000 Deferred xpcom PE 61120000-61134000 Deferred xpcom_compat PE 61140000-611a5000 Export xpcom_core PE 611b0000-611b6000 Deferred xpistub ELF 6156f000-6158b000 Deferred ximcp.so.2 ELF 62d4e000-62d50000 Deferred xlcutf8load.so.2 ELF 66148000-66198000 Deferred shlwapi<elf> \-PE 66160000-66198000 \ shlwapi ELF 68357000-68374000 Deferred iphlpapi<elf> \-PE 68360000-68374000 \ iphlpapi ELF 6a8f6000-6a901000 Deferred libnss_files.so.2 PE 6c370000-6c462000 Export mfc42 ELF 6e64c000-6e6d3000 Deferred gdi32<elf> \-PE 6e660000-6e6d3000 \ gdi32 ELF 74569000-74610000 Deferred comctl32<elf> \-PE 74570000-74610000 \ comctl32 ELF 757c6000-758d6000 Dwarf libwine.so.1 PE 780c0000-78121000 Deferred msvcp60 ELF 78671000-78709000 Deferred comdlg32<elf> \-PE 78680000-78709000 \ comdlg32 ELF 7bf00000-7bf03000 Deferred <wine-loader> PE 7c340000-7c396000 Deferred msvcr71 Threads: process tid prio (all id:s are in hex) 0000000a 0000000b 0 00000008 (D) G:\runtime\accpac.exe 0000000f 0 0000000e 0 0000000d 0 0000000c 0 00000009 0 <==

3 4

Localization resources
by Kirill K. Smirnov 28 Mar '07

28 Mar '07

Hi, Similar question has been discussed before: http://www.winehq.org/pipermail/wine-devel/2006-November/052140.html http://www.winehq.org/pipermail/wine-devel/2006-November/052142.html http://www.winehq.org/pipermail/wine-devel/2006-November/052143.html >You only need to add an English resource; the other language files are made by >whoever translates the English strings into their language. The better way is to add string untranslated into every resource, otherwise it will not be loaded. More info at http://www.winehq.org/pipermail/wine-devel/2006-November/052135.html -- Kirill

3 2

Re: [2/2] shlwapi: Match shlwapi wrappers to MSDN descriptions
by Alexandre Julliard 28 Mar '07

28 Mar '07

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > 341 stdcall @(long ptr) kernel32.FindNextFileW > -342 stdcall -noname SHInterlockedCompareExchange(ptr long long) > +# FIXME: 342 should be forwarded to InterlockedCompareExchangePointer > +342 stdcall -noname @(ptr long long) kernel32.InterlockedCompareExchange Then you can't forward it, you should keep the current implementation and make it use InterlockedCompareExchangePointer. -- Alexandre Julliard julliard(a)winehq.org

1 0