March 2006 - Wine-Devel - list.winehq.org

Re: DirectDraw -> WineD3D patch

by Peter Beutner

Stefan Dösinger schrieb: > Hi, > I've brought my DirectDraw over WineD3D patch in a form where I want to show > it to the public for review. I've uploaded it to > http://stud4.tuwien.ac.at/~e0526822/, where it is described in detail(below > the game list). nice work :). I just looked a bit into the palette issue( aka lost text color etc): from IWineD3DDeviceImpl_CreatePalette: + memset(&palVersion, 0, sizeof(LOGPALETTE)); + object->hpal = CreatePalette(&palVersion); + memcpy(&object->palVersion, &palVersion, sizeof(LOGPALETTE)); + /* FIXME Using the palVersion member from IWineD3DPaletteImpl for CreatePalette + * directly causes a heap corruption. Why? In original ddraw this was a WORD, + * which failed too. Confused ... + */ + object->palNumEntries = IWineD3DPaletteImpl_Size(Flags); That can't really work. This only creates a palette with zero entries. You need to set palNumEntries before calling CreatePalette. Attached patch( applies on top of yours ) should fix it( i.e. do it the same way it is done in the current implementation). But the text colors in AoE are still lacking :/. Needs some more investigation ... Peter b0a1e06bddc2bbc17bf7b5d991236a4cd76f0d1a diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f224c2c..9b0e468 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1660,12 +1660,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD Flags, PALETTEENTRY *PalEnt, IWineD3DPalette **Palette, IUnknown *Parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DPaletteImpl *object; - LOGPALETTE palVersion; HRESULT hr; FIXME("(%p)->(%lx, %p, %p, %p)\n", This, Flags, PalEnt, Palette, Parent); /* Create the new object */ - object = HeapAlloc(GetProcessHeap(), 0, sizeof(IWineD3DPaletteImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DPaletteImpl)); if(!object) { ERR("Out of memory when allocating memory for a IWineD3DPalette implementation\n"); return DDERR_OUTOFVIDEOMEMORY; @@ -1676,15 +1675,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create object->Flags = Flags; object->parent = Parent; object->wineD3DDevice = This; - - memset(&palVersion, 0, sizeof(LOGPALETTE)); - object->hpal = CreatePalette(&palVersion); - memcpy(&object->palVersion, &palVersion, sizeof(LOGPALETTE)); - /* FIXME Using the palVersion member from IWineD3DPaletteImpl for CreatePalette - * directly causes a heap corruption. Why? In original ddraw this was a WORD, - * which failed too. Confused ... - */ object->palNumEntries = IWineD3DPaletteImpl_Size(Flags); + + object->hpal = CreatePalette((const LOGPALETTE*)&(object->palVersion)); + + if(!object->hpal) { + HeapFree( GetProcessHeap(), 0, object); + return DDERR_OUTOFMEMORY; /* only reason why CreatePalette could have failed */ + } hr = IWineD3DPalette_SetEntries((IWineD3DPalette *) object, 0, 0, IWineD3DPaletteImpl_Size(Flags), PalEnt); if(FAILED(hr)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86b10bb..626154a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1309,9 +1309,9 @@ struct IWineD3DPaletteImpl { /* IWineD3DPalette */ HPALETTE hpal; - LOGPALETTE palVersion; - WORD palNumEntries; - PALETTEENTRY palents[256]; + WORD palVersion; /*| */ + WORD palNumEntries; /*| LOGPALETTE */ + PALETTEENTRY palents[256]; /*| */ /* This is to store the palette in 'screen format' */ int screen_palents[256]; DWORD Flags;

March 3, 2006

Re: make crosstest

by Hans Leidekker

On Friday 03 March 2006 16:14, Saulius Krasuckas wrote: > -lkernel32 /usr/local/lib/gcc/i386-mingw32/3.4.4/libgcc.a: could not read > symbols: Archive has no index; run ranlib to add one Run this command: $ i386-mingw32-ranlib /usr/local/lib/gcc/i386-mingw32/3.4.4/libgcc.a There's something wrong with package building on recent Fedora Core releases but I haven't found the cause of it yet. -Hans

March 3, 2006

[mlang.dll] DllCanUnloadNow

