wine-devel

wine-devel@winehq.org

10 participants
84459 discussions

strange problem on mdk10
by Ivan 13 Jul '04

13 Jul '04

on my laptop wine just starts and doesn't do anything. In addition to this, ps -A, ctrl+c, ctrl+z, the kde system guard and all tools that popup a box to ask for root password all stop working. Attached is a relay log. Any ideas?

2 1

Re: Fix snprintfW Return Value
by Alexandre Julliard 12 Jul '04

12 Jul '04

Rob Shearman <rob(a)codeweavers.com> writes: > On Fri, 2004-07-09 at 19:55, Alexandre Julliard wrote: >> Actually, something does depend on it: it is used to implement >> _vsnwprintf in ntdll, so you can't change it. > > How about this updated patch then? No, vsnprintfW is used directly in ntdll.spec, you can't change it. And really, all the profile code uses it for is %s formats, it can easily be replaced by strcpy which would also avoid the need to build the string twice. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: PATCH: tests/vartype gcc fix
by Alexandre Julliard 12 Jul '04

12 Jul '04

Marcus Meissner <marcus(a)jet.franken.de> writes: > Illegal lvalue casts in tests/vartype.c spotted by new compiler. Also > the format strings were wrong for long longs. Long long format strings are not portable, they shouldn't be used. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: added API documentation to advapi32/crypt.c
by Mike Hearn 12 Jul '04

12 Jul '04

Wow, go truiken! This sort of stuff is really handy, it's so much easier to document wierd stuff in the Wine API docs than rely on MSDN and peoples memories. Good work! On Mon, 2004-07-12 at 02:44 -0500, truiken(a)gmail.com wrote: > Changelog > * Added API documentation to most crypt.c functions

1 0

Status of MSI
by Mike McCormack 12 Jul '04

12 Jul '04

Hi All, I've completed the merge of the work Aric and I have done to date on MSI. Some programs that use and do not package the MSI installer may start to work. We still have no implementation of msiexec.exe, so there is still no method to install .msi files directly, however not all MSI based installs require msiexec.exe. (It's fairly easy to implement if anybody wishes to volunteer...) Consider adding "msi" = "native, builtin" to your Wine configuration files, and not installing the MSI redistributables straight away when you encounter an installer that uses msi.dll :) Let us know what bugs that turns up. thanks, Mike

6 6

Stack blowout in _w95_dump_dke
by wine＠troy.rollo.name 12 Jul '04

12 Jul '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 _w95_dump_dke has code in it that processes sibling keys in the registry recursively. This results in a stack blowout for large registries (in my case in the Software\CLASSES key). It's trivial to stop the stack blowing out by changing this not to be recursive, but processing siblings recursively is such an unusual thing to do that I suspect it must have been done for a reason. Attached is the way I've "fixed" it, but this causes the keys to be output in the opposite order to the way they are output with the CVS code. Is there a reason this needs to be done in the order the CVS code is doing it? -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQFA8bbd2IoBoXB5Q0kRAoJEAJ9IbtBVxkly+8t8LPL2ZmD/RVwq6wCdHG2t QxlBYcbU/VVdeXLx0QVgQlo= =ZSKw -----END PGP SIGNATURE-----

2 1

Re: Add a 16-bit pair DLL for TWAIN
by Andreas Mohr 11 Jul '04

11 Jul '04

On Thu, Jul 08, 2004 at 06:26:12PM +0100, Mike Hearn wrote: > This is probably wrong in some aspects as this is the first time I have > done a 16 bit pair DLL, but the Office XP installer never actually calls > it, it just loads it in order to get the version information. > > The main problem is that I can't find way to dump the exports of a 16 bit DLL. > winedump can't do that. So, as the 32 bit DLL has only one entry point, I assumed > it was the same for the 16 bit version. nedump.exe or exedump.exe or so. Greetings, Andreas Mohr

2 1

call to unimplemented function secur32.dll.GetComputerObjectNameW
by Saulius Krasuckas 11 Jul '04

11 Jul '04

I stuck at this while trying to install "Microsoft Visual C++ Express 2005 Beta" (large package for offline installation): trace:module:process_attach (L"secur32.dll",(nil)) - END fixme:seh:EXC_RtlRaiseException call to unimplemented function secur32.dll.GetComputerObjectNameW trace:module:GetModuleFileNameW L"D:\\msdownld.tmp\\IXP000.TMP\\install.exe" <skip /> trace:module:GetModuleFileNameW L"D:\\msdownld.tmp\\IXP000.TMP\\install.exe" err:seh:setup_exception nested exception on signal stack in thread 000d eip 400dddc6 esp 40015c6c stack 0x40660000-0x40760000 trace:module:LdrShutdownProcess () MS documents some things [1] about the GetComputerObjectNameW() function in the Platform SDK: * Header: Declared in Secext.h; include Security.h. AFAICS Wine has no "secext.h" file in its "include/" directory. Where should I declare this function and the enumeration it uses [2] would I start implementing the function? [1] http://msdn.microsoft.com/library/shared/deeptree/asp/rightframe.asp?dtcfg=… [2] http://msdn.microsoft.com/library/shared/deeptree/asp/rightframe.asp?dtcfg=…

