- wine-devel - winehq.org

bitmap corruption
by Mike Hearn 16 Mar '03

16 Mar '03

if anybody wishes to tackle a fun bug, take a look at the imagelist control in commctrl32 - it corrupts masks, giving some nasty visual corruption esp on toolbar icons, but i've also seen it in winrar. i suspect the _read_bitmap function doesn't do 1bit images correctly, but didn't really manage to find out. i might have another crack tomorrow, but in case somebody is looking for a job.... :)

2 4

dlls/winmm/wineoss/audio.c portability breakage
by Gerald Pfeifer 16 Mar '03

16 Mar '03

The following change to dlls/winmm/wineoss/audio.c revision 1.79 date: 2003/03/15 00:54:12; author: julliard; state: Exp; lines: +231 -73 Robert Reif <reif(a)earthlink.net> Added support for multiple direct sound devices. unfortunately breaks compilation on FreeBSD: audio.c: In function `OSS_WaveOutInit': audio.c:501: syntax error before `info' audio.c:502: `SOUND_MIXER_INFO' undeclared (first use in this function) audio.c:502: (Each undeclared identifier is reported only once audio.c:502: for each function it appears in.) audio.c:502: `info' undeclared (first use in this function) audio.c: In function `OSS_WaveInInit': audio.c:634: syntax error before `info' audio.c:635: `SOUND_MIXER_INFO' undeclared (first use in this function) audio.c:635: `info' undeclared (first use in this function) As far as I can see mixer_info does not exist on FreeBSD 4.7 (at least). I'm afraid I won't have the time to investigate this into more detail by myself; would you mind having a look? Thanks, Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.pfeifer.com/gerald/

3 5

[ANN] www.dssd.ca/wine problems
by Dimitrie O. Paun 16 Mar '03

16 Mar '03

Folks, My IP for the dssd.ca domain has changed Friday. I am in the process of updating the DNS servers to the new address, but it may take a while. Meantime, you can access the Wine pages I maintain at: http://24.103.33.114/wine/ I will let you know when things are back to normal... -- Dimi.

1 0

SHGetFileInfo - fix LargeIcon & add rel. path
by Vitaliy Margolen 15 Mar '03

15 Mar '03