by Christian Gmeiner

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch + implements LockServer + implements DllCanUnloadNow + add some needed calls to LockModule() & UnlockModule() If it didn't get into cvs i want a mail with the cause. - -- Christian Gmeiner - student of computer science http://dxr3plugin.sf.net http://itb04.ath.cx http://javamill.ath.cx -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFECFi9Dwe2AbwGBA8RApDQAJ4nCMpbbOeWBTi/x1xV36MrBaKoNgCfRTG8 54cyjapBkvdO9DUkNP41k3k= =HK0l -----END PGP SIGNATURE----- Index: dlls/mlang/mlang.c =================================================================== RCS file: /home/wine/wine/dlls/mlang/mlang.c,v retrieving revision 1.25 diff -u -r1.25 mlang.c --- dlls/mlang/mlang.c 6 Dec 2005 10:39:43 -0000 1.25 +++ dlls/mlang/mlang.c 3 Mar 2006 08:47:38 -0000 @@ -453,6 +453,21 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINFO *mime_cp_info); +static LONG dll_count; + +/* + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { @@ -709,6 +724,7 @@ { TRACE("Destroying %p\n", This); HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); } return ref; @@ -735,8 +751,11 @@ static HRESULT WINAPI MLANGCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("(%p)->(%d),stub!\n",This,dolock); + if (dolock) + LockModule(); + else + UnlockModule(); + return S_OK; } @@ -2281,6 +2300,9 @@ mlang->ref = 1; *ppObj = (LPVOID) mlang; TRACE("returning %p\n", mlang); + + LockModule(); + return S_OK; } @@ -2288,8 +2310,7 @@ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); - return S_FALSE; + return dll_count == 0 ? S_OK : S_FALSE; } HRESULT WINAPI GetGlobalFontLinkObject(void)

March 3, 2006

Re: Question about copyright lines

by Marcus Meissner

On Fri, Mar 03, 2006 at 03:20:48PM +0100, Stefan Dösinger wrote: > Hello, > At the top of every fine there's are some "Copyright <year> <name>" lines, > listing the persons who have contributed to a file, and when. Are there any > specifc rules about that? If you make a significant contribution, just add yourself there. (significant in my eyes -> new feature, code rewrite or similar) Ciao, Marcus

March 3, 2006

Re: WINECFG: Eliminate some gcc 4.1 warnings caused by casts in macros.

by Francois Gouget

On Fri, 3 Mar 2006, Mike McCormack wrote: [...] > They would prefer that we use statement expressions, which are gcc specific, > in our macros. Something like: Thanks for the explanation. Sure, having an #ifdef/#else/#endif for each macro is way too painful. But what about the following: +#ifndef WINE_CAST +# if __GNUC__ +# define WINE_CAST(ctype, val) ({ctype r=(ctype)(val);r;}) +# else +# define WINE_CAST(ctype, val) ((ctype)(val)) +# endif +#endif + + #define Header_SetImageList(hwnd,himl) \ - (HIMAGELIST)SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl) + WINE_CAST(HIMAGELIST, SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl)) + This pre-processes to code that uses the statement expression on gcc compilers and to the regular cast for others. So there should be no warning in either case (I couldn't check with gcc 4.1 but this preprocesses to the expected form). I also checked with gcc 2.95 and it compiles fine and without warning there which should be enough backwards compatibility for everyone (otherwise we can go further and check the GCC version). Of course in a real patch the WINE_CAST macro would be declared somewhere in windef.h, and we'd still have to change all the macros that cast a function result. But that seems quite feasible and not too ugly and I would be willing to submit such a patch. We may also want to find a better name. WINE_MACRO_CAST? WINE_MCAST? __MACRO_CAST? WINE_CAST_RESULT? Should I send such a patch? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ In a world without fences who needs Gates?

March 3, 2006

Question about copyright lines

by Stefan Dösinger

Hello, At the top of every fine there's are some "Copyright <year> <name>" lines, listing the persons who have contributed to a file, and when. Are there any specifc rules about that? Thanks, Stefan

March 3, 2006

ddraw/specular lighting

by david.adam

Hello, A lot of ddraw games recquires specular lighting to work (Syberia I, Settlers IV, etc...). Unfortunately, specular lighting is not implemented in ddraw. Does the change ddraw/direct 7 WINED3D resolve this problem? Otherwise, does somebody forsee to work on that? The implmentation of specular lighting would improve considerably the numbers of working games under wine.... Best regards, Joaopa

March 3, 2006

Re: WSH, WMI scripts

by Vassilis Virvilis

Sreenivas Tatti wrote: > Hi Mike, > You could have understood my requirement. I am looking at WINE to get > this thing done. If not supported in WINE, then what other possible way, > I can achieve this. I have to do some windows registry modifications and > start/stop/query about windows services from a Linux box. > I have to remotely install my agent on a windows box. That is my goal. > Thanks in anticipation. > With regards, > Sreenivas It is absolutely unrelated to wine and completely off topic but since you asked why don't you install cygwin to the remote machines and do the staff you want to do with ssh and some local scripting. I mean if you can do it from a dos prompt, ok a cmd prompt, then you have to be able to do it with a ssh connection remotely and in a secure manner too. http://pigtail.net/LRP/printsrv/cygwin-sshd.html .bill

March 3, 2006

RE: WSH, WMI scripts

by Sreenivas Tatti