1 0

Marshal bug
by Duane Clark 11 Jul '04

11 Jul '04

Howdy, This patch: http://www.winehq.org/hypermail/wine-cvs/2004/05/0283.html causes a crash within Actel Designer (commercial FPGA design software). Reverting the patch with current CVS fixes the application. A trace and crash dump look like > wine /c/Actel/bin/designer.exe trace:ole:DllMain 0x40ea0000 0x1 0x1 trace:ole:DllMain (0x41030000,1,0x1) trace:ole:OleInitialize ((nil)) trace:ole:CoInitializeEx ((nil), 2) trace:ole:CoInitializeEx () - Initializing the COM libraries trace:ole:RunningObjectTableImpl_Initialize () trace:ole:OleInitialize () - Initializing the OLE libraries trace:ole:OLEClipbrd_Initialize () fixme:ole:CoRegisterMessageFilter stub trace:ole:RegisterDragDrop (0x10040,0x41fc1ddc) trace:ole:UuidCreate {8b881308-d111-11d8-8790-002078041c53} trace:ole:__CLSIDFromStringA {A111826C-DB40-11d2-8D34-0008C7523E29} -> 0x4073f218 trace:ole:WINE_StringFromCLSID 0x4073f218->{A111826C-DB40-11D2-8D34-0008C7523E29} trace:ole:CoLoadLibrary (L"C:\\Actel/bin/comdesign.dll", 0) trace:ole:CoCreateFreeThreadedMarshaler (0x41fc6a60 0x41fc6a74) trace:ole:__CLSIDFromStringA {4B95E7E3-6EC5-11D2-BA21-0008C7A01E5D} -> 0x4073f870 trace:ole:WINE_StringFromCLSID 0x4073f870->{4B95E7E3-6EC5-11D2-BA21-0008C7A01E5D} trace:ole:CoLoadLibrary (L"C:\\Actel/bin/timingui.dll", 0) trace:ole:__CLSIDFromStringA {F70AA652-C79A-11d2-BA4B-0008C7A01E5D} -> 0x4073f66c trace:ole:WINE_StringFromCLSID 0x4073f66c->{F70AA652-C79A-11D2-BA4B-0008C7A01E5D} trace:ole:CoLoadLibrary (L"C:\\Actel/bin/taiming.dll", 0) err:toolbar:TOOLBAR_GetImageListForDrawing bitmap for ID 0, index 0 is not valid, number of bitmaps in imagelist: 0 err:toolbar:TOOLBAR_GetImageListForDrawing bitmap for ID 0, index 0 is not valid, number of bitmaps in imagelist: 0 err:toolbar:TOOLBAR_GetImageListForDrawing bitmap for ID 0, index 0 is not valid, number of bitmaps in imagelist: 0 err:toolbar:TOOLBAR_GetImageListForDrawing bitmap for ID 0, index 0 is not valid, number of bitmaps in imagelist: 0 trace:ole:CoMarshalInterThreadInterfaceInStream ({27a4f276-6452-11d2-ba1d-0008c7a01e5d}, 0x43932bf8, 0x4073f9e8) trace:ole:CoMarshalInterface (0x402b4180, {27a4f276-6452-11d2-ba1d-0008c7a01e5d}, 0x43932bf8, 3, (nil), 0) trace:ole:_StubMgrThread Stub Manager Thread starting on (\\.\pipe\WINE_OLE_StubMgr_00000008) trace:ole:CoCreateFreeThreadedMarshaler (0x41fc72f0 0x41fc7348) trace:ole:IiFTMUnknown_fnQueryInterface trace:ole:FTMarshalImpl_AddRef fixme:ole:FTMarshalImpl_GetUnmarshalClass (), stub! fixme:ole:FTMarshalImpl_MarshalInterface (), stub! trace:ole:FTMarshalImpl_Release trace:ole:CoInitializeEx ((nil), 2) trace:ole:CoGetInterfaceAndReleaseStream (0x402b4180, {27a4f276-6452-11d2-ba1d-0008c7a01e5d}, 0x46cb413c) trace:ole:CoUnmarshalInterface (0x402b4180,{27a4f276-6452-11d2-ba1d-0008c7a01e5d},0x46cb413c) trace:ole:WINE_StringFromCLSID 0x46cb4014->{402B4180-FA0C-40EE-EBF8-EE40F0CE5360} trace:ole:CoGetClassObject CLSID: {402b4180-fa0c-40ee-ebf8-ee40f0ce5360}, IID: {00000001-0000-0000-c000-000000000046} warn:ole:CoGetClassObject class {402B4180-FA0C-40EE-EBF8-EE40F0CE5360} not registred trace:ole:WINE_StringFromCLSID 0x46cb4014->{402B4180-FA0C-40EE-EBF8-EE40F0CE5360} trace:ole:WINE_StringFromCLSID 0x46cb4014->{402B4180-FA0C-40EE-EBF8-EE40F0CE5360} fixme:ole:CoCreateInstance no classfactory created for CLSID {402b4180-fa0c-40ee-ebf8-ee40f0ce5360}, hres is 0x80040150 fixme:ole:CoUnmarshalInterface Failed to create instance of unmarshaller {402b4180-fa0c-40ee-ebf8-ee40f0ce5360}. wine: Unhandled exception (thread 000d), starting debugger... fixme:console:SetConsoleCtrlHandler (0x4066a5e0,1) - no error checking or testing yet WineDbg starting on pid 0x8 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x6051b58f). In 32 bit mode. err:dbghelp_msc:pdb_process_file -Unable to peruse .PDB file e:\users\ChiJ\objs\pc_4.0.3.5\timingui\msobj\timingui.pdb 0x6051b58f: movl 0x0(%eax),%ecx Wine-dbg>bt Backtrace: =>1 0x6051b58f (0x46cb4160) 2 0x40374e57 THREAD_Start+0xef(ptr=0x402b3dd8) [thread.c:107] in kernel32 (0x46cb4234) 3 0x400a2f23 start_thread+0x147(info=0x402b05e0) [thread.c:199] in ntdll (0x46cb4a70) 4 0x40043484 start_thread+0x64 in libpthread.so.0 (0x46cb4a94) 5 0x420df147 __clone+0x57 in libc.so.6 (0x00000000) Wine-dbg>

