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

Re: Re Resend fix for ArrangeCtrlPositions in commdlg
by Alexandre Julliard March 16, 2003

March 16, 2003

Maxime Bellengé <maxime.bellenge(a)laposte.net> writes: > Here is the good one attached. Sorry for the trouble. > Please discard the previous one. Please don't send two copies of the patch in your mails. If you can't make your mailer inline properly then don't inline at all, simply attach it. A wrapped patch is completely useless, inlined or not. -- Alexandre Julliard julliard(a)winehq.com

1 0

W->A dlls/commdlg/fontdlg.c
by Tony Lambregts March 16, 2003

March 16, 2003

On Dimi's Janitorial page he has the entry for: dlls/commdlg/fontdlg.c: comdlg32: ChooseFontW: illegal call to HEAP_strdupWtoA When I look at the actual call I see that it is inside a comment block (#if 0... #endif) Although the actual implentation of ChooseFontW does not make direct W->A calls, this whole setup for ChooseFont(A/W) is IMO a mess and just not right. BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont) { CHOOSEFONTA cf_a; LOGFONTA lf_a; CHAR style_a[LF_FACESIZE]; cf_a.lpLogFont = &lf_a; cf_a.lpszStyle = style_a; if (ChooseFontWtoA(lpChFont, &cf_a) == FALSE) { COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); return FALSE; } if (ChooseFontA(&cf_a) == FALSE) { if (cf_a.lpTemplateName != NULL) HeapFree(GetProcessHeap(), 0, (LPSTR)(cf_a.lpTemplateName)); return FALSE; } ChooseFontAtoW(&cf_a, lpChFont); return TRUE; } I would appreciate Any comments about this. -- Tony Lambregts

2 3

Treeview problem?
by Mike Hearn March 16, 2003

March 16, 2003

Hi, Could somebody please explain why this patch : http://www.winehq.com/hypermail/wine-patches/2003/02/0107.html for fixing the treeview wasn't applied? The author said there is a test case that shows this is what NT does, so I'm wondering what needs to be done to it to make it acceptable. thanks -mike

1 0

Re: DSOUND: buffer underrun & sound chunks left out
by Tony Lambregts March 16, 2003

March 16, 2003

Jerry Ji wrote: > This patch fix two problem: > 1. the improper play position return by DSOUND_PrimaryGetPosition - beffer > underrun, > 2. and the notify mechanics we used - sound data skipped. > > Please refer to the comment for the first problem. > > DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len) original use current > play position and the count of data TO BE played to check if a notify should > be generated. That's to say, an application may be notified before the data > at the desired offset really played. Since the application got the notify > that the data in it's demand region is useless (played), it might call > IDirectSoundBufferImpl_Lock to lock this region, which contains useful data, > IDirectSoundBufferImpl_Lock will handle the conflict by cancelling the > region by default. > > NOTE: > There are still problems with DSBPN_OFFSETSTOP event. If the buffer's state > is STATE_STOPPED, my patch will set the event each time DSOUND_PerformMix > called by the timer! I know it's a bad idea, so if anyone have a better > solution, please re-patch it. > > ChangeLog: > - Fixed buffer underrun & sound chunks left out. > First off thankyou for your contribution Your patch is not in the right format.ie: it can not be read inline and Alexandre can't do "cat raw_mail | patch -p0" [...] ------=_NextPart_000_0089_01C2EC19.AE973D80 Content-Type: application/octet-stream; name="patch.diff" [....] - if (playpos) This->last_playpos =3D *playpos;=0A= + if (playpos) {=0A= + This->last_playpos =3D This->playpos;=0A= + This->playpos =3D *playpos;=0A= + }=0A= [....] Please see section 5.2.1 Inline attachments with Outlook Express. at the following link. http://www.winehq.org/Docs/wine-devel/style-notes.shtml -- Tony Lambregts

1 0

[RFC] 16 bit functions
by Dimitrie O. Paun March 16, 2003

March 16, 2003

Hi folks, I was just thinking that it would be nice if a we had a simple naming rule for 16 bit functions: "A function is 16 bit if and only if it's name ends in 16." This way, we can have more reliable tools for detecting 32-16 bit cross calls (unfortunately, winapi_check fails in many instances for this check). Most 16 bit functions already adhere to this naming convention, but there are still a few that don't. Alexandre, would renaming such functions be acceptable? If so, I can add yet another janitorial task... -- Dimi.

2 3

Re: Resend of the Fix for ArrangeCtrlPositions in commdlg
by Tony Lambregts March 16, 2003

March 16, 2003

Maxime Bellengé wrote: > As requested by Alexandre, I send the patch with more comments. > > I have made several test cases under windows and taken screenshot to > compare with wine. If someone is interested in seeing them, send me a > mail. > > ChangeLog: > - Fix how the size of the dialog is computed and the child component > placed. > > Something is wrong here... You have two patches here. The patch with the comments got line wrapped (Looks like part of your signature in mozilla) and the patch that was attached does not contain the comments. -- Tony Lambregts

1 0

bitmap corruption
by Mike Hearn March 16, 2003

March 16, 2003

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 March 16, 2003

March 16, 2003

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 March 16, 2003

March 16, 2003

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 March 15, 2003

March 15, 2003

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