Hi Mike, You could have understood my requirement. I am looking at WINE to get this thing done. If not supported in WINE, then what other possible way, I can achieve this. I have to do some windows registry modifications and start/stop/query about windows services from a Linux box. I have to remotely install my agent on a windows box. That is my goal. Thanks in anticipation. With regards, Sreenivas -----Original Message----- From: Mike McCormack [mailto:mike(a)codeweavers.com] Sent: Friday, March 03, 2006 4:28 PM To: Sreenivas Tatti Cc: wine-devel(a)winehq.org Subject: Re: WSH, WMI scripts Sreenivas Tatti wrote: > I have a requirement that, I should run WSH and WMI scripts in Linux > environment in order to do some registry changes on a remote machine and > start/stop/query windows services on a remote machine. It's unlikely to work, as DCOM (OLE over the network) does not work, and Wine currently has no builtin support for WSH/WMI. Mike

March 3, 2006

Re: WSH, WMI scripts

by Mike McCormack

Sreenivas Tatti wrote: > I have a requirement that, I should run WSH and WMI scripts in Linux > environment in order to do some registry changes on a remote machine and > start/stop/query windows services on a remote machine. It's unlikely to work, as DCOM (OLE over the network) does not work, and Wine currently has no builtin support for WSH/WMI. Mike

March 3, 2006

WSH, WMI scripts

by Sreenivas Tatti

Hi, I have a requirement that, I should run WSH and WMI scripts in Linux environment in order to do some registry changes on a remote machine and start/stop/query windows services on a remote machine. Can I use WINE for this purpose. Thanks in anticipation. With regards, Sreenivas T.

March 3, 2006

Re: COMCTL32: Fix some gcc 4.1 warnings caused by windowsx.h macros.

by Thomas Weidenmueller

Rob Shearman wrote: > IMHO, it would be better to see one patch that turns this warning off > than ten patches that obfuscate the code I absolutely appreciate this warning, IMO it's not code obfuscation. - Thomas

March 3, 2006

Re: COMCTL32: Fix some gcc 4.1 warnings caused by windowsx.h macros.

by Mike McCormack

Rob Shearman wrote: > I see little benefit in this warning being enabled. > > IMHO, it would be better to see one patch that turns this warning off > than ten patches that obfuscate the code Yesterday, Alexandre fixed 4 problems that showed using this warning: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9cc7e33ffaaf9b359d6bcc… They showed up with gcc 4.1, but I didn't notice them because of the warnings from function casts. It's probably possible to turn it off using -Wno-unused-value, but there are real problems that will be caught with it. Consider part of Alexandre's patch yesterday: +++ b/dlls/ole32/ole2.c @@ -801,7 +801,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( rgelt->grfAttribs = atolW(pwszAttribs); if (pceltFetched) - *pceltFetched++; + (*pceltFetched)++; This->index++; } return hr; Getting rid of the relative small number of macro uses that cause the warning doesn't seem to difficult, or to obfuscate the code too much to me. Mike

March 3, 2006

Regression in 0.9.9: Operation Flashpoint

by Riku Hintukainen