3 7

Missing SHLWAPI function
by Flameeyes 11 Jul '04

11 Jul '04

Hi, I was trying a small program wrote in Visual Basic by a friend of mine. A part from missing ActiveX he used to display data, it seems to work, but when it's closed, there's an unhandled exception, and there're some errors about SHLWAPI: err:module:import_dll No implementation for SHLWAPI.dll._SHGetInstanceExplorer@4 imported from L"C \\WINDOWS\\SYSTEM\\BROWSEUI.DLL", setting to 0xdeadbeef [...] fixme:seh:EXC_RtlRaiseException call to unimplemented function shlwapi.dll.IUnknown_GetSite wine: Unhandled exception (thread 0012), starting debugger... using native shlwapi, it doesn't crash at close, but the first message is printed anyway. There are still other errors and problems, I'm trying to search which native dlls are needed to run it quite correctly. Another problem I found is that scrolling down a richedit object (after put riched32 as native) throws an unhandled exception. If someone want's to give it a try and help me get it working, it's FileXplorer at www.sepham.com . -- Diego "Flameeyes" Pettenò dgp85(a)users.sourceforge.net - http://flameeyes.web.ctonet.it/

1 0

Re: New WNEGRAPHICSDRIVER env var
by Vincent Béron 10 Jul '04

10 Jul '04

Le sam 10/07/2004 à 11:37, Vincent Béron a écrit : > Changelog: > Create a WINEGRAPHICSDRIVER env var to override either the config value > or the default value (in user and gdi). Please disregard, there's a problem with the patch (changed the default value in gdi to ttydrv). I'll send an updated patch. Vincent

1 0

ioctl(/dev/dsp, SNDCTL_DSP_SETDUPLEX) failed
by Saulius Krasuckas 10 Jul '04

10 Jul '04

With thepatch [1] I am getting some this line from Wine: err:wave:OSS_RawOpenDevice ioctl(/dev/dsp, SNDCTL_DSP_SETDUPLEX) failed (Input/output error) Yes, my soundcard doesn't support full duplex, I believe (I have OPTi 82c931 chip with mad16 driver running here). But shouldn't the type of the message be WARN or TRACE instead of ERR then? [1] http://cvs.winehq.org/patch.py?id=12636

2 1

Re: Initial creation of directory and config with ttydrv
by Shachar Shemesh 10 Jul '04

10 Jul '04

brettholcomb(a)charter.net wrote: >Just run wine. The first time it will create the directory. > > > >>From: Shachar Shemesh <wine-devel(a)shemesh.biz> >>Date: 2004/07/08 Thu AM 11:35:21 GMT >>To: Wine Development <wine-devel(a)winehq.org> >>Subject: Initial creation of directory and config with ttydrv >> >>Hi all, >> >>I need to create the initial environment for wine (the .wine directory) >>in an environment where no X11 server is available. Once the directory >>is up (for example, if I copy it from somewhere), there is no problem to >>add a config file that chooses the ttydrv driver. However, I cannot >>create the initial directory. >> >>Is there any solution to this problem, or should I just copy the initial >>config from somewhere? >> >> Shachar >> >> Wine won't run if it is set to use the X11drv driver, and there is no X11 display. Then again, the only way I can tell it to use the ttydrv is by placing a config file in the .wine directory, which does not exist until I run wine once. Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

4 7

Re: D3D8_GetCreationParameters fix
by Andrei Barbu 10 Jul '04

10 Jul '04