According to MSDN: pszPath - [in] Pointer to a buffer that contains the path and file name. Both absolute and _RELATIVE_ paths are valid. Plus fix for getting Large Icon properly. SHGetFileInfo was always returning small icon. Looking at what I found, I think this should be yet one more sanity check project that does following: if (aConst == 0) Find all where (* & aConst) For more details see patch. FIY: SHGFI_LARGEICON = $00000000 Vitaliy Margolen changelog: - make SHGetFileInfo handle relative paths - fix requests for large icons Index: shell32_main.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shell32_main.c,v retrieving revision 1.112 diff -u -r1.112 shell32_main.c --- shell32_main.c 14 Jan 2003 23:43:42 -0000 1.112 +++ shell32_main.c 15 Mar 2003 21:44:50 -0000 @@ -209,7 +209,7 @@ SHFILEINFOA *psfi, UINT sizeofpsfi, UINT flags ) { - char szLocation[MAX_PATH]; + char szLocation[MAX_PATH], szFullPath[MAX_PATH]; int iIndex; DWORD ret = TRUE, dwAttributes = 0; IShellFolder * psfParent = NULL; @@ -229,6 +229,16 @@ psfi->szTypeName[0] = '\0'; psfi->iIcon = 0; + if (!(flags & SHGFI_PIDL)){ + // SHGitFileInfo should work with absolute and relative paths */ + if (PathIsRelativeA(path)){ + GetCurrentDirectoryA(MAX_PATH, szLocation); + PathCombineA(szFullPath, szLocation, path); + } else { + lstrcpynA(szFullPath, path, MAX_PATH); + } + } + if (flags & SHGFI_EXETYPE) { BOOL status = FALSE; HANDLE hfile; @@ -240,12 +250,12 @@ if (flags != SHGFI_EXETYPE) return 0; - status = GetBinaryTypeA (path, &BinaryType); + status = GetBinaryTypeA (szFullPath, &BinaryType); if (!status) return 0; if ((BinaryType == SCS_DOS_BINARY) || (BinaryType == SCS_PIF_BINARY)) return 0x4d5a; - hfile = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ, + hfile = CreateFileA( szFullPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); if ( hfile == INVALID_HANDLE_VALUE ) return 0; @@ -294,7 +304,7 @@ if (flags & SHGFI_PIDL) { pidl = ILClone((LPCITEMIDLIST)path); } else if (!(flags & SHGFI_USEFILEATTRIBUTES)) { - hr = SHILCreateFromPathA(path, &pidl, &dwAttributes); + hr = SHILCreateFromPathA(szFullPath, &pidl, &dwAttributes); } if ((flags & SHGFI_PIDL) || !(flags & SHGFI_USEFILEATTRIBUTES)) @@ -324,7 +334,7 @@ { if (flags & SHGFI_USEFILEATTRIBUTES) { - strcpy (psfi->szDisplayName, PathFindFileNameA(path)); + strcpy (psfi->szDisplayName, PathFindFileNameA(szFullPath)); } else { @@ -346,7 +356,7 @@ else { char sTemp[64]; - strcpy(sTemp,PathFindExtensionA(path)); + strcpy(sTemp,PathFindExtensionA(szFullPath)); if (!( HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE) && HCR_MapTypeToValueA(sTemp, psfi->szTypeName, 80, FALSE ))) { @@ -397,7 +407,7 @@ char * szExt; DWORD dwNr=0; - lstrcpynA(sTemp, path, MAX_PATH); + lstrcpynA(sTemp, szFullPath, MAX_PATH); if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) psfi->iIcon = 2; @@ -409,7 +419,7 @@ && HCR_GetDefaultIconA(sTemp, sTemp, MAX_PATH, &dwNr)) { if (!strcmp("%1",sTemp)) /* icon is in the file */ - strcpy(sTemp, path); + strcpy(sTemp, szFullPath); if (flags & SHGFI_SYSICONINDEX) { @@ -419,10 +429,10 @@ else { IconNotYetLoaded=FALSE; - PrivateExtractIconsA(sTemp,dwNr,(flags&SHGFI_LARGEICON) ? - GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXSMICON), - (flags&SHGFI_LARGEICON) ? GetSystemMetrics(SM_CYICON) : - GetSystemMetrics(SM_CYSMICON), &psfi->hIcon,0,1,0); + PrivateExtractIconsA(sTemp,dwNr,(flags & SHGFI_SMALLICON) ? + GetSystemMetrics(SM_CXSMICON) : GetSystemMetrics(SM_CXICON), + (flags & SHGFI_SMALLICON) ? GetSystemMetrics(SM_CYSMICON) : + GetSystemMetrics(SM_CYICON), &psfi->hIcon,0,1,0); psfi->iIcon = dwNr; } } @@ -430,7 +440,7 @@ } else { - if (!(PidlToSicIndex(psfParent, pidlLast, (flags & SHGFI_LARGEICON), + if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & SHGFI_SMALLICON), (flags & SHGFI_OPENICON)? GIL_OPENICON : 0, &(psfi->iIcon)))) { ret = FALSE; @@ -438,13 +448,13 @@ } if (ret) { - ret = (DWORD) ((flags & SHGFI_LARGEICON) ? ShellBigIconList : ShellSmallIconList); + ret = (DWORD) ((flags & SHGFI_SMALLICON) ? ShellSmallIconList : ShellBigIconList); } } /* icon handle */ if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded) - psfi->hIcon = ImageList_GetIcon((flags & SHGFI_LARGEICON) ? ShellBigIconList:ShellSmallIconList, psfi->iIcon, ILD_NORMAL); + psfi->hIcon = ImageList_GetIcon((flags & SHGFI_SMALLICON) ? ShellSmallIconList:ShellBigIconList, psfi->iIcon, ILD_NORMAL); if (flags & (SHGFI_UNKNOWN1 | SHGFI_UNKNOWN2 | SHGFI_UNKNOWN3)) FIXME("unknown attribute!\n");

1 0

Re: Fix for ArrangeCtrlPositions in commdlg
by Maxime Bellengé 15 Mar '03

15 Mar '03

Is there any problem with this patch ? It has not been applied and I didn't see any comments on wine-devel. The current cvs implementation is broken I think. If you try to open a file with WinHex or WinZip you can see the problems. If there is any problem with it, please tell me in order for me to fix it a+ On Wed, 2003-03-12 at 23:54, Maxime Bellengé wrote: > This patch replaces my previous patches. > It fixes the computation of the file dialog box size and the component > placement. > > Now WinHex open dialog box looks fine as well as VirtualDub, Winzip. > > The new algorithm is partially based on information found at > http://www.bridgespublishing.com/articles/issues/0201/Custom_Open_dialogs__… > > ChangeLog: > - Fix how the size of the dialog is computed and the child component > placed. -- Maxime Bellengé <maxime.bellenge(a)laposte.net>

2 1

Re: Oleauto Header
by Alexandre Julliard 15 Mar '03

15 Mar '03

Jon <jon_p_griffiths(a)yahoo.com> writes: > +dlls/oleaut32/variant.c > Correct the prototype of VarCyFromI1() Actually I'd argue that using signed char is correct here, and that the other I1 functions should be fixed to use signed chars too. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: (Mis)using threads
by Mikko Rauhala 15 Mar '03

15 Mar '03

(Sorry for thread breakage, I'm not actually subscribed but commenting based on the archive.) On Thu Mar 13 2003, 02:11:50 CST Ove Kaaven wrote: > Yes, they all support what I'm saying: a non-root process cannot > increase its scheduling priority (in the common meaning of "priority", > not the inversed sense that renice and setpriority use, of course, if > that wasn't obvious). Actually, at least Linux has some capability support, and if the Wine process would by some means be set up to receive CAP_SYS_NICE, it could manipulate priorities at will. Unfortunately, I don't think eg. the capability filesystem support is at place currently, so this might take some tweaking. (I'm not sure if eg. a suid root wrapper that would just exec wine with normal user priviledges and give it CAP_SYS_NICE would work.) This solution also is obviously limited to systems supporting CAP_SYS_NICE. Another alternative would be to make a suitably authorized (root or CAP_SYS_NICE) priority switching server, which could respond to spesifically authorized priority switch requests. A bit of a kludge, yes. Of course, any solution that gives user processes access to setpriority() is potentially dangerous, but at least the dangers would be limited, unlike with running Wine as root. -- Mikko Rauhala - mjr(a)iki.fi - <URL:http://www.iki.fi/mjr/> Transhumanist - WTA member - <URL:http://www.transhumanism.org/> Singularitarian - SIAI supporter - <URL:http://www.singinst.org/>

1 0

DPRINTF->TRACE Final (Exceptions - not changed)
by Tony Lambregts 15 Mar '03

15 Mar '03

This completes the first stage of DPRINTF->TRACE. There are still a lot of files that use DPRINTF. The following is a list of the files I where I did not replace DPRINTF with TRACE along with a breif explanation. I would appreciate any comments on this or any of the patches that I submitted over the last day. windows/dce.c................ dump function. windows/winproc.............. dump function. scheduler/process.c.......... relay function. scheduler/tread.c............ relay function. relay32/relay386.c........... relay function. relay32/snoop.c.............. snoop function. programs/wineconsole ........ uses WINE_DPRINTF. msdos/vxd.c.................. dump function. misc/version.c............... should this be a FIXME? memory/global.c.............. dump function. memory/instr.c............... dump function. memory/local.c............... dump function. loader/pe_image.c............ dump function. loader/ne/module.c........... dump function. if1632/relay.c............... relay function. if1632/snoop.c............... snoop function. graphics/x11drv/opengl.c .... dump function. files/smb.c.................. dump functions (patch submitted) review. dlls/wineclipsrv.c........... define macros. dlls/winsock/socket.c........ dump function. dlls/winedos/dosvm.c......... relay function. dlls/winaspi/winaspi16.c .... dump function. dlls/winaspi/winaspi32.c..... dump function. dlls/user/hook.c............. relay function. dlls/opengl32/wgl.c.......... dump function (review). dlls/ole32/compobj.c......... dunp function. dlls/ole32/compositemoniker.c review (no /n to complete). dlls/ole32/storage.c......... dump function. dlls/ntdll/heap.c............ dump function. dlls/ntdll/virtual.c......... dump function. dlls/msvcrt/cppexcept.c...... dump function. dlls/kernel/thunk.c.......... thunk. dlls/kernel/wowthunk.c....... thunk. dlls/dsound/buffer.c......... this should be a fixme/message review. dlls/dsound/dsound_main.c.... dump function needs review. dlls/dsound/primary.c........ this should be a fixme/message review. dlls/dinput/device.c......... dump function dlls/ddraw/d3dcommon.c....... dump functions dlls/ddraw/d3dexecutebuffer.c patch submitted, dump function review. dlls/ddraw/d3dlight.c........ dump function dlls/ddraw/d3dmaterial.c..... dump functions dlls/ddraw/d3dhelper.c....... dump functions dlls/d3d8/device.c........... perhaps this should be a FIXME dlls/d3d8/shader.c........... frankly I don't want to touch it.<g> controls/menu.c.............. ditto. -- Tony Lambregts

3 3

Re: Fwd: failure delivery
by Eric Pouech 15 Mar '03

15 Mar '03

Jon Griffiths wrote: >>>any reason why not use DllMain instead of patching winebuild ? >> >>If you mean the DllMain of msvcrt, there is no way for the it to >>know >>what type of app is calling it AFAICS. Only the generated main >>knows, >>and should inform msvcrt when it starts. Also the handling of >>main() >>is different for natively build apps linked with msvcrt: they >>should >>eventually have a different loop than ExitProcess(main()) >> >>Some of these settings can be overriden and should be handled by >>the >>.exe file. Wildcard expansion and the user math errors come to >>mind. but in most of the cases, this is a linker issue (overriding in user's compilation units symbols which come from libraries - in this case the C runtime libraries) perhaps a better way would be to add another layer: - instead of calling directly the user defined main function, then call another one, which would perform the next initialization steps (main vs. wmain calling, _matherr overriding, command line expansion...) A+ -- Eric Pouech

1 0

Re: DPRINTF->TRACE Final (Exceptions - not changed)
by Jon Griffiths 15 Mar '03

15 Mar '03

Hi, > but i can't without use of DPRINTF ... > but if you have a better solution ? I suggest creating functions to print your types into a string, and then dump the created string. Then, if no trace is defined, make those functions macros that compile to nothing. Cheers, Jon ===== "Don't wait for the seas to part, or messiahs to come; Don't you sit around and waste this chance..." - Live jon_p_griffiths(a)yahoo.com __________________________________________________ Do you Yahoo!? Yahoo! Web Hosting - establish your business online http://webhosting.yahoo.com

1 0

Re: winebuild initialisation
by Eric Pouech 15 Mar '03

15 Mar '03

Jon wrote: > Hi, > > This patch adds initialisation code to apps that import msvcrt. This should be > expanded at some point to do the right things for dlls that do the same, but > at present, this only affects Winelib users who build their own dlls. > > Apps that don't import msvcrt won't see any changes. any reason why not use DllMain instead of patching winebuild ? -- Eric Pouech

2 1

Re: ntdll Rtl Strings
by Jon Griffiths 15 Mar '03

15 Mar '03

Hi, >For base 0 it accepts: {whitespace} [+|-] [0[x|o|b]] {digits} >For bases 2, 8, 10 and 16 it accepts: {whitespace} [+|-] {digits} I'll resend with this difference added, for what its worth. > So: Feel free to reformat the comments of "my" functions, > but do not remove information. Far be it from me to impinge on "your" functions. I understand that documenting our implementation well is important, which is why I sent the patches in the first place, to produce better quality documentation in developer-useful formats (see documentation patches 1-4). Since we obviously share the same goals here, can I suggest you generate the documentation for functions you consider "yours", and reformat them as appropriate. Then we can work together to reach both our goals, without needing to resort to 'yours-and-mine' mentality. And Wine and Winelib developers will benefit as a result. Cheers, Jon (in humourously amused mode) ===== "Don't wait for the seas to part, or messiahs to come; Don't you sit around and waste this chance..." - Live jon_p_griffiths(a)yahoo.com __________________________________________________ Do you Yahoo!? Yahoo! Web Hosting - establish your business online http://webhosting.yahoo.com

1 0

Re: wine/ server/trace.c server/thread.h server/th ...
by Rein Klazes 15 Mar '03

15 Mar '03

On Tue, 4 Mar 2003 16:18:44 -0600, you wrote: > ChangeSet ID: 7374 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 2003/03/04 16:18:44 > > Modified files: > server : trace.c thread.h thread.c ptrace.c process.c > context_sparc.c context_powerpc.c > context_i386.c > scheduler : process.c client.c > include/wine : server_protocol.h > dlls/ntdll : signal_sparc.c signal_powerpc.c signal_i386.c > > Log message: > Use SIGUSR1 instead of SIGSTOP to suspend threads. This patch causes a regression running thebat! mail client. Running with --debugmsg +seh gives: | trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x41f32ea1 | trace:seh:EXC_RtlRaiseException info[0]=00000001 | trace:seh:EXC_RtlRaiseException info[1]=00000000 | trace:seh:EXC_CallHandler calling handler at 0x43fcf5 code=c0000005 flags=0 | trace:seh:EXC_RtlUnwind code=c0000005 flags=2 | trace:seh:EXC_RtlRaiseException code=c0000028 flags=1 addr=(nil) | err:seh:EXC_DefaultHandling Exception frame is not in stack limits => unable to dispatch exception. One thread stays alive, but the half-constructed main window is frozen. If I run with --debugmsg +relay there is no crash and the program manages to display the main windows after 20 miutes. Starting form winedbg doesn't seem to work, a first chance exception occurs soon after startup (long before the one above) and: | Wine-dbg>wine client error:b: read: Bad address | wine client error:b: sendmsg: Bad file descriptor I don't know how to proceed from here. Rein. -- Rein Klazes rklazes(a)xs4all.nl

2 2

Re: shlwapi.dll, Fix endless loop in StrPBrkW
by Eric Pouech 14 Mar '03

14 Mar '03

> - while (*lpszStr); > + while (*lpszStr) could we catch this type of error with smatch ? A+ -- Eric Pouech

5 9

mail address
by Eric Pouech 14 Mar '03

14 Mar '03

just to let you know that I had to change my email address... and that I have lost every mail sent since yesterday... so if you did send some mail to me outside of the wine official ML:s, then it may be good that you send them back TIA A+ -- Eric Pouech

1 0

Re: PATCH: dlls/ddraw/ddraw/hal.c
by Alexandre Julliard 14 Mar '03

14 Mar '03

Gerald Pfeifer <pfeifer(a)dbai.tuwien.ac.at> writes: > This hasn't been applied; did I miss anything (that is, is this patch > somehow broken)? If the function doesn't have the right signature it should be fixed, adding a cast is just hiding the bug. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: (resend) some ntdll functions (2a) - part 2: tests
by Alexandre Julliard 14 Mar '03

14 Mar '03

thomas.mertes(a)gmx.at writes: > Here are the tests for some ntdll functions. > The patch containing the functions was accepted. > Alexandre, can you tell me, why the patch with > the tests is not commited in CVS (I could not > find it in wine-cvs(a)winehq.com) ? Sorry, forgot to send you a note. Basically I think it would be much better to test the A and W functions in the same file, instead of duplicating all the test cases in two separate files. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: ListView Part2
by Dimitrie O. Paun 14 Mar '03

14 Mar '03

On March 14, 2003 02:22 am, Vitaliy Margolen wrote: > - INT cy = HIWORD(spacing), cx = LOWORD(spacing); > + signed short int cy = HIWORD(spacing), cx = LOWORD(spacing); Good spotting! An alternative fix is to us SHIWORD() and SLOWORD() instead. But since we're here, the pattern is to decode this sort of thing directly in LISTVIEW_WindowProc(), so let's do just that: ChangeLog Spacing information is signed (debugged and fixed by Vitaliy Margolen). Decode spacing information in the window procedure. Some spelling fixes. Index: dlls/comctl32/listview.c =================================================================== RCS file: /var/cvs/wine/dlls/comctl32/listview.c,v retrieving revision 1.343 diff -u -r1.343 listview.c --- dlls/comctl32/listview.c 7 Mar 2003 20:35:30 -0000 1.343 +++ dlls/comctl32/listview.c 14 Mar 2003 13:59:57 -0000 @@ -937,7 +937,7 @@ * - a special item to deal with * - simple range, or composite range * - empty range. - * If find bugs, or want to add features, please make sure you + * If you find bugs, or want to add features, please make sure you * always check/modify *both* iterator_prev, and iterator_next. */ @@ -1249,7 +1249,7 @@ return LISTVIEW_GetItemT(infoPtr, lpLVItem, TRUE); } -/* Listview invlaidation functions: use _only_ these function to invalidate */ +/* Listview invalidation functions: use _only_ these functions to invalidate */ static inline BOOL is_redrawing(LISTVIEW_INFO *infoPtr) { @@ -6478,12 +6478,13 @@ * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] spacing : MAKELONG(cx, cy) + * [I] cx : horizontal spacing (-1 = system spacing, 0 = autosize) + * [I] cy : vertical spacing (-1 = system spacing, 0 = autosize) * * RETURN: * MAKELONG(oldcx, oldcy) */ -static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, DWORD spacing) +static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) { INT cy = HIWORD(spacing), cx = LOWORD(spacing); DWORD oldspacing = MAKELONG(infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy); @@ -6567,7 +6568,7 @@ himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (uView == LVS_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, 0); + LISTVIEW_SetIconSpacing(infoPtr, 0, 0); break; case LVSIL_SMALL: @@ -8298,7 +8299,7 @@ { TRACE("icon old size=(%ld,%ld), new size=(%ld,%ld)\n", oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0); + LISTVIEW_SetIconSpacing(infoPtr, 0, 0); } } else if (uNewView == LVS_REPORT) @@ -8620,7 +8621,7 @@ return LISTVIEW_SetHoverTime(infoPtr, (DWORD)wParam); case LVM_SETICONSPACING: - return LISTVIEW_SetIconSpacing(infoPtr, (DWORD)lParam); + return LISTVIEW_SetIconSpacing(infoPtr, SLOWORD(lParam), SHIWORD(lParam)); case LVM_SETIMAGELIST: return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam); -- Dimi.

1 0

Re: Doc
by Mike Hearn 14 Mar '03

14 Mar '03

Alexandre regenerates the authors list every so often from the ChangeLog. He did it just recently, so you may have missed the latest round, but don't worry - you will be added to the hall of shame*cough*fame :) On Thu, 2003-03-13 at 17:52, Maxime Bellengé wrote: > Adding me to the author list if my patches are accepted of course :). > > ChangeLog: > - Add myself to the author list. -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

1 0

Re: Fix for ArrangeCtrlPositions in commdlg
by Maxime Bellengé 14 Mar '03

14 Mar '03

I apologize for the multiple posts that sometimes come from me. I need to change my email program :) On Wed, 2003-03-12 at 23:54, Maxime Bellengé wrote: > This patch replaces my previous patches. > It fixes the computation of the file dialog box size and the component > placement. > > Now WinHex open dialog box looks fine as well as VirtualDub, Winzip. > > The new algorithm is partially based on information found at > http://www.bridgespublishing.com/articles/issues/0201/Custom_Open_dialogs__… > > ChangeLog: > - Fix how the size of the dialog is computed and the child component > placed. -- Maxime Bellengé <maxime.bellenge(a)laposte.net>

2 1

Re: ntdll Rtl Strings
by thomas.mertes＠gmx.at 14 Mar '03

14 Mar '03

Hello In your patch you changed the comment of "my" RtlCharToInteger function: > @@ -870,16 +1049,21 @@ > * > * Convert a character string into its integer equivalent. > * > - * On success assign an integer value and return STATUS_SUCCESS. > - * For base 0 accept: {whitespace} [+|-] [0[x|o|b]] {digits} > - * For bases 2, 8, 10 and 16 accept: {whitespace} [+|-] {digits} > - * For other bases return STATUS_INVALID_PARAMETER. > - * For value == NULL return STATUS_ACCESS_VIOLATION. > - * No check of value overflow: Just assign lower 32 bits (as native DLL). > - * Do not check for str != NULL (as native DLL). > + * PARAMS > + * str [I] String containing number > + * base [I] Number base for conversion > + * value [O] Destination for converted value > + * > + * RETURNS > + * Success: STATUS_SUCCESS. value contains the converted number > + * Failure: STATUS_ACCESS_VIOLATION, if value is NULL. > + * STATUS_INVALID_PARAMETER, if base is not 2, 8, 10 or 16. > * > - * Difference: > - * - Do not read garbage behind '\0' as native DLL does. > + * NOTES > + * The string should be in the format "{whitespace} [+|-] [0[x|o|b]] {digits}". > + * No check is made for value overflow, only the lower 32 bits are assigned. > + * If str is NULL this function will crash. > + * This function does not read garbage behind '\0' as the native version does. > */ > NTSTATUS WINAPI RtlCharToInteger( > PCSZ str, If you want to reformat it (to automatically generate documentation) this is ok. But please don't remove information. My documentation was not copied from the M$ documentation. It needed testing (see: dlls/ntdll/tests/rtlstr.c) to find out that For base 0 it accepts: {whitespace} [+|-] [0[x|o|b]] {digits} For bases 2, 8, 10 and 16 it accepts: {whitespace} [+|-] {digits} This is more precise and better information than the M$ documentation (which for other functions I implemented is sometimes misleading or just wrong). I want our documentation to be better than the original. I created a "Difference" section that the differences between the native and the wine function really stand out. For example: I am not always capable to find out which garbage values are generated by native functions. In such cases the "Difference" section gives this information. When an application works with the native function, but not with the wine function (it really requests these garbage values) the "Difference" section gives an entry to "improve" the wine function. So: Feel free to reformat the comments of "my" functions, but do not remove information. Greetings Thomas Mertes -- +++ GMX - Mail, Messaging & more http://www.gmx.net +++ Bitte lächeln! Fotogalerie online mit GMX ohne eigene Homepage!

1 0

Re: ntdll/kernel32: #6
by Alexandre Julliard 14 Mar '03

14 Mar '03

Eric Pouech <eric.pouech(a)wanadoo.fr> writes: > (Alexandre, in order to handle correctly the loader_critsect between > ntdll & kernel32, what do you suggest ? NT does it thru the > fastpeblock in the PEB, which we don't implement. shall we add to the > PDB in some unused field (which means we do export the PDB struct out > of scheduler/process.c, but you seemed to reluctant to do so so far) Note that the PEB lock and the loader section are not the same thing. The loader section corresponds to the LoaderLock field in the PEB. I think we should use the same thing, and access it like we do for the process heap, at least for now. > +NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* mod) > +{ > + WINE_MODREF* wm; > + NTSTATUS nts = STATUS_NO_MORE_ENTRIES; > + > + RtlEnterCriticalSection( &loader_section ); > + if (!addr) > + { > + wm = exe_modref; > + } This doesn't look right, address 0 is not inside the executable. Are you sure NT does it this way? -- Alexandre Julliard julliard(a)winehq.com

1 0

DPRINTF->TRACE windows
by Tony Lambregts 14 Mar '03

14 Mar '03

Change Log: Replace DPRINTF with TRACE Files changed: windows/dialog.c windows/win.c windows/winpos.c Files not changed: windows/dce.c windows/winproc -- Tony Lambregts Index: dialog.c =================================================================== RCS file: /home/wine/wine/windows/dialog.c,v retrieving revision 1.112 diff -u -u -r1.112 dialog.c --- dialog.c 2 Dec 2002 18:10:57 -0000 1.112 +++ dialog.c 14 Mar 2003 02:29:44 -0000 @@ -391,8 +391,8 @@ WORD i, count = GET_WORD(p) / sizeof(WORD); TRACE(" BEGIN\n"); TRACE(" "); - for (i = 0; i < count; i++) DPRINTF( "%04x,", GET_WORD(p+i+1) ); - DPRINTF("\n"); + for (i = 0; i < count; i++) TRACE( "%04x,", GET_WORD(p+i+1) ); + TRACE("\n"); TRACE(" END\n" ); } info->data = p + 1; Index: win.c =================================================================== RCS file: /home/wine/wine/windows/win.c,v retrieving revision 1.215 diff -u -u -r1.215 win.c --- win.c 8 Jan 2003 21:09:25 -0000 1.215 +++ win.c 14 Mar 2003 02:29:45 -0000 @@ -894,28 +894,28 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) { TRACE( "style:" ); - if(style & WS_POPUP) DPRINTF(" WS_POPUP"); - if(style & WS_CHILD) DPRINTF(" WS_CHILD"); - if(style & WS_MINIMIZE) DPRINTF(" WS_MINIMIZE"); - if(style & WS_VISIBLE) DPRINTF(" WS_VISIBLE"); - if(style & WS_DISABLED) DPRINTF(" WS_DISABLED"); - if(style & WS_CLIPSIBLINGS) DPRINTF(" WS_CLIPSIBLINGS"); - if(style & WS_CLIPCHILDREN) DPRINTF(" WS_CLIPCHILDREN"); - if(style & WS_MAXIMIZE) DPRINTF(" WS_MAXIMIZE"); - if((style & WS_CAPTION) == WS_CAPTION) DPRINTF(" WS_CAPTION"); + if(style & WS_POPUP) TRACE(" WS_POPUP"); + if(style & WS_CHILD) TRACE(" WS_CHILD"); + if(style & WS_MINIMIZE) TRACE(" WS_MINIMIZE"); + if(style & WS_VISIBLE) TRACE(" WS_VISIBLE"); + if(style & WS_DISABLED) TRACE(" WS_DISABLED"); + if(style & WS_CLIPSIBLINGS) TRACE(" WS_CLIPSIBLINGS"); + if(style & WS_CLIPCHILDREN) TRACE(" WS_CLIPCHILDREN"); + if(style & WS_MAXIMIZE) TRACE(" WS_MAXIMIZE"); + if((style & WS_CAPTION) == WS_CAPTION) TRACE(" WS_CAPTION"); else { - if(style & WS_BORDER) DPRINTF(" WS_BORDER"); - if(style & WS_DLGFRAME) DPRINTF(" WS_DLGFRAME"); + if(style & WS_BORDER) TRACE(" WS_BORDER"); + if(style & WS_DLGFRAME) TRACE(" WS_DLGFRAME"); } - if(style & WS_VSCROLL) DPRINTF(" WS_VSCROLL"); - if(style & WS_HSCROLL) DPRINTF(" WS_HSCROLL"); - if(style & WS_SYSMENU) DPRINTF(" WS_SYSMENU"); - if(style & WS_THICKFRAME) DPRINTF(" WS_THICKFRAME"); - if(style & WS_GROUP) DPRINTF(" WS_GROUP"); - if(style & WS_TABSTOP) DPRINTF(" WS_TABSTOP"); - if(style & WS_MINIMIZEBOX) DPRINTF(" WS_MINIMIZEBOX"); - if(style & WS_MAXIMIZEBOX) DPRINTF(" WS_MAXIMIZEBOX"); + if(style & WS_VSCROLL) TRACE(" WS_VSCROLL"); + if(style & WS_HSCROLL) TRACE(" WS_HSCROLL"); + if(style & WS_SYSMENU) TRACE(" WS_SYSMENU"); + if(style & WS_THICKFRAME) TRACE(" WS_THICKFRAME"); + if(style & WS_GROUP) TRACE(" WS_GROUP"); + if(style & WS_TABSTOP) TRACE(" WS_TABSTOP"); + if(style & WS_MINIMIZEBOX) TRACE(" WS_MINIMIZEBOX"); + if(style & WS_MAXIMIZEBOX) TRACE(" WS_MAXIMIZEBOX"); /* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */ #define DUMPED_STYLES \ @@ -938,29 +938,29 @@ WS_MINIMIZEBOX | \ WS_MAXIMIZEBOX) - if(style & ~DUMPED_STYLES) DPRINTF(" %08lx", style & ~DUMPED_STYLES); - DPRINTF("\n"); + if(style & ~DUMPED_STYLES) TRACE(" %08lx", style & ~DUMPED_STYLES); + TRACE("\n"); #undef DUMPED_STYLES TRACE( "exstyle:" ); - if(exstyle & WS_EX_DLGMODALFRAME) DPRINTF(" WS_EX_DLGMODALFRAME"); - if(exstyle & WS_EX_DRAGDETECT) DPRINTF(" WS_EX_DRAGDETECT"); - if(exstyle & WS_EX_NOPARENTNOTIFY) DPRINTF(" WS_EX_NOPARENTNOTIFY"); - if(exstyle & WS_EX_TOPMOST) DPRINTF(" WS_EX_TOPMOST"); - if(exstyle & WS_EX_ACCEPTFILES) DPRINTF(" WS_EX_ACCEPTFILES"); - if(exstyle & WS_EX_TRANSPARENT) DPRINTF(" WS_EX_TRANSPARENT"); - if(exstyle & WS_EX_MDICHILD) DPRINTF(" WS_EX_MDICHILD"); - if(exstyle & WS_EX_TOOLWINDOW) DPRINTF(" WS_EX_TOOLWINDOW"); - if(exstyle & WS_EX_WINDOWEDGE) DPRINTF(" WS_EX_WINDOWEDGE"); - if(exstyle & WS_EX_CLIENTEDGE) DPRINTF(" WS_EX_CLIENTEDGE"); - if(exstyle & WS_EX_CONTEXTHELP) DPRINTF(" WS_EX_CONTEXTHELP"); - if(exstyle & WS_EX_RIGHT) DPRINTF(" WS_EX_RIGHT"); - if(exstyle & WS_EX_RTLREADING) DPRINTF(" WS_EX_RTLREADING"); - if(exstyle & WS_EX_LEFTSCROLLBAR) DPRINTF(" WS_EX_LEFTSCROLLBAR"); - if(exstyle & WS_EX_CONTROLPARENT) DPRINTF(" WS_EX_CONTROLPARENT"); - if(exstyle & WS_EX_STATICEDGE) DPRINTF(" WS_EX_STATICEDGE"); - if(exstyle & WS_EX_APPWINDOW) DPRINTF(" WS_EX_APPWINDOW"); - if(exstyle & WS_EX_LAYERED) DPRINTF(" WS_EX_LAYERED"); + if(exstyle & WS_EX_DLGMODALFRAME) TRACE(" WS_EX_DLGMODALFRAME"); + if(exstyle & WS_EX_DRAGDETECT) TRACE(" WS_EX_DRAGDETECT"); + if(exstyle & WS_EX_NOPARENTNOTIFY) TRACE(" WS_EX_NOPARENTNOTIFY"); + if(exstyle & WS_EX_TOPMOST) TRACE(" WS_EX_TOPMOST"); + if(exstyle & WS_EX_ACCEPTFILES) TRACE(" WS_EX_ACCEPTFILES"); + if(exstyle & WS_EX_TRANSPARENT) TRACE(" WS_EX_TRANSPARENT"); + if(exstyle & WS_EX_MDICHILD) TRACE(" WS_EX_MDICHILD"); + if(exstyle & WS_EX_TOOLWINDOW) TRACE(" WS_EX_TOOLWINDOW"); + if(exstyle & WS_EX_WINDOWEDGE) TRACE(" WS_EX_WINDOWEDGE"); + if(exstyle & WS_EX_CLIENTEDGE) TRACE(" WS_EX_CLIENTEDGE"); + if(exstyle & WS_EX_CONTEXTHELP) TRACE(" WS_EX_CONTEXTHELP"); + if(exstyle & WS_EX_RIGHT) TRACE(" WS_EX_RIGHT"); + if(exstyle & WS_EX_RTLREADING) TRACE(" WS_EX_RTLREADING"); + if(exstyle & WS_EX_LEFTSCROLLBAR) TRACE(" WS_EX_LEFTSCROLLBAR"); + if(exstyle & WS_EX_CONTROLPARENT) TRACE(" WS_EX_CONTROLPARENT"); + if(exstyle & WS_EX_STATICEDGE) TRACE(" WS_EX_STATICEDGE"); + if(exstyle & WS_EX_APPWINDOW) TRACE(" WS_EX_APPWINDOW"); + if(exstyle & WS_EX_LAYERED) TRACE(" WS_EX_LAYERED"); #define DUMPED_EX_STYLES \ (WS_EX_DLGMODALFRAME | \ @@ -982,8 +982,8 @@ WS_EX_APPWINDOW | \ WS_EX_LAYERED) - if(exstyle & ~DUMPED_EX_STYLES) DPRINTF(" %08lx", exstyle & ~DUMPED_EX_STYLES); - DPRINTF("\n"); + if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES); + TRACE("\n"); #undef DUMPED_EX_STYLES } Index: winpos.c =================================================================== RCS file: /home/wine/wine/windows/winpos.c,v retrieving revision 1.143 diff -u -u -r1.143 winpos.c --- winpos.c 8 Jan 2003 21:09:25 -0000 1.143 +++ winpos.c 14 Mar 2003 02:29:46 -0000 @@ -1127,19 +1127,19 @@ static void dump_winpos_flags(UINT flags) { TRACE("flags:"); - if(flags & SWP_NOSIZE) DPRINTF(" SWP_NOSIZE"); - if(flags & SWP_NOMOVE) DPRINTF(" SWP_NOMOVE"); - if(flags & SWP_NOZORDER) DPRINTF(" SWP_NOZORDER"); - if(flags & SWP_NOREDRAW) DPRINTF(" SWP_NOREDRAW"); - if(flags & SWP_NOACTIVATE) DPRINTF(" SWP_NOACTIVATE"); - if(flags & SWP_FRAMECHANGED) DPRINTF(" SWP_FRAMECHANGED"); - if(flags & SWP_SHOWWINDOW) DPRINTF(" SWP_SHOWWINDOW"); - if(flags & SWP_HIDEWINDOW) DPRINTF(" SWP_HIDEWINDOW"); - if(flags & SWP_NOCOPYBITS) DPRINTF(" SWP_NOCOPYBITS"); - if(flags & SWP_NOOWNERZORDER) DPRINTF(" SWP_NOOWNERZORDER"); - if(flags & SWP_NOSENDCHANGING) DPRINTF(" SWP_NOSENDCHANGING"); - if(flags & SWP_DEFERERASE) DPRINTF(" SWP_DEFERERASE"); - if(flags & SWP_ASYNCWINDOWPOS) DPRINTF(" SWP_ASYNCWINDOWPOS"); + if(flags & SWP_NOSIZE) TRACE(" SWP_NOSIZE"); + if(flags & SWP_NOMOVE) TRACE(" SWP_NOMOVE"); + if(flags & SWP_NOZORDER) TRACE(" SWP_NOZORDER"); + if(flags & SWP_NOREDRAW) TRACE(" SWP_NOREDRAW"); + if(flags & SWP_NOACTIVATE) TRACE(" SWP_NOACTIVATE"); + if(flags & SWP_FRAMECHANGED) TRACE(" SWP_FRAMECHANGED"); + if(flags & SWP_SHOWWINDOW) TRACE(" SWP_SHOWWINDOW"); + if(flags & SWP_HIDEWINDOW) TRACE(" SWP_HIDEWINDOW"); + if(flags & SWP_NOCOPYBITS) TRACE(" SWP_NOCOPYBITS"); + if(flags & SWP_NOOWNERZORDER) TRACE(" SWP_NOOWNERZORDER"); + if(flags & SWP_NOSENDCHANGING) TRACE(" SWP_NOSENDCHANGING"); + if(flags & SWP_DEFERERASE) TRACE(" SWP_DEFERERASE"); + if(flags & SWP_ASYNCWINDOWPOS) TRACE(" SWP_ASYNCWINDOWPOS"); #define DUMPED_FLAGS \ (SWP_NOSIZE | \ @@ -1156,8 +1156,8 @@ SWP_DEFERERASE | \ SWP_ASYNCWINDOWPOS) - if(flags & ~DUMPED_FLAGS) DPRINTF(" %08x", flags & ~DUMPED_FLAGS); - DPRINTF("\n"); + if(flags & ~DUMPED_FLAGS) TRACE(" %08x", flags & ~DUMPED_FLAGS); + TRACE("\n"); #undef DUMPED_FLAGS }

1 0

running wineboot from the server - HELP!
by Shachar Shemesh 13 Mar '03

13 Mar '03

Hi, I know I promised this over three weeks ago, but things have been very busy for me lately. This email is slightly long. Please please please read through it. I need help to get wineboot working automatically (a blocking issue for 0.9), and I need someone who understands both the server and the loading order to comment. This is the first part of the required change. Applying it at the moment does not make sense, as I am not yet sure that this is the right one (it may make more sense to point the env at the .exe.so file rather than the wrapper - more about that in a second). I am, more or less, ready to give up. Someone suggested I look at the way caching the font metrics delays normal load. Well, I tried. I'm not sure I got it right, though. If I understand correctly, the way to go for wineboot to run is this: wineboot, upon first run, will aquire a system wide named mutex that means "I am working on it". If the mutex exists, it will block on it. Once it got it it will immediatly release it and exit. If the mutext doesn't exist at all, it will aquire it and do it's magic. Once done it will release it, but not delete it, and exit. All that is left to do is that all programs must load wineboot as part of the startup. It may require modifying it to be a DLL instead of an EXE, but so be it. Can someone who understands the server, and the interaction between the server and normal apps comment on this scheme? Also, how do I at all make each and every prog load wineboot.dll? Shachar -- Shachar Shemesh Open Source integration consultant Home page & resume - http://www.shemesh.biz/ Index: programs/winelauncher.in =================================================================== RCS file: /home/sun/sources/cvs/wine/programs/winelauncher.in,v retrieving revision 1.2 diff -u -r1.2 winelauncher.in --- programs/winelauncher.in 5 Jul 2002 21:18:41 -0000 1.2 +++ programs/winelauncher.in 10 Mar 2003 21:27:27 -0000 @@ -37,6 +37,7 @@ WINEBIN=@bindir@ WINELIB=@libdir@ WINESERVER= +WINEBOOT= WINEDLLPATH=@dlldir@ #------------------------------------------------------------------------------ @@ -178,12 +179,20 @@ WINESERVER=$WINEBIN/wineserver fi +if [ -x $WINEBIN/wineboot ] ; then + WINEBOOT=$WINEBIN/wineboot +fi + #------------------------------------------------------------------------------ # Hey, if we built Wine from source, let's add a little extra fun to # mix it up a bit #------------------------------------------------------------------------------ if [ -x $WINEBIN/server/wineserver ] ; then WINESERVER=$WINEBIN/server/wineserver +fi + +if [ -x $WINEBIN/programs/wineboot/wineboot ] ; then + WINEBOOT=$WINEBIN/programs/wineboot/wineboot fi if [ -r $WINELIB/dlls/ntdll.dll.so ] ; then Index: tools/winewrapper =================================================================== RCS file: /home/sun/sources/cvs/wine/tools/winewrapper,v retrieving revision 1.3 diff -u -r1.3 winewrapper --- tools/winewrapper 25 Sep 2002 03:29:56 -0000 1.3 +++ tools/winewrapper 23 Feb 2003 13:49:11 -0000 @@ -70,8 +70,9 @@ fi WINEDLLPATH="$topdir/dlls:$topdir/programs" WINESERVER="$topdir/server/wineserver" +WINEBOOT="$topdir/programs/wineboot/wineboot" WINELOADER="$topdir/miscemu/wine" -export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER +export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINEBOOT WINELOADER # any local settings ? if [ -f "$topdir/.winewrapper" ]

12 19

Anyone working on ListView?
by Vitaliy Margolen 13 Mar '03

13 Mar '03

I was wondering is there is anyone working on ListView? The reason I ask? I got ACDSee 3.1 installed (see my last patch about typo) & working (well, sort of). It looks like ACDSee depends heavily relies on functionality which is missing from ListView. My question is: if I'll start hacking ListView will I be interfering with someone else's work? FYI: ACDSee - if not the best, for sure one of the best image viewers. Version 3.1 could be ran in "Sponsored mode" indefinitely as long as it connects to the I-net to get messages & banners. -- Best regards, Vitaliy Margolen

3 8

Re: Few fixes for ListView
by Dimitrie O. Paun 13 Mar '03

13 Mar '03

On March 13, 2003 01:53 am, Vitaliy Margolen wrote: > - y = (LONG)DPA_GetPtr(infoPtr->hdpaPosX, i); > + y = (LONG)DPA_GetPtr(infoPtr->hdpaPosY, i); Duh! Good spotting, I just looked at it yesterday, and I did not see it. Funny how you see what you want to see... :) -- Dimi.

1 0

Wine Makefile for Charles Petzold's Example Programs
by Dimitrie O. Paun 12 Mar '03

12 Mar '03

Hi folks, For the past few weeks, I've been working with John Kopplin on getting the Petzold examples compiling under Wine using his Gnu Makefile package, available from: http://www.computersciencelab.com/Petzold.htm It took some work, but we've done it. The good news is that all (but 3) examples compile just fine. This has been accomplished while making absolutely _no_ changes to the original source, and very few (and obvious) changes to the GNU Makefiles. This is very good news, as it shows we can have a common build system between Wine and Windows. The only samples that don't work just yet are those from Chap21 which build DLLs, and DLL creation is yet not supported by winegcc. I hope this will change in the near future. The problems that needed fixing were very simple, and quite obvious. They fall into 2 categories: 1. The samples expect to link with the msvcrt, not the Unix libc, so we had to pass the -mno-cygwin flag to the compiler/linker. Under mingw this is the default behaviour. This change is actually beneficial for the Windows port as well, as it will allow the samples to be build using Cygwin's gcc also. As such, it should be considered a portability fix, rather than a Wine specific fix. 2. The filnames used mixed case (not matching the actual name on disk), and some includes use backslash (\), intead of forward slash (/). This problem is typical and simple to address in a portable manner if you can modify the source. As we wanted to not touch the examples in any way, we had to find another way around it. Luckily, Unix accepts virtually any char in a filename (except / of course), as well as links. So we just created the appropriate symbolic links where necessary, or just renamed the file if it made more sense. All these renames / symlinks creation was collected in a nice little intallation script. So, without further delay, here are the instructions on how to try the sample under Wine. (place the Petzold CD in the CDROM drive) $ mount /mnt/cdrom $ mkdir petzold $ cd petzold $ cp -r /mnt/cdrom/* . $ wget http://www.computersciencelab.com/Petzold.zip $ unzip -a Petzold.zip $ bash Wine/install.sh $ make Enjoy! -- Dimi. P.S. As usual, comments, suggestions, and/or flames are more than welcomed!

1 0

Mutual Debugging Efforts
by James 12 Mar '03

12 Mar '03

Hi folks, I've installed Wine RPM from RH 8.0. _*Very*_ impressed with the goal, and the progress so far! (Red Hat seem only to offer an RPM of the 20020605 version, so I am hoping they'll release a newer one soon.) In trying to get applications working, I have a small number of tips, workarounds, queries about peculiar Wine behaviour, and so forth. I can't find anything relevant in the Codeweavers 'zilla database, but I'm not sure I've been very successful at asking the right questions anyway ;) Is this a reasonable place to present my findings and/or ask if others have encountered similar issues? The issues are application-related, but they often seem to be related to Wine configuration and/or anomalies (?bugs) so that's why I tried this mailing list first. (I can't get to a news feed at the moment.) -- Thanks in advance, James.

5 8

cvs and bugzilla down?
by Tony Lambregts 12 Mar '03

12 Mar '03

Is it just me... cvs diff etc gives me "Unknown host cvs.winehq.com." I have the same problem with http://bugs.winehq.com and .org. The thing is that I can see other people using Bugzilla. -- Tony Lambregts

4 6

Re: pthreads and mono
by Alexandre Julliard 12 Mar '03

12 Mar '03

Dan Kegel <dank(a)kegel.com> writes: > I wonder if it's time to consider what it would > take to truly and completely integrate winethreads > and glibc threads, to allow unfettered use of > linux shared libraries from winelib programs. That's basically what the pthreads routines in Wine are for, they provide wrappers so that pthreads calls in linux shared libraries do the right thing. We'll probably need a somewhat different implementation for the NPTL version but the idea is the same. Not every pthreads function is implemented at the moment but it wouldn't be a big deal to add the missing ones. -- Alexandre Julliard julliard(a)winehq.com

2 1

RE: SHFileOperation - add ChangeNotify events
by Rolf Kalbermatter 12 Mar '03

12 Mar '03

Hi, > The main reason why I made this patch is to make our software package work under > WINE. Our application was heavily relies on correct behavior of SHFileOperation > function. In particular: > 1. User confirmation for deleting files and folders. > 2. Ability to delete files only in any given directory. > 3. Receiving notifications for every operation to refresh screens properly. I'm going to check those things. I know that file movements did not implement SHChangeNotification, mainly because I wanted to check first that they really got genereated in Windows native. Do you mean in 2) that the user can acknowledge every single directory to be deleted? Mmmh, thinking about it I see that Windows allows to select 4 different buttons to delete all, only this, this not or cancel. Well this is sort of involved but can be implemented. > In the patch from 2/20/2003 only (1) was implemented properly. > > Yes, I could hack that patch and make it work but I used existing code as a basis > since it implements _all_ functionality of SHFileOperation except unicode. That is not exactly true. The rename operation is not fully implemented in the current code as well as some of the operations with multiple file names. > >>+/************************************************************************ > >>+ * Win32DeleteFile [SHELL32.164] > >>+ * > >>+ * Deletes a file. Also triggers a change notify if one exists. > >>+ * > >>+ * NOTES: > >>+ * Verified on Win98 / IE 5 (SHELL32 4.72, March 1999 build) to be ANSI. > >>+ * This is Unicode on NT/2000 > >>+ */ > >>+static BOOL Win32DeleteFileA(LPCSTR fName) > >>+{ > >>+ LPITEMIDLIST Pidls[1]; > >>+ DWORD dummy; > >>+ > >>+ TRACE("%p(%s)\n", fName, fName); > >>+ > >>+ SHILCreateFromPathA(fName, &Pidls[0], &dummy); > >>+ DeleteFileA(fName); > >>+ SHChangeNotify(SHCNE_DELETE, SHCNF_IDLIST, Pidls[0], NULL); > >>+ SHFree(Pidls[0]); > >>+ return TRUE; > >>+} > > The addition of SHILCreateFromPathA/W to all of these functions is superfluous > > since SHChangeNotify does this for you anyhow if you pass in a normal string > > path. So your patch adds in this respect nothing besides of duplicating already > > existing code. > Not in the placed I used this function. It is impossible to create PIDL from non-existing > path. This fact verified on windows. Whenever I tried to create PIDL of deleted file, > Windows was returning error. This means we have to get PIDL _before_ removing file. > Same goes for renaming files. > > So, after a file gets deleted it's path is no longer valid. What was happening is > application was getting notification that whole drive was deleted! Mmh, we have to investigate further in Windows. Because the Win32... functions itself in W2K do actually not take this precaution and appearently assume that SHChangeNotify does the proper action. So either W2K does something else somewhere or the Wine SHChangeNotify function is broken in that it should be able to create notifications even for just deleted directory and file paths. I guess the later as MSDN mentions nothing that the parameter needs to be an IDLIST instead of a path for those operations but rather explicitedly mentions that SHCNF_PATH is allowed for SHCNE_DELETE, SHCNE_RENAME, SHCNE_RMDIR and such. > > Also please note that there is another patch to SHFileOperation from 2/20/2003 > > pending which reimplements this function from scratch up with a different > > algorithme, which implements all of the operations and is quite thorougly > > verified to behave in all major aspects exactly like the Windows 98/2000 > > version of this function, which one can't fully say of the current function > > in Wine. It happens to use internally also additionally implemented functions > > which also set the according SHChangeNorify in most places. > > I tried using that patch before doing any hacking on my own. It fails at least half > of the conformance tests. I tried to fix few things with that patch but some will > require significant changes. And I didn't want to go that far - working on a patch > which is not even applied. I'm going at the moment through these tests and am also trying to add more tests as well, just need to get my development machine reinstalled first after a HD crash. The tests done before where not the conformation tests but some rather involved tests with multiple shell scripts doing all types of tests for the different file operations. They did indeed not test the user dialogs at all (as they were designed to be unattended tests to run and also the SHChangeNotifiers were not tested either as I wanted to find out first if they were actually done at all. I still intend to get the patch(es) to SHFileOperation applied if possible, but also want to make sure it doesn't break your application at all. Are you interested to get eventual new patches sent directly as they get verified? Rolf Kalbermatter

2 1

Re: (5th) Janitorial dlls/advapi32/registry.c W->A cleanup
by Dmitry Timoshkov 12 Mar '03

12 Mar '03

"Tony Lambregts" <tony_lambregts(a)telusplanet.net> wrote: > -IMPORTS = kernel32 ntdll > +IMPORTS = kernel32 ntdll user32 I'm not sure Alexandre will like it. Until for now, creation of the circular dependencies were prohibitted. Probably it's better to use swprintf from ntdll, or a set of calls strcpyW/ntdll._ultow/strcatW. > -LONG WINAPI RegSaveKeyW( HKEY hkey, LPCWSTR file, LPSECURITY_ATTRIBUTES sa ) > +LONG WINAPI RegSaveKeyA( HKEY hkey, LPCSTR file, LPSECURITY_ATTRIBUTES sa ) > { > - LPSTR fileA = HEAP_strdupWtoA( GetProcessHeap(), 0, file ); > - DWORD ret = RegSaveKeyA( hkey, fileA, sa ); > - if (fileA) HeapFree( GetProcessHeap(), 0, fileA ); > - return ret; > + > + UNICODE_STRING *fileW = &NtCurrentTeb()->StaticUnicodeString; > + STRING fileA; > + > + if (!file || !*file) > + { > + SetLastError(ERROR_PATH_NOT_FOUND); > + return FALSE; As Alexandre has already pointed out, registry APIs are supposed to not change last error value. > + } > + > + RtlInitAnsiString(&fileA, file); > + RtlAnsiStringToUnicodeString(fileW, &fileA, FALSE); > + if (fileW) return RegSaveKeyW(hkey, fileW->Buffer, sa); > + return FALSE; fileW is always not NULL, so, there is no need to check it. What you really need to check is a return value of RtlAnsiStringToUnicodeString. -- Dmitry.

3 6

pthreads and mono
by Mike Hearn 12 Mar '03

12 Mar '03

Hi, I'd just like to double check - will Alexandres new threading work allow Wine to be linked into a program that uses pthreads ok? In particular, the Mono guys are wondering... they were thinking of shipping a modified libwine and all kinds of things that sound bad, so it'd be good to know whether the NPTL implemention sorts this out thanks -mike -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

5 10

BeOS
by George D.Plymale 12 Mar '03

12 Mar '03

Out of curiosity, has Wine ever been made to work under BeOS? I know some work was done long, long ago when BeOS was still "alive" but I wasn't sure if anything more had ever happened or changed since the news on http://bewine.loungenet.org. Thanks.

2 1

Problems with winedbg and 'make test'
by Sylvain Petreolle 11 Mar '03

11 Mar '03

We have a problem with winedbg and the test process. Running the dsound test with wineoss.drv as sound driver should fail for me, it calls the debugger. Unfortunately, winedbg fails to load... and the test is OK, which is pretty wrong... Is there a workaround to this ? I atached log of 'make test' into dsound dir. [syl@snoop dsound]$ make testclean test cd `dirname tests/__testclean__` && make testclean make[1]: Entre dans le répertoire `/home/wine/dlls/dsound/tests' rm -f dsound.ok make[1]: Quitte le répertoire `/home/wine/dlls/dsound/tests' make[1]: Entre dans le répertoire `/home/wine/dlls/dsound/tests' ../../../tools/runtest -q -P wine -M dsound.dll -T ../../.. -p dsound_test.exe.so dsound.c && touch dsound.ok fixme:dsound:IDirectSoundImpl_SetCooperativeLevel (0x4026c960,00010020,2):stub fixme:dsound:IDirectSoundImpl_SetCooperativeLevel (0x4026c960,00010020,2):stub fixme:dsound:IDirectSoundImpl_SetCooperativeLevel (0x4026c960,00010020,1):stub fixme:dsound:IDirectSoundImpl_SetCooperativeLevel (0x4026c960,00010020,1):stub err:ntdll:RtlpWaitForCriticalSection section 0x400d7c80 "../../loader/module.c: loader_section" wait timed out, retrying (60 sec) tid=000a wine: Unhandled exception, starting debugger... err:ntdll:RtlpWaitForCriticalSection section 0x400d7c80 "../../loader/module.c: loader_section" wait timed out, retrying (60 sec) tid=000a err:seh:EXC_DefaultHandling Unhandled exception code c0000194 flags 0 addr 0x400a73cc make[1]: Quitte le répertoire `/home/wine/dlls/dsound/tests' [syl@snoop dsound]$ ===== Sylvain Petreolle spetreolle(a)users.sourceforge.net Fight Spam ! EuroCauce: http://www.euro.cauce.org/en/index.html ICQ #170597259 "Don't think you are. Know you are." Morpheus, in "Matrix". ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

ussing Windows Dll in Linux application.
by Alireza Mahini 11 Mar '03

11 Mar '03

Hi I want ussing Windows Dll in Linux application.(load a Dll in my program via wine ).but i don't know how can i do this. I used winemaker but i couldn't do successfuly.I dont know anything about .spec files ,glue code and other relative word to wine development so i nedd a good reference for working with wine.Is there any compelete documents or simple examples for guidance the newbies of programming with Wine ? I can't believe that the Wine hasn't any guidance book(or document) for developers . Best Regard Alireza Mahini _______________________________________________ Join Excite! - http://www.excite.com The most personalized portal on the Web!

1 0

Re: Various cosmetic tab fixes
by Mike Hearn 11 Mar '03

11 Mar '03

Hi Alexandre, Is there a reason this one wasn't applied? Something to do with the tweaking of the constants perhaps? thanks -mike On Sun, 2003-03-09 at 00:59, Mike Hearn wrote: > Various visual fixes for the tab control. > > ChangeLog: > > - Reduced tab offset constant slightly to avoid clipping the label > - Prevent label overdraw of updown control by reducing the width of the > invalidated region. > > Oh, btw my licensing "stance" is LGPL only, unless you ask me directly. > ... and that ends tonights hacking session > > thanks -mike -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

1 0

Is there any complete document for programming with Wine?
by Alireza Mahini 11 Mar '03

11 Mar '03

HiI am a beginner C++ programmer and i want use a windows dll in a Linux application so i want to learn programming with libwine .Is there any powerfull book or document with examples for Wine programming? Best RegardAlireza Mahini _______________________________________________ Join Excite! - http://www.excite.com The most personalized portal on the Web!

1 0

Re: some ntdll functions (2) - part 1: functions
by Alexandre Julliard 11 Mar '03

11 Mar '03

thomas.mertes(a)gmx.at writes: > + * _ultoa (NTDLL.@) > + * > + * Converts an unsigned long integer to a string. > + * > + * Assigns a '\0' terminated string to str and returns str. > + * Does not check if radix is in the range of 2 to 36 (as native DLL). > + * > + * Difference: > + * - Does not crash on str == NULL (as native DLL). > + * Instead requests the needed memory with RtlAllocateHeap. > + * When RtlAllocateHeap fails: return NULL. Please don't invent extensions to the API. If a function doesn't allocate memory under Windows it shouldn't allocate memory under Wine either. -- Alexandre Julliard julliard(a)winehq.com

4 6

LightWave 3D 7.5
by George D.Plymale 11 Mar '03

11 Mar '03

LightWave seems to be nearly working in Wine without _too_ many issues, but there are a few things that seem to leave it lacking. I will attach the error_out logs that I get upon using the application a little bit. (Both Modeler.exe and LightWav.exe logs) Visually and User Interface wise, some issues I see right off the top are things such as: Deactivated text is red with a slight drop shadow (should be grayed out with that same drop shadow). Some text is dislocated on menu buttons. The numeric pad doesn't seem to function quite right (specifically, I tried to press the `+' key on the keypad to add an object to a scene in LightWav.exe) Menus do not deactivate when the user clicks outside of the menu. This happens in both Modeler and LightWave (layout). To get a menu to disappear one must click a nonactive or deactivated text portion of the menu, so this becomes very burdensome while manipulating the application. I have also had wine crash while using LightWav.exe, so there are some issues that need resolved beyond what I've outlined above, but I think the other issues will come out as the application is used once a "usable" point is reached and we start doing more thorough debugging. The Hub application is also a bit problematic as it resides in the tray. It does sit in my KDE 3.1 tray, which is neat, but when I right click it and tell it to exit, it does not quit so I end up having to kill all wine processes manually. But the hub is the least of my concerns :) and I realize that tray apps don't work quite right yet. I would be very happy to provide input, test and debug fixes if someone is able to provide patches and help for these issues. I am using a cvs version of wine from about 1.5 weeks ago. I have also tried winex cvs and it exhibits many, if not all of the same issues. Winex may be slightly faster in terms of its directdraw functionality as LightWave uses directdraw. Please advise if someone is willing to work through these issues with me and I will be happy to go out an acquire any information needed to get started. Thanks much! It sure is exciting to be _so close_ to leaving Windows entirely behind!!! -George Plymale

4 6

New winsock maintainer needed
by Martin Wilck 11 Mar '03

11 Mar '03

Hi everybody, I am sorry to announce that I won't be able to continue as wine's winsock maintainer. I will be lacking the time and power to fulfill a maintainer's duties appropriately. I guess I have already failed to do so in the last 2 months. There have been few bug reports lately, so the code isn't completely broken for my successor, I hope. On the other hand, I would have liked to clean up some other things like the select() call and the transport provider interface. The fact that I didn't have the time to get going on these also shows that I'd better hand this off to someone else. I'll be coming back here, and perhaps I'll have more time for contributions some time in the future. In any case, I'll be available for questions or complaints about the winsock code under this email address and under my private email, mwilck(a)freenet.de. I have certainly not lost interest in Wine, Linux, and Free Software. Working with you guys has definitely been great fun and I have learned more than in years before. See you later, Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

1 0

Tribes OPENGL and DINPUT
by Kristoffer Ericson 10 Mar '03

10 Mar '03

Greetings, Can Finally confirm the patches sent in by lionell in feb. Dinput now works fine, and Tribes no longer crashes when a key is pressed. Maybe this will solve alot of other games also. Opengl seems to be harder though. The reason why i took so long to post this is that i've been trying to exclude any problems on my computer. From what i know nvidia people should be just fine, got a friend and his tribes works 100% no prob. I will also confirm this when finishing my gentoo install on my machine (aprox 15hours left). 3dfx users on the other hand, first i had problems getting opengl detected and now i got it working but tribes crashes when i try to change to fullscreen (which is only mode with opengl). "err:opengl:X11DRV_describepixelformat Wrong Pixel Format!" "fixme:system:ChangeDisplaySettingsA ((nil,0x00000), stub" "flags=" "fixme:system:ChangeDisplaySettingsA devmode=null (return to default mode)" "fixme:winmm:MMDRV_exit closing while 11-driver open" I'm trying to start tribes in mode 1024x768 (which is my desktop size). I'm running Gentoo: AMD Duron 750Mhz Voodoo3 with working opengl Gentoo Linux FluxBox wm Any ideas? btw, want to take this chance to THANK lionell for his work on getting Tribes to work in WINE. I'm trying to spread the news to all my tribing friends that there's no reason to stay on windows now. I owe you a beer....=] _________________________________________________________________ MSN 8 with e-mail virus protection service: 2 months FREE* http://join.msn.com/?page=features/virus

1 0

SHFileOperation - add ChangeNotify events
by Rolf Kalbermatter 10 Mar '03

10 Mar '03

Vitaliy Margolen <wine-patch(a)kievinfo.com> wrote: >+/************************************************************************ >+ * Win32DeleteFile [SHELL32.164] >+ * >+ * Deletes a file. Also triggers a change notify if one exists. >+ * >+ * NOTES: >+ * Verified on Win98 / IE 5 (SHELL32 4.72, March 1999 build) to be ANSI. >+ * This is Unicode on NT/2000 >+ */ >+static BOOL Win32DeleteFileA(LPCSTR fName) >+{ >+ LPITEMIDLIST Pidls[1]; >+ DWORD dummy; >+ >+ TRACE("%p(%s)\n", fName, fName); >+ >+ SHILCreateFromPathA(fName, &Pidls[0], &dummy); >+ DeleteFileA(fName); >+ SHChangeNotify(SHCNE_DELETE, SHCNF_IDLIST, Pidls[0], NULL); >+ SHFree(Pidls[0]); >+ return TRUE; >+} The addition of SHILCreateFromPathA/W to all of these functions is superfluous since SHChangeNotify does this for you anyhow if you pass in a normal string path. So your patch adds in this respect nothing besides of duplicating already existing code. Also please note that there is another patch to SHFileOperation from 2/20/2003 pending which reimplements this function from scratch up with a different algorithme, which implements all of the operations and is quite thorougly verified to behave in all major aspects exactly like the Windows 98/2000 version of this function, which one can't fully say of the current function in Wine. It happens to use internally also additionally implemented functions which also set the according SHChangeNorify in most places. I believe there are some issues with this patch as it hasn't been applied yet to Wine. One of them could be that it is considered to be to much changes at once. Maybe somebody could comment on what might be the problem with that patch. Rolf Kalbermatter

2 1

RE: Need help with define(s)
by Patrik Stridvall 10 Mar '03

10 Mar '03

> Following Dan's advice I thought I would try my hand at > putting together > a regression test for RegSaveKey(A/W). Well I kind of run into a snag > with that, actualy a couple of them. The first is that the > counterpart > for RegSaveKey is a stub. Oh well thats OK. I can still write > the test > and mark it as todo. No not really. My current problem is as follows: > > LONG RegRestoreKey( HKEY /hKey/, LPCTSTR /lpFile/, DWORD /dwFlags/ ); > > dwFlags can be one of the following constatants > > REG_FORCE_RESTORE (This value is not supported.on windows NT) > REG_NO_LAZY_FLUSH > REG_REFRESH_HIVE > REG_WHOLE_HIVE_VOLATILE > > Wine does not have these defined anywhere. Does anyone know what they > should be and where they should be defined? >From winnt.h in the Microsoft SDK: ---8<--- // // Key restore flags // #define REG_WHOLE_HIVE_VOLATILE (0x00000001L) // Restore whole hive volatile #define REG_REFRESH_HIVE (0x00000002L) // Unwind changes to last flush #define REG_NO_LAZY_FLUSH (0x00000004L) // Never lazy flush this hive #define REG_FORCE_RESTORE (0x00000008L) // Force the restore process even when we have open handles on subkeys ---8<---

1 0

Need help with define(s)
by Tony Lambregts 10 Mar '03

10 Mar '03

Following Dan's advice I thought I would try my hand at putting together a regression test for RegSaveKey(A/W). Well I kind of run into a snag with that, actualy a couple of them. The first is that the counterpart for RegSaveKey is a stub. Oh well thats OK. I can still write the test and mark it as todo. No not really. My current problem is as follows: LONG RegRestoreKey( HKEY /hKey/, LPCTSTR /lpFile/, DWORD /dwFlags/ ); dwFlags can be one of the following constatants REG_FORCE_RESTORE (This value is not supported.on windows NT) REG_NO_LAZY_FLUSH REG_REFRESH_HIVE REG_WHOLE_HIVE_VOLATILE Wine does not have these defined anywhere. Does anyone know what they should be and where they should be defined? -- Tony Lambregts

2 3

id Return to castle wolfenstein - setup issue
by J. Grant 10 Mar '03

10 Mar '03

Hi, I have the Linux binaries for this game, however when running the win32 installer under wine to get the pak files there were two errors, one fatal/recursive. wine ./setup.exe The setup keycode enter screen is displayed. There are 5 boxes, similar to ms-windows installation etc. However after entering 2 characters in the boxes (4 char size) it tabs to the next box. So I have to click back to enter the remaining 2 chars for the previous box etc. This happens on all boxes, the end box is 2 chars, and it auto tabs after 1 char! The error after I had clicked "next" was recursive: ReadFontTbl: missing "{" ReadFontTbl: missing "}" ReadFontTbl: missing "{" ReadFontTbl: missing "}" etc etc had to press ctrl+c to get out of it. Is this because the font metric table rebuilding was done incorrectly? or is it some other area of wine? I could not find the font table config, has anyone else experienced any of these two problems? I thought it might be because my locale is UTF-8, however en_GB also had both of these problems again. Cheers JG please cc me in any replies

1 0

Re: (5th) Janitorial dlls/advapi32/registry.c W->A cleanup
by Marcus Meissner 10 Mar '03

10 Mar '03

> Hope this one makes everyone happy<g> > Change Log: Janitorial. Get rid of W->A calls > > Files Changed: dlls/advapi32/registry.c > > -- > > Tony Lambregts > > Index: Makefile.in > =================================================================== > RCS file: /home/wine/wine/dlls/advapi32/Makefile.in,v > retrieving revision 1.17 > diff -u -r1.17 Makefile.in > --- Makefile.in 25 Oct 2002 19:17:33 -0000 1.17 > +++ Makefile.in 10 Mar 2003 06:22:56 -0000 > -IMPORTS = kernel32 ntdll > +IMPORTS = kernel32 ntdll user32 This creates a circular dependency advapi32 <-> user32 ? Ciao, Marcus

1 0

Re: winedos / Reorganize interrupt handling
by Dimitrie O. Paun 10 Mar '03

10 Mar '03

On March 2, 2003 11:31 am, Jukka Heinonen wrote: > This patch reorganizes interrupt handling a bit. RM and PM > interrupts are now handled using similar functions. > This patch also contains some stuff for handling > emulated hardware interrupts in PM. The relentless persuite of DOS separation -- way cool! BTW Jukka, any idea how much work there's left for this task? I would like to update the status on my Janitorial page: http://www.dssd.ca/wine/Wine-Janitorial.html#winedos -- Dimi.

2 2

Re: Named Pipe patch
by Dan Kegel 09 Mar '03

09 Mar '03

Mike McCormack wrote: > This patch probably shouldn't be applied... it's just to let everybody > know where I'm at with the named pipes code. > > The patch moves away from using unix pipes to implement named pipes, and > instead implements pipes internally. This is necessary to implement > message mode properly (without race conditions). Since Mike's patch is a big rearchitecting that Alexander isn't totally comfortable with, how about something along these lines as a first step? To reflect the fact that freshly minted named pipes can be connected to, I added an fd_for_peer variable that is only set when a named pipe is first created, and added a new state 'ps_fresh_server' to mark pipes which have been freshly created, and arranged for find_partner to be able to find partners in multiple states. I didn't bother dealing with refcounting of the fd_for_peer variable that holds the file descriptor. I'm going on a net diet, so this is the last you'll hear from me for a while. When I get back I hope this is all sorted out :-) - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045 Index: server/named_pipe.c =================================================================== RCS file: /home/wine/wine/server/named_pipe.c,v retrieving revision 1.20 diff -u -p -u -r1.20 named_pipe.c --- server/named_pipe.c 19 Feb 2003 00:33:33 -0000 1.20 +++ server/named_pipe.c 9 Mar 2003 23:08:22 -0000 @@ -47,13 +47,14 @@ enum pipe_state { - ps_none, - ps_idle_server, - ps_wait_open, - ps_wait_connect, - ps_connected_server, - ps_connected_client, - ps_disconnected + ps_none = 0, + ps_idle_server = 1, /* after disconnect */ + ps_wait_open = 2, + ps_wait_connect = 4, + ps_connected_server = 8, + ps_connected_client = 16, + ps_disconnected = 32, + ps_fresh_server = 64, /* after create but before first connection */ }; struct named_pipe; @@ -62,6 +63,7 @@ struct pipe_user { struct object obj; struct fd *fd; + int fd_for_peer; /* used only in fresh state */ enum pipe_state state; struct pipe_user *other; struct named_pipe *pipe; @@ -273,6 +275,7 @@ static struct pipe_user *create_pipe_use return NULL; user->fd = NULL; + user->fd_for_peer = -1; user->pipe = pipe; user->state = ps_none; user->other = NULL; @@ -290,13 +293,13 @@ static struct pipe_user *create_pipe_use return user; } -static struct pipe_user *find_partner(struct named_pipe *pipe, enum pipe_state state) +static struct pipe_user *find_partner(struct named_pipe *pipe, int states) { struct pipe_user *x; for(x = pipe->users; x; x=x->next) { - if(x->state==state) + if(x->state & states) break; } @@ -329,7 +332,13 @@ DECL_HANDLER(create_named_pipe) if(user) { - user->state = ps_idle_server; + int fds[2]; + user->state = ps_fresh_server; + if (!socketpair(PF_UNIX, SOCK_STREAM, 0, fds)) + { + user->fd = alloc_fd( &pipe_user_fd_ops, fds[1], &user->obj ); + user->fd_for_peer = fds[0]; + } reply->handle = alloc_handle( current->process, user, GENERIC_READ|GENERIC_WRITE, 0 ); release_object( user ); } @@ -349,7 +358,7 @@ DECL_HANDLER(open_named_pipe) set_error( STATUS_NO_SUCH_FILE ); return; } - if (!(partner = find_partner(pipe, ps_wait_open))) + if (!(partner = find_partner(pipe, ps_wait_open | ps_fresh_server))) { release_object(pipe); set_error( STATUS_PIPE_NOT_AVAILABLE ); @@ -359,21 +368,31 @@ DECL_HANDLER(open_named_pipe) { int fds[2]; - if(!socketpair(PF_UNIX, SOCK_STREAM, 0, fds)) - { - user->fd = alloc_fd( &pipe_user_fd_ops, fds[1], &user->obj ); - partner->fd = alloc_fd( &pipe_user_fd_ops, fds[0], &partner->obj ); - if (user->fd && partner->fd) + if (partner->state == ps_fresh_server ) { + user->fd = alloc_fd( &pipe_user_fd_ops, partner->fd_for_peer, &user->obj ); + partner->fd_for_peer = -1; + partner->state = ps_connected_server; + partner->other = user; + user->state = ps_connected_client; + user->other = partner; + reply->handle = alloc_handle( current->process, user, req->access, 0 ); + } else if (partner->state == ps_fresh_server ) { + if (!socketpair(PF_UNIX, SOCK_STREAM, 0, fds)) { - notify_waiter(partner,STATUS_SUCCESS); - partner->state = ps_connected_server; - partner->other = user; - user->state = ps_connected_client; - user->other = partner; - reply->handle = alloc_handle( current->process, user, req->access, 0 ); + user->fd = alloc_fd( &pipe_user_fd_ops, fds[1], &user->obj ); + partner->fd = alloc_fd( &pipe_user_fd_ops, fds[0], &partner->obj ); + if (user->fd && partner->fd) + { + notify_waiter(partner,STATUS_SUCCESS); + partner->state = ps_connected_server; + partner->other = user; + user->state = ps_connected_client; + user->other = partner; + reply->handle = alloc_handle( current->process, user, req->access, 0 ); + } } + else file_set_error(); } - else file_set_error(); release_object( user ); } @@ -389,7 +408,7 @@ DECL_HANDLER(connect_named_pipe) if(!user) return; - if( user->state != ps_idle_server ) + if( (user->state & (ps_idle_server|ps_fresh_server)) == 0 ) { set_error(STATUS_PORT_ALREADY_SET); } Index: dlls/kernel/tests/pipe.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/pipe.c,v retrieving revision 1.2 diff -u -p -u -r1.2 pipe.c --- dlls/kernel/tests/pipe.c 25 Feb 2003 03:56:43 -0000 1.2 +++ dlls/kernel/tests/pipe.c 9 Mar 2003 23:08:22 -0000 @@ -88,10 +88,7 @@ void test_CreateNamedPipeA(void) hFile = CreateFileA(PIPENAME, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - todo_wine - { - ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed"); - } + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed"); /* don't try to do i/o if one side couldn't be opened, as it hangs */ if (hFile != INVALID_HANDLE_VALUE) {

1 0

Re: direct sound patches
by Sylvain Petreolle 09 Mar '03

09 Mar '03

Could you document your patch about hardware acceleration in direct sound ? (eg like adding a sample into documentation/samples/config) ===== Sylvain Petreolle spetreolle(a)users.sourceforge.net Fight Spam ! EuroCauce: http://www.euro.cauce.org/en/index.html ICQ #170597259 "Don't think you are. Know you are." Morpheus, in "Matrix". ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

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