There seems to be a regression with Operation Flashpoint in wine-0.9.9, possibly because of the dx8->wine3d move. Should I file a bug, or wait if it gets fixed? Please cc since I' m not subscribed. $ wine ./FLASHPOINTRESISTANCE.EXE wine: Unhandled page fault on read access to 0x00000fd1 at address 0xfd1 (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on read access to 0x00000fd1 in 32-bit code (0x0 0000fd1). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:00000fd1 ESP:7fbcf1dc EBP:7fbcf298 EFLAGS:00210206( - 00 - RIP1) EAX:69c2c330 EBX:7bf87af8 ECX:7bf87af8 EDX:7fd5b3e0 ESI:7fd66830 EDI:00001e00 Stack dump: 0x7fbcf1dc: 7bf616a3 00000405 00001e00 00001e00 0x7fbcf1ec: 00001e00 00000000 7fd5b408 00000003 0x7fbcf1fc: 3f800000 7bf88620 00000000 00000000 0x7fbcf20c: 00000000 00000000 00000000 00001e00 0x7fbcf21c: 00001e00 00001e00 00000000 00001e00 0x7fbcf22c: 00001e00 00001e00 00001e00 00001e00 Backtrace: =>1 0x00000fd1 (0x00000fd1) 2 0x7bf73840 IWineD3DStateBlockImpl_InitStartupStateBlock+0xd90 in wined3d (0x 7bf73840) 3 0x7bf698f9 IWineD3DImpl_CreateDevice+0x229 in wined3d (0x7bf698f9) 4 0x7c23b958 IDirect3D8Impl_CreateDevice+0x108 in d3d8 (0x7c23b958) 5 0x004f3134 in flashpointresistance (+0xf3134) (0x004f3134) 0x00000fd1: addb %al,0x0(%eax) Modules: Module Address Debug info Name (79 modules) PE 0x00400000-007e1000 Export flashpointresistance PE 0x10000000-10032000 Deferred ifc22 PE 0x65f00000-65fc2000 Deferred ole32 ELF 0x69e59000-69e90000 Deferred dsound<elf> \-PE 0x69e70000-69e90000 \ dsound PE 0x69ea0000-69ef3000 Deferred rpcrt4 ELF 0x7bf00000-7bf03000 Deferred <wine-loader> ELF 0x7bf3c000-7bf89000 Export wined3d<elf> \-PE 0x7bf50000-7bf89000 \ wined3d ELF 0x7bf89000-7c000000 Deferred libglu.so.1 ELF 0x7c220000-7c240000 Export d3d8<elf> \-PE 0x7c230000-7c240000 \ d3d8 ELF 0x7e9fb000-7ea10000 Deferred midimap<elf> \-PE 0x7ea00000-7ea10000 \ midimap ELF 0x7eb2d000-7eb4e000 Deferred msacm32<elf> \-PE 0x7eb30000-7eb4e000 \ msacm32 ELF 0x7eb4e000-7ebe4000 Deferred libasound.so.2 ELF 0x7ebe5000-7ebfc000 Deferred msacm<elf> \-PE 0x7ebf0000-7ebfc000 \ msacm ELF 0x7ebfc000-7ec1d000 Deferred winealsa<elf> \-PE 0x7ec10000-7ec1d000 \ winealsa ELF 0x7ec40000-7ec5a000 Deferred imm32<elf> \-PE 0x7ec50000-7ec5a000 \ imm32 ELF 0x7ec5a000-7ec61000 Deferred libxrender.so.1 ELF 0x7ec62000-7ec79000 Deferred ximcp.so.2 ELF 0x7f3da000-7f562000 Deferred r200_dri.so ELF 0x7f562000-7f5be000 Deferred libgl.so.1 ELF 0x7f5be000-7f66c000 Deferred libx11.so.6 ELF 0x7f66c000-7f677000 Deferred libxext.so.6 ELF 0x7f677000-7f67b000 Deferred libxxf86vm.so.1 ELF 0x7f67b000-7f68f000 Deferred libice.so.6 ELF 0x7f68f000-7f700000 Deferred winex11<elf> \-PE 0x7f6a0000-7f700000 \ winex11 ELF 0x7f700000-7f71c000 Deferred libexpat.so.0 ELF 0x7f71c000-7f73e000 Deferred libfontconfig.so.1 ELF 0x7f73e000-7f7a0000 Deferred libfreetype.so.6 ELF 0x7f7a1000-7f7aa000 Deferred libgcc_s.so.1 ELF 0x7f7ad000-7f7b5000 Deferred libxcursor.so.1.0.2 ELF 0x7f7b5000-7f7b8000 Deferred libxrandr.so.2 ELF 0x7f7b8000-7f7eb000 Deferred dinput<elf> \-PE 0x7f7d0000-7f7eb000 \ dinput ELF 0x7f7eb000-7f7ff000 Deferred dinput8<elf> \-PE 0x7f7f0000-7f7ff000 \ dinput8 ELF 0x7f7ff000-7f81b000 Deferred iphlpapi<elf> \-PE 0x7f810000-7f81b000 \ iphlpapi ELF 0x7f81b000-7f840000 Deferred ws2_32<elf> \-PE 0x7f820000-7f840000 \ ws2_32 ELF 0x7f840000-7f859000 Deferred wsock32<elf> \-PE 0x7f850000-7f859000 \ wsock32 ELF 0x7f859000-7f86d000 Deferred lz32<elf> \-PE 0x7f860000-7f86d000 \ lz32 ELF 0x7f86d000-7f884000 Deferred version<elf> \-PE 0x7f870000-7f884000 \ version ELF 0x7f884000-7f8bb000 Deferred advapi32<elf> \-PE 0x7f890000-7f8bb000 \ advapi32 ELF 0x7f8bb000-7f93a000 Deferred gdi32<elf> \-PE 0x7f8d0000-7f93a000 \ gdi32 ELF 0x7f93a000-7fa47000 Deferred user32<elf> \-PE 0x7f950000-7fa47000 \ user32 ELF 0x7fa47000-7fac0000 Deferred winmm<elf> \-PE 0x7fa50000-7fac0000 \ winmm ELF 0x7fc05000-7fcf0000 Deferred kernel32<elf> \-PE 0x7fc20000-7fcf0000 \ kernel32 ELF 0x7fe00000-7fe02000 Deferred xlcutf8load.so.2 ELF 0x7fe02000-7fe07000 Deferred libxxf86dga.so.1 ELF 0x7fe07000-7fe0f000 Deferred libsm.so.6 ELF 0x7fe0f000-7fe19000 Deferred libnss_files.so.2 ELF 0x7fe19000-7fe23000 Deferred libnss_nis.so.2 ELF 0x7fe23000-7fe38000 Deferred libnsl.so.1 ELF 0x7fe38000-7fe40000 Deferred libnss_compat.so.2 ELF 0x7fe41000-7fe50000 Deferred libz.so.1 ELF 0x7fe5c000-7fe7f000 Deferred libm.so.6 ELF 0x7fe7f000-7ff75000 Deferred libwine_unicode.so.1 ELF 0x7ff75000-7ffe0000 Deferred ntdll<elf> \-PE 0x7ff90000-7ffe0000 \ ntdll ELF 0xb7dd4000-b7dd8000 Deferred libdl.so.2 ELF 0xb7dd8000-b7ef0000 Deferred libc.so.6 ELF 0xb7f5b000-b7f75000 Deferred libwine.so.1 ELF 0xb7f75000-b7f8c000 Deferred ld-linux.so.2 Threads: process tid prio (all id:s are in hex) 00000008 (D) C:\Program Files\Codemasters\Operation Flashpoint\FLASHPOINTRESISTA NCE.EXE 0000000b 15 0000000a 0 00000009 0 <==