MSDN says that if it's given an invalid pointer it should return D3DERR_INVALIDCALL, so that's what it does now. MSDN: http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… So I'm guessing this is right now. I don't have a windows computer to check this against, but it does comply with the docs. Andrei On Fri, 2004-07-09 at 11:19, Mike McCormack wrote: > This patch is better than the first one, but... > > Windows doesn't usually check pointers like this. Can you try testing > the Windows implementation of IDirect3DDevice8->GetCreationParameters() > to see whether it crashes when passed an invalid pointer such as NULL or > 0x00000001? It may be that the invalid pointer is coming from somewhere > else in Wine's code, so you may be just hiding another bug. > > Mike > > Andrei Barbu wrote: > > And this is the correct patch. > > > @@ -380,6 +381,12 @@ > > HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(LPDIRECT3DDEVICE8 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { > > ICOM_THIS(IDirect3DDevice8Impl,iface); > > TRACE("(%p) copying to %p\n", This, pParameters); > > + > > + if( IsBadWritePtr( pParameters , sizeof( D3DDEVICE_CREATION_PARAMETERS ) ) ) > > + { > > + WARN("(%p) : bad pointer in device caps (%p)\n", This, pParameters); > > + return D3DERR_INVALIDCALL; > > + } > > memcpy(pParameters, &This->CreateParms, sizeof(D3DDEVICE_CREATION_PARAMETERS)); > > return D3D_OK; > > } > >

4 7

Re: MSI: implement MsiVerifyPackage, cosmetic fixes (with the patch)
by Mike McCormack 09 Jul '04

09 Jul '04

Mike McCormack wrote: > > This is the last change required to sync up the CrossOver's current MSI > implementation with WineHQs. > > Mike > > > ChangeLog: > * implement MsiVerifyPackage, cosmetic fixes > diff -ur dlls/msi/action.c /home/mike/codeweavers/office/wine/dlls/msi/action.c --- dlls/msi/action.c 2004-07-09 14:07:57.000000000 -0500 +++ /home/mike/codeweavers/office/wine/dlls/msi/action.c 2004-06-28 15:01:36.000000000 -0500 @@ -3023,7 +3023,7 @@ } /* - * components FeatureState defaults to FALSE. the idea is we want to + * Components FeatureState defaults to FALSE. The idea is we want to * enable the component is ANY feature that uses it is enabled to install */ for(i = 0; i < package->loaded_features; i++) @@ -3050,7 +3050,7 @@ if (override != NULL) HeapFree(GetProcessHeap(),0,override); /* - * so basically we ONLY want to install a component if its Enabled AND + * So basically we ONLY want to install a component if its Enabled AND * FeatureState are both TRUE */ return ERROR_SUCCESS; @@ -3303,10 +3303,10 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package) { /* - * ok this is a bit confusting.. I am given a _Component key and i believe + * OK this is a bit confusing.. I am given a _Component key and I believe * that the file that is being registered as a type library is the "key file - * of that component" which i interpert to mean "The file in the KeyPath of - * that component" + * of that component" which I interpret to mean "The file in the KeyPath of + * that component". */ UINT rc; MSIQUERY * view; @@ -3388,8 +3388,8 @@ debugstr_w(package->files[index].TargetPath)); else { - /* yes the row has more fields than i need, but #1 is - correct and the only one i need. why make a new row */ + /* Yes the row has more fields than I need, but #1 is + correct and the only one I need. Why make a new row? */ ui_actiondata(package,szRegisterTypeLibraries,row); @@ -3533,8 +3533,8 @@ static UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) { /* - * Again I am assuming the words, "Whose key file respesents" when refering - * to a Component as to mean the Components KeyPath file + * Again I am assuming the words, "Whose key file represents" when refering + * to a Component as to meaning that Components KeyPath file * * Also there is a very strong connection between ClassInfo and ProgID * that I am mostly glossing over. @@ -3811,12 +3811,12 @@ static UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) { /* - * Sigh, here i am just brute force registering all progid + * Sigh, here I am just brute force registering all progids * this needs to be linked to the Classes that have been registerd * but the easiest way to do that is to load all these stuff into * memory for easy checking. * - * gives me something to continue to work toward + * Gives me something to continue to work toward. */ UINT rc; MSIQUERY * view; diff -ur dlls/msi/cond.y /home/mike/codeweavers/office/wine/dlls/msi/cond.y --- dlls/msi/cond.y 2004-07-09 13:34:00.000000000 -0500 +++ /home/mike/codeweavers/office/wine/dlls/msi/cond.y 2004-06-28 14:58:46.000000000 -0500 @@ -57,8 +57,6 @@ static LPWSTR COND_GetString( struct cond_str *str ); static int COND_lex( void *COND_lval, COND_input *info); -UINT get_property(MSIHANDLE hPackage, const WCHAR* prop, WCHAR* value, - DWORD* size); typedef INT (*comp_int)(INT a, INT b); typedef INT (*comp_str)(LPWSTR a, LPWSTR b, BOOL caseless); diff -ur dlls/msi/package.c /home/mike/codeweavers/office/wine/dlls/msi/package.c --- dlls/msi/package.c 2004-07-09 14:15:00.000000000 -0500 +++ /home/mike/codeweavers/office/wine/dlls/msi/package.c 2004-07-02 15:07:40.000000000 -0500 @@ -254,7 +254,7 @@ 'D','e','s','k','t','o','p','\\',0}; /* - * Other things i notice set + * Other things I notice set * ScreenY ScreenX --- dlls/msi/msi.c 2004-07-09 14:07:57.000000000 -0500 +++ /home/mike/codeweavers/office/wine/dlls/msi/msi.c 2004-06-28 15:06:37.000000000 -0500 @@ -1180,14 +1181,38 @@ UINT WINAPI MsiVerifyPackageA( LPCSTR szPackage ) { - FIXME("%s\n", debugstr_a(szPackage) ); - return ERROR_CALL_NOT_IMPLEMENTED; + UINT r, len; + LPWSTR szPack = NULL; + + TRACE("%s\n", debugstr_a(szPackage) ); + + if( szPackage ) + { + len = MultiByteToWideChar( CP_ACP, 0, szPackage, -1, NULL, 0 ); + szPack = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if( !szPack ) + return ERROR_OUTOFMEMORY; + MultiByteToWideChar( CP_ACP, 0, szPackage, -1, szPack, len ); + } + + r = MsiVerifyPackageW( szPack ); + + HeapFree( GetProcessHeap(), 0, szPack ); + + return r; } UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage ) { - FIXME("%s\n", debugstr_w(szPackage) ); - return ERROR_CALL_NOT_IMPLEMENTED; + MSIHANDLE handle; + UINT r; + + TRACE("%s\n", debugstr_w(szPackage) ); + + r = MsiOpenDatabaseW( szPackage, MSIDBOPEN_READONLY, &handle ); + MsiCloseHandle( handle ); + + return r; } INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent,

1 0

Re: Fix snprintfW Return Value
by Alexandre Julliard 09 Jul '04

09 Jul '04

Rob Shearman <rob(a)codeweavers.com> writes: > At present, if the size of the buffer passed to snprintfW is too small > then the function returns -1, as opposed to the required size of the > buffer (as per C snprintf). This greatly limits its usefulness and can > give incorrect results for those using the function that don't > explicitly check for -1 being returned. A grep of the source tree shows > that nothing depends on this behaviour. Actually, something does depend on it: it is used to implement _vsnwprintf in ntdll, so you can't change it. -- Alexandre Julliard julliard(a)winehq.org

2 2

support code for HANDLE tables
by Michael Jung 09 Jul '04

09 Jul '04

Hello, I'm currently playing around with the rsabase.dll implementation. Since this is the first time I'm writing wine code, I've got some questions: Is there support code for managing HANDLE tables? Or does every dll implementation provide it's own functions for doing this? Or do HANDLEs of each and every kind have to be administered by wineserver? The current CVS version of rsabase just casts between pointers and HCRYPTPROVs. Is this just a quick and dirty hack or common practice? Greetings and thanks, Michael -- Michael Jung, MSc Be liberal in what you accept, Integrated Circuits and Systems Lab and conservative in what you send. University of Technology, Darmstadt -- Jonathan Postel, Internet Pioneer phone: +49(6151)16-6692 / email: mjung(a)iss.tu-darmstadt.de

3 2

Re: D3D8_GetCreationParameters fix
by Andrei Barbu 09 Jul '04

09 Jul '04

I don't personally know enough about IsBadWritePtr to write a test case. Any suggestions? :P I'll check out the code later on, but for now it seems to be fine. What else could it use to validate that pointer? Andrei On Fri, 2004-07-09 at 15:02, Mike McCormack wrote: > Andrei Barbu wrote: > > > I think even if a wine bug might be generating that bad pointer, which I > > don't think it is since Chessmaster works fine after that, this is how > > DX works, so we should implement it. If it doesn't crash on windows, why > > should it in wine? > > It is rare that Windows uses IsBadWritePtr to validate arguments, so if > you believe it works that way, prove it by writing a test case and > running it on a Windows box. Somebody is going to be suprised by the > results ;) > > Mike >

