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

Re: user32: improve cut/copy/paste behavior of password edit boxes
by Vitaly Lipatov 14 Jun '07

14 Jun '07

В сообщении от 14 июня 2007 Lei Zhang написал(a): > Hi, > > This patch prevents cutting/copying text from edit boxes with the > ES_PASSWORD style. It also corrects the paste behavior of password Why we need prevent it? > edit boxes when the clipboard is empty. -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

2 1

Re: Juan Lang : comdlg32: Initialize file dialog controls before creating dialog.
by Lei Zhang 14 Jun '07

14 Jun '07

Hi Juan, With this patch, the bottom of file dialogs are cut off such that the file type dropdown and the cancel button can barely be seen. - Lei On 6/7/07, Alexandre Julliard <julliard(a)wine.codeweavers.com> wrote: > Module: wine > Branch: master > Commit: 13f18ee7593364a2a685fed2bdfa814431906f0c > URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f18ee7593364a2a685fed2b… > > Author: Juan Lang <juan_lang(a)yahoo.com> > Date: Thu Jun 7 12:27:11 2007 -0700 > > comdlg32: Initialize file dialog controls before creating dialog. > > --- > > dlls/comdlg32/filedlg.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c > index f63e64f..5409b91 100644 > --- a/dlls/comdlg32/filedlg.c > +++ b/dlls/comdlg32/filedlg.c > @@ -1037,11 +1037,11 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l > so it will be easily accessible through a GetPropA(...) */ > SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos); > > + FILEDLG95_InitControls(hwnd); > + > fodInfos->DlgInfos.hwndCustomDlg = > CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd); > > - FILEDLG95_InitControls(hwnd); > - > if (fodInfos->DlgInfos.hwndCustomDlg) > { > RECT rc; > > > >

2 2

Re: [3/5] WineD3D: Present does not clear the depth stencil
by H. Verbeet 14 Jun '07

14 Jun '07

On 14/06/07, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > The patch removes the clearing from Present, except for the DISCARD swap effect if the d3d trace channel is on. It sounds a bit questionable to have different behaviour depending on the debug channel.

2 2

Re: [crypt32/tests 2/2] Vista uses a different error code (RESEND)
by Dmitry Timoshkov 14 Jun '07

14 Jun '07

"Paul Vriens" <paul.vriens.wine(a)gmail.com> wrote: > ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); > ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); > ok ( GetLastError() == ERROR_FILE_INVALID || > + GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ || > GetLastError() == S_OK /* Win98 */, > - "Expected ERROR_FILE_INVALID or S_OK, got 0x%08x\n", GetLastError()); > + "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or S_OK, got 0x%08x\n", GetLastError()); S_OK is an OLE error, ERROR_SUCCESS is correct name in this case. It's not your fault at all, but since you are fixing this code it would be nice to fix it as well. -- Dmitry.

2 1

Re: Fixed the WriteEnvironmentStrings action [try2]
by Dmitry Timoshkov 13 Jun '07

13 Jun '07

"James Hawkins" <truiken(a)gmail.com> wrote: > + while (*cptr && (*cptr == '=' || *cptr == '+' || > + *cptr == '-' || *cptr == '!' || *cptr == '*')) > + { > + switch (*cptr) > + { > + case '=': > + *flags |= ENV_ACT_SETALWAYS; > + break; > + case '+': > + *flags |= ENV_ACT_SETABSENT; > + break; > + case '-': > + *flags |= ENV_ACT_REMOVE; > + break; > + case '!': > + *flags |= ENV_ACT_REMOVEMATCH; > + break; > + case '*': > + *flags |= ENV_MOD_MACHINE; > + break; > + default: > + ERR("Unknown Environment flag: %c\n", *cptr); > + return ERROR_FUNCTION_FAILED; > + } > + > + cptr++; > + (*name)++; > + } A simple 'goto' in the 'default:' case, or using while (*cptr) { if (*cptr == '=') else if (*cptr == '+') { } else if (...) { } else break; } would help to avoid double comparisons and simplify the code. -- Dmitry.

1 0

Re: patch for winefile.
by Dmitry Timoshkov 13 Jun '07

13 Jun '07