March 3, 2006

Re: WINECFG: Eliminate some gcc 4.1 warnings caused by casts in macros.

by Mike McCormack

Francois Gouget wrote: > What are these warnings? What is causing them? Sorry, should have posted an explanation. The warning comes from code like this: char foo(x); #define bar(x) (int) foo(x) So for the example you gave from my patch: #define Header_SetImageList(hwnd,himl) \ (HIMAGELIST)SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl) We get a "computed value is not used" warning when we use Header_SetImageList without assigning the returned value to anything. I reported this in the gcc bugzilla some time ago, but the gcc team claim that this is a feature, not a bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25955 They would prefer that we use statement expressions, which are gcc specific, in our macros. Something like: #define Header_SetImageList(hwnd,himl) \ ({ HIMAGELIST r; \ r = (HIMAGELIST)SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl); \ r; }) Alexandre suggested that we use inline functions to solve this problem, however this requires including winuser.h when including windowsx.h, and that we choose SendMessageA or SendMessageW for the macros that deal with strings. Conceivably we could use: #ifdef HAVE_BORKED_GCC_COMPUTED_VALUE_NOT_USED_WARNING #define Header_SetImageList(hwnd,himl) \ ({ HIMAGELIST r; \ r = (HIMAGELIST)SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl); \ r; }) #else #define Header_SetImageList(hwnd,himl) \ (HIMAGELIST)SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl) #endif This requires use -DHAVE_BORKED_GCC_COMPUTED_VALUE_NOT_USED_WARNING when compiling Wine code and Winelib apps. > Do we really have to give up on the macros and use SendMessage directly > to avoid the warnings? If we do, then I would say this means the macros > are broken because it means Winelib users will get the same problem we > do and will have to modify their code or live with gobs of warnings. Yes, and it will be broken for WineLib. I quote Alexandre from IRC: <julliard> mike_m: hmm right, that's a PITA <mike_m> truely <julliard> i'd say get rid of windowsx.h then I agree this is not an ideal solution... let me know if you have any better ideas. Mike

March 3, 2006

Re: WINECFG: Eliminate some gcc 4.1 warnings caused by casts in macros.

by Francois Gouget

On Fri, 3 Mar 2006, Mike McCormack wrote: > ChangeLog: > Eliminate some gcc 4.1 warnings caused by casts in macros. What are these warnings? What is causing them? > - TreeView_SetImageList(tree, hImageList, TVSIL_STATE); > + SendMessageW( tree, LVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); Do we really have to give up on the macros and use SendMessage directly to avoid the warnings? If we do, then I would say this means the macros are broken because it means Winelib users will get the same problem we do and will have to modify their code or live with gobs of warnings. So, is there a way to fix the macros? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Avoid the Gates of Hell - use Linux.

March 3, 2006

Re: Launch native Linux apps?

by Stefan Dösinger

> Is it possible to set Wine up so that it can launch native Linux apps? For > example, set your native copy of Acrobat Reader to be associated to PDF > extensions in Wine, or even use the Linux plugin while using a browser? I have done this with Kmail and others. You have to add a few registry keys in HKCL and HKLM. Basically, you can launch any Linux app from wine by it's full path and pass command line arguments. There's of course the problem of converting Windows paths to Unix paths. At http://www.winehq.com/site/fun_projects my Kmail registry entries are described. For examples how to use Open Office, you have to google. I don't think that executing a Linux Plugin in a Win32 browser is possible, but cossover allows you to do the reverse. Stefan

March 3, 2006

Re: [wininet] More wininet tests InternetQueryOption and InternetSetOption - Corrected

by Vijay Kiran Kamuju