2 1

Re: D3D8_GetCreationParameters fix
by Andrei Barbu 09 Jul '04

09 Jul '04

And this is the correct patch. Sorry about that, ignore the above. The above actually allocated the memory, this just returns that the op. didn't succeed which is the correct thing to do. Chessmaster seems to be happy too. On Thu, 2004-07-08 at 15:38, Andrei Barbu wrote: > Changelog: > > Fixes a memory access fault inside of D3D8_GetCreationParameters. > >

1 0

Fullscreening patch
by Mike Hearn 09 Jul '04

09 Jul '04

Hi Alexandre, Yes, it's that time again. Can you take another look at this patch? Getting it in is the first step towards fixing a bunch of "i typed but it appeared on the console instead of the game!" bugs (as well as improving a bunch of apps like IE, TightVNC etc). thanks -mike Index: dlls/x11drv/window.c =================================================================== RCS file: /cvstrees/crossover/office/wine/dlls/x11drv/window.c,v retrieving revision 1.49.2.1.2.2 diff -u -w -B -r1.49.2.1.2.2 window.c --- dlls/x11drv/window.c 28 Apr 2004 00:08:44 -0000 1.49.2.1.2.2 +++ dlls/x11drv/window.c 12 May 2004 13:57:38 -0000 @@ -78,6 +78,7 @@ "_MOTIF_WM_HINTS", "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", "_NET_WM_STATE", + "_NET_WM_STATE_FULLSCREEN", "_NET_WM_STATE_MAXIMIZED_VERT", "_NET_WM_STATE_MAXIMIZED_HORZ", "_NET_WM_STATE_SKIP_TASKBAR", @@ -133,6 +134,7 @@ inline static BOOL is_window_managed( WND *win ) { if (!managed_mode) return FALSE; + /* tray window is always managed */ if (win->dwExStyle & WS_EX_TRAYWINDOW) return TRUE; /* tool windows *are* managed if we have mwm hints */ @@ -156,6 +158,8 @@ if (win->dwExStyle & WS_EX_TOOLWINDOW) return FALSE; /* windows with thick frame are managed */ if (win->dwStyle & WS_THICKFRAME) return TRUE; + /* windows with a system menu are managed */ + if (win->dwStyle & WS_SYSMENU) return TRUE; /* * CODEWEAVERS HACK @@ -189,13 +193,7 @@ /* application windows are managed */ if (win->dwExStyle & WS_EX_APPWINDOW) return TRUE; - /* full-screen popup windows are managed */ - if ((win->dwStyle & WS_POPUP) && - (win->rectWindow.right-win->rectWindow.left) == screen_width && - (win->rectWindow.bottom-win->rectWindow.top) == screen_height) - { - return TRUE; - } + /* default: not managed */ return FALSE; } @@ -435,7 +432,10 @@ size_hints->y = data->whole_rect.top; size_hints->flags = PWinGravity | PPosition; - if ( !(win->dwStyle & WS_THICKFRAME) ) + /* we only want to be able to resize windows with WS_THICKFRAME. + * in addition, metacity refuses to fullscreen non-resizable windows + */ + if ( !(win->dwStyle & WS_THICKFRAME) && !data->fullscreened) { size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; @@ -590,7 +590,7 @@ if (win->dwStyle & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (win->dwStyle & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (win->dwStyle & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; - if ((win->dwStyle & WS_CAPTION) == WS_CAPTION) mwm_hints.decorations |= MWM_DECOR_TITLE; + if (((win->dwStyle & WS_CAPTION) == WS_CAPTION) && (!data->fullscreened)) mwm_hints.decorations |= MWM_DECOR_TITLE; if (win->dwExStyle & WS_EX_DLGMODALFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; else if (win->dwStyle & WS_THICKFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; else if ((win->dwStyle & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; @@ -607,6 +607,15 @@ XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); + /* for windows that are already mapped, toggle_fullscreen sends a message to the WM */ + if (data->fullscreened && !(win->dwStyle & WS_VISIBLE)) { + Atom newstate = x11drv_atom(_NET_WM_STATE_FULLSCREEN); + + TRACE("setting state to _NET_WM_STATE_FULLSCREEN\n"); + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_STATE), + XA_ATOM, 32, PropModeReplace, (unsigned char*)&newstate, 1 ); + } + wm_hints = XAllocWMHints(); wine_tsx11_unlock(); @@ -963,6 +972,8 @@ RECT rect; BOOL is_top_level = is_window_top_level( win ); + data->fullscreened = FALSE; + rect = win->rectWindow; X11DRV_window_to_X_rect( win, &rect ); Index: dlls/x11drv/winpos.c =================================================================== RCS file: /cvstrees/crossover/office/wine/dlls/x11drv/winpos.c,v retrieving revision 1.44.2.3.2.1 diff -u -w -B -r1.44.2.3.2.1 winpos.c --- dlls/x11drv/winpos.c 27 Apr 2004 22:38:15 -0000 1.44.2.3.2.1 +++ dlls/x11drv/winpos.c 12 May 2004 13:57:50 -0000 @@ -76,6 +76,45 @@ extern XContext winContext; /*********************************************************************** + * toggle_fullscreen + * + * Use the NETWM fullscreening protocol to toggle fullscreened state. This only + * works for mapped windows. + */ +static void toggle_fullscreen( HWND hwnd ) +{ + WND *win = WIN_GetPtr(hwnd); + struct x11drv_win_data *data = win->pDriverData; + XEvent xev; + + TRACE("hwnd=%p, current=%s\n", hwnd, data->fullscreened ? "true" : "false"); + data->fullscreened = !data->fullscreened; + + wine_tsx11_lock(); + + X11DRV_set_wm_hints(thread_display(), win); + if (win->dwStyle & WS_VISIBLE) { + TRACE("toggling fullscreen state\n"); + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); + xev.xclient.serial = 0; + xev.xclient.display = thread_display(); + xev.xclient.send_event = True; + xev.xclient.format = 32; + /* using _NET_WM_STATE_TOGGLE here does not work correctly with some WMs */ + xev.xclient.data.l[0] = (data->fullscreened ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE); + xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_FULLSCREEN); + xev.xclient.data.l[2] = 0; + XSendEvent(thread_display(), root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); + TRACE("toggled\n"); + } + + wine_tsx11_unlock(); + WIN_ReleasePtr(win); +} + +/*********************************************************************** * clip_children * * Clip all children of a given window out of the visible region @@ -936,25 +976,44 @@ RECT newWindowRect, newClientRect; RECT oldWindowRect, oldClientRect; UINT wvrFlags = 0; - BOOL bChangePos; + BOOL bChangePos, fromXEvent; + struct x11drv_win_data *data; - TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x\n", + TRACE("hwnd %p, insert-after %p, swp %d,%d %dx%d\n", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, - winpos->cx, winpos->cy, winpos->flags); + winpos->cx, winpos->cy); + fromXEvent = winpos->flags & SWP_WINE_NOHOSTMOVE; bChangePos = !(winpos->flags & SWP_WINE_NOHOSTMOVE); winpos->flags &= ~SWP_WINE_NOHOSTMOVE; /* Check window handle */ if (winpos->hwnd == GetDesktopWindow()) return FALSE; + if (!(wndPtr = WIN_FindWndPtr( winpos->hwnd ))) return FALSE; + data = wndPtr->pDriverData; + if (!SWP_DoWinPosChanging( winpos, &newWindowRect, &newClientRect )) return FALSE; + if (data->fullscreened) { + + /* Windows has no concept of fullscreen, so to unfullscreen an app you just resize it or move it. + * Therefore we need to watch for this behaviour and release fullscreen mode so we can once again + * control our position. + */ + + if (!fromXEvent /* ignore spurious WM changes once we are fullscreened */ + && !(winpos->flags & (SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE)) /* ignore SWP calls that aren't changing our geometry */ + && !((newWindowRect.left < 0) && (newWindowRect.top < 0))) /* probably moving us beyond the screen boundaries to hide the borders, ignore */ { + + TRACE("releasing fullscreen for %p\n", winpos->hwnd); + toggle_fullscreen( winpos->hwnd ); + } + } + /* Fix redundant flags */ if (!fixup_flags( winpos )) return FALSE; - if (!(wndPtr = WIN_FindWndPtr( winpos->hwnd ))) return FALSE; - TRACE(" current (%ld,%ld)-(%ld,%ld), client (%ld,%ld)-(%ld,%ld), style %08x\n", wndPtr->rectWindow.left, wndPtr->rectWindow.top, wndPtr->rectWindow.right, wndPtr->rectWindow.bottom, @@ -973,8 +1032,9 @@ } /* Common operations */ + wvrFlags = SWP_DoNCCalcSize( winpos, &newWindowRect, &newClientRect ); /* FIXME: this should only be called if the size is actually being changed, unless SWP_FRAMECHANGED is set */ - wvrFlags = SWP_DoNCCalcSize( winpos, &newWindowRect, &newClientRect ); + TRACE("after NC_CALCSIZE (%ld,%ld,%ld,%ld)\n", newWindowRect.left, newWindowRect.top, newWindowRect.right, newWindowRect.bottom); if(!(winpos->flags & SWP_NOZORDER) && winpos->hwnd != winpos->hwndInsertAfter) { @@ -1049,6 +1109,7 @@ XClearArea( display, get_whole_window(wndPtr), 0, 0, 0, 0, True ); winpos->flags |= SWP_FRAMECHANGED; } + if (winpos->flags & SWP_SHOWWINDOW) { set_visible_style( winpos->hwnd, TRUE ); @@ -1124,6 +1185,7 @@ SendMessageA( winpos->hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)winpos ); /* WM_WINDOWPOSCHANGED is send even if SWP_NOSENDCHANGING is set */ + TRACE("done for %p\n", winpos->hwnd); return TRUE; } @@ -1206,6 +1265,7 @@ POINT size; LONG old_style; WINDOWPLACEMENT wpl; + struct x11drv_win_data* data; TRACE("%p %u\n", hwnd, cmd ); @@ -1224,9 +1284,12 @@ if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0; + data = wndPtr->pDriverData; + size.x = wndPtr->rectWindow.left; size.y = wndPtr->rectWindow.top; + switch( cmd ) { case SW_MINIMIZE: @@ -1400,11 +1463,13 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT cmd ) { WND* wndPtr = WIN_FindWndPtr( hwnd ); + struct x11drv_win_data *data; BOOL wasVisible, showFlag, wmMaximize, wmMinimize; RECT newPos = {0, 0, 0, 0}; UINT swp = 0; if (!wndPtr) return FALSE; + data = wndPtr->pDriverData; hwnd = wndPtr->hwndSelf; /* make it a full handle */ TRACE("hwnd=%p, cmd=%d\n", hwnd, cmd); @@ -1539,11 +1604,18 @@ MAKELONG(wndPtr->rectClient.left, wndPtr->rectClient.top) ); } + if (!data->fullscreened && wmMaximize) { + /* we should fullscreen captionless windows on maximization (IE uses this) */ + if ((wndPtr->dwStyle & WS_CAPTION) != WS_CAPTION) { + if ((wmMaximize && data->fullscreened) || (cmd == SW_RESTORE && !data->fullscreened)) { + TRACE("toggling fullscreen due to %s of captionless window %p\n", wmMaximize ? "maximization" : "restoration", hwnd); + toggle_fullscreen( hwnd ); + } + } else /* ask the window manager to maximize this window for us */ - if( wmMaximize ) X11DRV_WMMaximizeWindow(wndPtr, TRUE); - else if ( wmMinimize ) - X11DRV_WMMinimizeWindow(wndPtr); + } else if (wmMinimize) X11DRV_WMMinimizeWindow(wndPtr); + END: WIN_ReleaseWndPtr(wndPtr); @@ -2191,8 +2263,10 @@ /* if nothing changed, don't do anything */ if (winpos.flags == (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE)) return; + TRACE("syncing window pos enter\n"); SetWindowPos( hwnd, winpos.hwndInsertAfter, winpos.x, winpos.y, winpos.cx, winpos.cy, winpos.flags | SWP_WINE_NOHOSTMOVE ); + TRACE("syncing window pos leave\n"); } Index: dlls/x11drv/x11drv.h =================================================================== RCS file: /cvstrees/crossover/office/wine/dlls/x11drv/x11drv.h,v retrieving revision 1.16.4.1 diff -u -w -B -r1.16.4.1 x11drv.h --- dlls/x11drv/x11drv.h 27 Apr 2004 22:38:15 -0000 1.16.4.1 +++ dlls/x11drv/x11drv.h 12 May 2004 13:57:54 -0000 @@ -420,6 +420,7 @@ XATOM__MOTIF_WM_HINTS, XATOM__KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR, XATOM__NET_WM_STATE, + XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_STATE_MAXIMIZED_VERT, XATOM__NET_WM_STATE_MAXIMIZED_HORZ, XATOM__NET_WM_STATE_SKIP_TASKBAR, @@ -555,6 +556,7 @@ XIC xic; /* X input context */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; + BOOL fullscreened; /* does the window have a NETWM fullscreening hint set? */ }; typedef struct x11drv_win_data X11DRV_WND_DATA;