"Ivan Sinitsin" <ivan(a)etersoft.ru> wrote: > + static const WCHAR sFont[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; > + HDC hdc = GetDC(0); ... > + if( RegQueryValueEx( hKey, reg_font_facename, NULL, &type, > + (LPBYTE) &logfont.lfFaceName, &sizeW) != ERROR_SUCCESS ) > + strcpyW(logfont.lfFaceName,sFont); It's not very useful to use by default the font that is not available on any Linux installation by default. I'd suggest to use GetStockObject(DEFAULT_GUI_FONT) instead. And you are leaking an hdc. > + LOGFONT logfont; > > wi.cbSize = sizeof( WINDOWINFO ); > GetWindowInfo(Globals.hMainWnd, &wi); > width = wi.rcWindow.right - wi.rcWindow.left; > height = wi.rcWindow.bottom - wi.rcWindow.top; > + GetObject((HGDIOBJ)Globals.hfont, sizeof(logfont), (LPVOID)&logfont); This cast is not needed. -- Dmitry.

1 0

Uninstaller
by Tom Spear 13 Jun '07

13 Jun '07

It's been a while since I brought anything up on this, so I figured I'd ask what was wrong with the last set of patches I sent.. The patches are at [1] and [2], the discussion generated by them are at [3], [4], [5], and [6]... Summary, I did everything I was told in private by a developer (who isn't alexandre, i know), and I got told by another developer, who also isn't alexandre, to fix some things that the first developer said didn't need fixing.. So should I fix those things, or is there some other reason it wasn't committed? [1] http://www.winehq.org/pipermail/wine-patches/2007-June/039911.html [2] http://www.winehq.org/pipermail/wine-patches/2007-June/039912.html [3] http://www.winehq.org/pipermail/wine-devel/2007-June/057253.html [4] http://www.winehq.org/pipermail/wine-devel/2007-June/057254.html [5] http://www.winehq.org/pipermail/wine-devel/2007-June/057255.html [6] http://www.winehq.org/pipermail/wine-devel/2007-June/057258.html Someone please let me know what is wrong (I'd love to hear from The Man, if he has time to take a look), but anyone's responses are welcome (hopefully I get more than 2 reponses this time lol).... -- Thanks Tom

1 0

Re: [GDI+: 7/7] implemented GdipDrawImage
by Evan Stade 13 Jun '07

13 Jun '07

On 6/13/07, Evan Stade <estade(a)gmail.com> wrote: > Hi, > > changelog: > *implemented GdipDrawImage > > dlls/gdiplus/gdiplus.spec | 2 +- > dlls/gdiplus/graphics.c | 28 ++++++++++++++++++++++++++++ > include/gdiplusflat.h | 1 + > 3 files changed, 30 insertions(+), 1 deletions(-) > > -Evan Stade > > ignore this patch

1 0

msi: Fixed the WriteEnvironmentStrings action
by Misha Koshelev 13 Jun '07

13 Jun '07

> + res = RegQueryValueExW(env, name, NULL, &type, NULL, &size); > + if (res != ERROR_FILE_NOT_FOUND || (res == ERROR_SUCCESS && type != REG_SZ)) > + goto done; Hate to point this out but isn't this the exact same error I made in my first (and second) patch from last night? I think it should be: if ((res != ERROR_FILE_NOT_FOUND && res != ERROR_SUCCESS) || (res == ERROR_SUCCESS && type != REG_SZ)) goto done; In your statement, if res is ERROR_SUCCESS it will always goto done no matter what the value of type, because ERROR_SUCCESS != ERROR_FILE_NOT_FOUND. Guess logic errors in if statements are contagious :) Misha

1 0

Re: msi: Do not use type value if call to RegQueryValueEx failed.
by James Hawkins 13 Jun '07

13 Jun '07

On 6/12/07, Misha Koshelev <mk144210(a)bcm.edu> wrote: > This is necessary (bug not sufficient, see my comment in the bug report that I am about > to post) to fix bug 8678. > > It is also clearly correct, as checking the type "returned" by RegQueryValueEx when it fails > makes no sense. > size = 0; res = RegQueryValueExW(env, var, NULL, &type, NULL, &size); - if ((res != ERROR_MORE_DATA && res != ERROR_FILE_NOT_FOUND) || type != REG_SZ) + if ((res != ERROR_MORE_DATA && res != ERROR_FILE_NOT_FOUND) || + (res == ERROR_SUCCESS && type != REG_SZ)) { RegCloseKey(env); return res; This is wrong. If res == ERROR_SUCCESS, then the first condition evaluates to TRUE and we fall through to exit, but then again, res will never be ERROR_SUCCESS after that particular call. Either way, I have a patch ready to send in that fixes the entire action. -- James Hawkins

3 2