This is a detailed reply to ur mail. On 2/27/06, Detlef Riekenberg <wine.dev(a)web.de> wrote: > Am Mittwoch, den 22.02.2006, 23:13 +0530 schrieb Vijay Kiran Kamuju: > > Any thing wrong with this patch. > > Any Comments (expecting a lot) > > > > As you asked me, i took a look on this Patch. > > For my winspool-Patches, i was told to check the documented behavior and > only check undocumented behavior, when an Application relies on this > undocumented effect. > It's of course a good Idea, to print as much Informations as possible, > when a test Failed (err in your case). > > When i add a new Test, I add a trace after every tested API-Call, > compile the Test on linux with the mingw-crosstools as Windows-Binary > (make -C dlls/your_dllname_here/tests crosstest) and run that Binary on > all Windows-Versions that I have. After an update to the Parameter and > the Text for ok(), I do the tests on Windows again. > Then I test that Binary on wine. When there are no Failures left, i > remove the traces, compile again, test again, and after a final test in > wine with (make -C dlls/your_dllname_here/tests test), the diff is > created. > > > - Your Test did not apply here, so i merged the patch by cut & paste. > (malformed Patch) > > - I get 5 Failures on wine. (make -C dlls/wininet/tests test) > > > + hinet = InternetOpenA(useragent,INTERNET_OPEN_TYPE_DIRECT,NULL,NULL, > 0); > + ok((hinet != 0x0),"InternetOpen Failed\n"); > > - Please use (hinet != NULL) here, or is MSDN wrong (value / pointer)? > > - Does the other tests work, when InternetOpenA failed, or is it more > useful to return from the test here? > Just copied from http tests > > + SetLastError(0xdeadbeef); > + retval=InternetSetOptionA(hinet,INTERNET_OPTION_USER_AGENT, &inagent, > sizeof(inagent)); > + err=GetLastError(); > + ok(retval == 1,"Got wrong return value %d\n",retval); > + ok(err == 0xdeadbeef, "Got wrong error code %ld\n",err); > > For the Example above, my Idea is: > ok(retval, "returned %d with %ld (expected '!= 0')\n", retval, err); > Well due our partial implementation, we have not correctly implemented returning all the error states. Hence it requires seperate tests for error messages. > + len=0; > + SetLastError(0xdeadbeef); > + buffer=HeapAlloc(GetProcessHeap(),0,len); > + retval = > InternetQueryOptionW(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); > + err=GetLastError(); > + ok(buffer != NULL,"Output Buffer Should Not be Set"); > + todo_wine ok(len == 38,"Got wrong user agent length %ld instead of %d > \n",len,38); > + > > - You use HeapAlloc with a len of 0 and than the test "buffer != NULL": > This is a Test for HeapAlloc How to create a buffer with zero length does simple buffer = NULL suffice, i dont think so > - InternetQueryOptionW is not implemented in win95/98/me Will put a check for that once the base gets thru. > - Please avoid fixed numbers. When someone changes the Agent-Name, > the complete Test must be reworked. In most other tests we use basenumbers as well, i dont prefer using other functions in it. If there is a bug in their implementation, this test get affected. Each test case should be independent and atomic > > > For the tests of the W-Functions: > I was told, that i should test the Unicode-Functions only, when there > are other results as from the ANSI-Version. Since our ANSI - > Implementations should call the Unicode-Function, the ANSI-Test > validates both Implementations. > (Yes, i knew that the Implementation in wine is sometimes wrong: we have > Crosscalls W->A and some Unicode-Functions are stubs while the > ANSI-Versions are implemented) I am testing the both Unicode and Ansi Versions. If u are concerned about SetOptionW, i have made tests for this because our implementation for it is flawed. > > > + WideCharToMultiByte(CP_ACP,0,(WCHAR *)buffer,-1,tmpbuffer,len,0,0); > + todo_wine ok(!strcmp(inagent,tmpbuffer),"Got wrong user agent string % > s instead of %s\n",tmpbuffer,inagent); > > - This Test failed on Windows XP > Have to look into this. How to Compare char string and wchar string. > > + retval = InternetSetOptionW(NULL,INTERNET_OPTION_USER_AGENT, > &inpbuffer, sizeof(inpbuffer)); > You use ANSI-Parameter for an UNICODE-Function. > This is a test for bad programming ;) > > You can take a look at the Tests for winspool/GetPrinterDriverDirectory > - A test with the documented use to get the required size for the Buffer > (buffersize=0) > - A test with documented use (all Options valid) > - Buffer is larger (must succeed) > - Buffer is to small (must fail with a specific ERROR_*) > (Other Functions may truncate the returned Data) > - without a buffer (NULL), but with the correct buffersize. > This is for testing the API, when the app was unable to allocate > the Buffer, but did not check the Result of the allocation. > I will look into them > > > So there are some Reasons, why the test is not Ready yet. > > I read the Docs about InternetQueryOption on MSDN and IMHO there are so > many Documented values for dwOption, that I suggest to start with a > testing-table and fill it with all of our implemented Options for > InternetQueryOption / InternetSetOption. > We have then a complete Test of our wininet-Implementation with only a > small amount of code. The Table can grow very easy, when Applications > use Options that we need to implement. I wrongly chose to implement the INTERNET_OPTION_USER_AGENT, hence i am writing the tests for those. So that my implementation gets thru. I have tests for other options also in my mind. > > > -- > By By ... > ... Detlef > > Cheers, Vijay

March 3, 2006

Re: [wininet] More wininet tests InternetQueryOption and InternetSetOption - Corrected

by Vijay Kiran Kamuju

Thanks a lot on reviewing my patch, I have been busy lately. So i could not reply u soon enough. I will make some changes and send it to u for review. Thanks, Vijay On 2/27/06, Detlef Riekenberg <wine.dev(a)web.de> wrote: > Am Mittwoch, den 22.02.2006, 23:13 +0530 schrieb Vijay Kiran Kamuju: > > Any thing wrong with this patch. > > Any Comments (expecting a lot) > > > > As you asked me, i took a look on this Patch. > > For my winspool-Patches, i was told to check the documented behavior and > only check undocumented behavior, when an Application relies on this > undocumented effect. > It's of course a good Idea, to print as much Informations as possible, > when a test Failed (err in your case). > > When i add a new Test, I add a trace after every tested API-Call, > compile the Test on linux with the mingw-crosstools as Windows-Binary > (make -C dlls/your_dllname_here/tests crosstest) and run that Binary on > all Windows-Versions that I have. After an update to the Parameter and > the Text for ok(), I do the tests on Windows again. > Then I test that Binary on wine. When there are no Failures left, i > remove the traces, compile again, test again, and after a final test in > wine with (make -C dlls/your_dllname_here/tests test), the diff is > created. > > > - Your Test did not apply here, so i merged the patch by cut & paste. > (malformed Patch) > > - I get 5 Failures on wine. (make -C dlls/wininet/tests test) > > > + hinet = InternetOpenA(useragent,INTERNET_OPEN_TYPE_DIRECT,NULL,NULL, > 0); > + ok((hinet != 0x0),"InternetOpen Failed\n"); > > - Please use (hinet != NULL) here, or is MSDN wrong (value / pointer)? > > - Does the other tests work, when InternetOpenA failed, or is it more > useful to return from the test here? > > > + SetLastError(0xdeadbeef); > + retval=InternetSetOptionA(hinet,INTERNET_OPTION_USER_AGENT, &inagent, > sizeof(inagent)); > + err=GetLastError(); > + ok(retval == 1,"Got wrong return value %d\n",retval); > + ok(err == 0xdeadbeef, "Got wrong error code %ld\n",err); > > For the Example above, my Idea is: > ok(retval, "returned %d with %ld (expected '!= 0')\n", retval, err); > > + len=0; > + SetLastError(0xdeadbeef); > + buffer=HeapAlloc(GetProcessHeap(),0,len); > + retval = > InternetQueryOptionW(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); > + err=GetLastError(); > + ok(buffer != NULL,"Output Buffer Should Not be Set"); > + todo_wine ok(len == 38,"Got wrong user agent length %ld instead of %d > \n",len,38); > + > > - You use HeapAlloc with a len of 0 and than the test "buffer != NULL": > This is a Test for HeapAlloc > - InternetQueryOptionW is not implemented in win95/98/me > - Please avoid fixed numbers. When someone changes the Agent-Name, > the complete Test must be reworked. > > > For the tests of the W-Functions: > I was told, that i should test the Unicode-Functions only, when there > are other results as from the ANSI-Version. Since our ANSI - > Implementations should call the Unicode-Function, the ANSI-Test > validates both Implementations. > (Yes, i knew that the Implementation in wine is sometimes wrong: we have > Crosscalls W->A and some Unicode-Functions are stubs while the > ANSI-Versions are implemented) > > > + WideCharToMultiByte(CP_ACP,0,(WCHAR *)buffer,-1,tmpbuffer,len,0,0); > + todo_wine ok(!strcmp(inagent,tmpbuffer),"Got wrong user agent string % > s instead of %s\n",tmpbuffer,inagent); > > - This Test failed on Windows XP > > > + retval = InternetSetOptionW(NULL,INTERNET_OPTION_USER_AGENT, > &inpbuffer, sizeof(inpbuffer)); > You use ANSI-Parameter for an UNICODE-Function. > > > You can take a look at the Tests for winspool/GetPrinterDriverDirectory > - A test with the documented use to get the required size for the Buffer > (buffersize=0) > - A test with documented use (all Options valid) > - Buffer is larger (must succeed) > - Buffer is to small (must fail with a specific ERROR_*) > (Other Functions may truncate the returned Data) > - without a buffer (NULL), but with the correct buffersize. > This is for testing the API, when the app was unable to allocate > the Buffer, but did not check the Result of the allocation. > > > > So there are some Reasons, why the test is not Ready yet. > > I read the Docs about InternetQueryOption on MSDN and IMHO there are so > many Documented values for dwOption, that I suggest to start with a > testing-table and fill it with all of our implemented Options for > InternetQueryOption / InternetSetOption. > We have then a complete Test of our wininet-Implementation with only a > small amount of code. The Table can grow very easy, when Applications > use Options that we need to implement. > > > -- > By By ... > ... Detlef > >

March 3, 2006

BadMatch in glXCreateGLXPixmap (bug 3102)

by Damjan Jovanovic

"Star wars: knights of the old republic" dies on startup (see bug 3102) with BadMatch when create_glxpixmap() calls glXCreateGLXPixmap(). The man page for glXCreateGLXPixmap: GLXPixmap glXCreateGLXPixmap( Display *dpy, XVisualInfo *vis, Pixmap pixmap ) BadMatch is generated if the depth of pixmap does not match the depth value reported by core X11 for vis, or if pixmap was not created with respect to the same screen as vis. So can any xlib expert here give me some code to check for those 2 cases? Any other ideas what could be wrong? I believe a PBUFFER is involved, not the actual screen. Thanks Damjan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

March 3, 2006

Re: Recently created font problem - anyone see similar?

by Dmitry Timoshkov

"Dr J A Gow" <J.A.Gow(a)furrybubble.co.uk> wrote: > I found that the following patch, committed to CVS on 23/02/06 > at 20:33:06 made all my Wine system fonts squashed up and unreadable, which > in turn made a mess of formatting in some dialog boxes. I backed the > patch out from a current tree and the problem went away. Anyone else see > this behaviour? I am wondering what the purpose of this patch is as > the fonts were quite OK before it was committed, and now they are > completely unreadable on this system. Any thoughts before I submit a > patch to put this back the way it was? This usially means that you have no Wine bitmap fonts installed in windows/fonts. I sent a patch to wineprefixcreate to install them by default, by Alexandre rejected it. -- Dmitry.

March 2, 2006

Launch native Linux apps?

by Rich Gilson

Is it possible to set Wine up so that it can launch native Linux apps? For example, set your native copy of Acrobat Reader to be associated to PDF extensions in Wine, or even use the Linux plugin while using a browser? If so, how do I accomplish this? -- -- In a world without fences, who needs Gates?

March 2, 2006

Re: Recently created font problem - anyone see similar?

by Andrew Z

Dr J A Gow <J.A.Gow <at> furrybubble.co.uk> writes: > I found that the following patch, committed to CVS on 23/02/06 > at 20:33:06 made all my Wine system fonts squashed up and unreadable, which > in turn made a mess of formatting in some dialog boxes. I backed the > patch out from a current tree and the problem went away. Anyone else see > this behaviour? I am wondering what the purpose of this patch is as > the fonts were quite OK before it was committed, and now they are > completely unreadable on this system. Any thoughts before I submit a > patch to put this back the way it was? I had this problem too: http://bugs.winehq.org/show_bug.cgi?id=4682 I like the old behavior, and I don't like the solution of copying the fonts to the /usr/share/fonts because I want to be able to build WINE from source and run it from ~/wine without root permission (to install the fonts). Andrew

March 2, 2006

Re: DirectDraw -> WineD3D patch

by Aric Cyr

Stefan Dösinger <stefandoesinger <at> gmx.at> writes: > > Hi, > I've brought my DirectDraw over WineD3D patch in a form where I want to show > it to the public for review. I've uploaded it to > http://stud4.tuwien.ac.at/~e0526822/ , where it is described in detail(below > the game list). > Sweet! Looking forward to playing with this over the weekend. Seems like you are getting decent performance out of that radeon mobility 9000. I'll take a look at the OpenGL problem you list on the page and see if I can help (I love OpenGL, so any excuse to play with it is a good one) :) Good work! Hope your exams didn't suffer because of this ;) Regards, Aric

March 2, 2006

Recently created font problem - anyone see similar?

by Dr J A Gow

Hi, I found that the following patch, committed to CVS on 23/02/06 at 20:33:06 made all my Wine system fonts squashed up and unreadable, which in turn made a mess of formatting in some dialog boxes. I backed the patch out from a current tree and the problem went away. Anyone else see this behaviour? I am wondering what the purpose of this patch is as the fonts were quite OK before it was committed, and now they are completely unreadable on this system. Any thoughts before I submit a patch to put this back the way it was? John. The offending patch: Module: wine Branch: refs/heads/master Commit: 69a23a608eea59624b2f37ab424e0f42b3da5baf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69a23a608eea59624b2f37a… Author: Dmitry Timoshkov <dmitry at codeweavers.com> Date: Thu Feb 23 20:33:06 2006 +0800 gdi: Use "MS Sans Serif" as default sans serif font, not Arial. --- dlls/gdi/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index ad0d6eb..51e92b8 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -284,10 +284,10 @@ static struct list font_list = LIST_INIT static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ', 'R','o','m','a','n','\0'}; -static const WCHAR defSans[] = {'A','r','i','a','l','\0'}; +static const WCHAR defSans[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; -static const WCHAR defSystem[] = {'A','r','i','a','l','\0'}; +static const WCHAR defSystem[] = {'S','y','s','t','e','m','\0'}; static const WCHAR SystemW[] = {'S','y','s','t','e','m','\0'}; static const WCHAR MSSansSerifW[] = {'M','S',' ','S','a','n','s',' ', 'S','e','r','i','f','\0'};

March 2, 2006