1 0

Re: Re: D3D8_GetCreationParameters fix
by Christian Costa 09 Jul '04

09 Jul '04

> Message du 09/07/04 10:46 > De : "Lionel Ulmer" > A : "Andrei Barbu" > Copie à : "Christian Costa" , "Marcus Meissner" , "Mike McCormack" , wine-devel(a)winehq.org > Objet : Re: D3D8_GetCreationParameters fix > On Thu, Jul 08, 2004 at 08:45:16PM -0400, Andrei Barbu wrote: > > I agree on the docs, interestingly enough though, > > Chessmaster 9000 gives an invalid pointer (0x1) > > and there's a memory access error. > > > > Works on Windows though, so I'm assuming DX might be > > allocating the memory on it's own. > > When you mean 'works on Windows' is it Chessmaser 9000 or the fact that > giving a bad pointer to this DX8 API call does not make the program crash ? > I think he means ChessMaster 9000. > Because to be sure to get your patch applied, the best way would be to > understand WHY CM9000 gives this 0x1 pointer to the DX8 function. It may be > due to a memory allocation error, some stack trashing, some other bugs in > Wine, ... Agreed. > > So I fear that only doing some REing of the CM9000 code would help here. > This is the best things to do but the problem is not always obvious. If REing does not give significant result, I would suggest to check how the function behaves in windows and implement the same behaviour with maybe a big comment about ChessMaster 9000. Bye, Christian

2 1

Re: Re: D3D8_GetCreationParameters fix
by Christian Costa 09 Jul '04

09 Jul '04

> Message du 09/07/04 00:57 > De : "Andrei Barbu" > A : "Christian Costa" > Copie à : "Marcus Meissner" , "Mike McCormack" , wine-devel(a)winehq.org > Objet : Re: D3D8_GetCreationParameters fix > Having given thought to the issue, you're right. > That was a bad solution, sorry. > > It should have failed with D3DERR_INVALIDCALL if it's a bad write > pointer. > Is this new patch ok? > Seems good. :-) Bye, Christian

1 0

Re: D3D8_GetCreationParameters fix
by Mike McCormack 09 Jul '04

09 Jul '04

You probably want to use a Windows method to allocate memory here, such as HeapAlloc() or CoTaskMemAlloc, as the caller is not going to use free() to free the memory... Mike Andrei Barbu wrote: > Changelog: > > Fixes a memory access fault inside of D3D8_GetCreationParameters. ... > HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(LPDIRECT3DDEVICE8 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { > ICOM_THIS(IDirect3DDevice8Impl,iface); > TRACE("(%p) copying to %p\n", This, pParameters); > + > + pParameters = (D3DDEVICE_CREATION_PARAMETERS*) malloc( sizeof( D3DDEVICE_CREATION_PARAMETERS )); > memcpy(pParameters, &This->CreateParms, sizeof(D3DDEVICE_CREATION_PARAMETERS)); > return D3D_OK; > }

6 8

Initial creation of directory and config with ttydrv
by Shachar Shemesh 08 Jul '04

08 Jul '04

Hi all, I need to create the initial environment for wine (the .wine directory) in an environment where no X11 server is available. Once the directory is up (for example, if I copy it from somewhere), there is no problem to add a config file that chooses the ttydrv driver. However, I cannot create the initial directory. Is there any solution to this problem, or should I just copy the initial config from somewhere? Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

1 0

HKEY_DYN_DATA in win9x
by Robert Reif 08 Jul '04

08 Jul '04

I have a program that fails when it can't find HKEY_DYN_DATA\Config Manager\Enum in the registry. Any pointers on where to start?

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel