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

Re: user[3/5]: handle special cases for SPI_SETDESKWALLPAPER (FIXED)
by Andrey Turkin 11 Jun '06

11 Jun '06

Andrew Ziem wrote: > Please use this patch instead of previous "user3.patch". Thanks to > Andrey Turkin for catching the uninitialized variable. > > changelog: > user: handle special cases for SPI_SETDESKWALLPAPER > > The special cases remove the wallpaper or set it to default. > Previously, these cases were ignored, so Wine would crash. > > > > ------------------------------------------------------------------------ > > > > - if (filename == (LPSTR)-1) > + if ((LPCSTR)SETWALLPAPER_DEFAULT == filename || (LPCSTR)NULL == filename || '\0' == filename[0]) > { > - GetProfileStringA( "desktop", "WallPaper", "(None)", buffer, 256 ); > - filename = buffer; > + /* set default wallpaper or remove wallpaper*/ > + if (hbitmapWallPaper) > + DeleteObject( hbitmapWallPaper ); > + return TRUE; > } > hdc = GetDC( 0 ); According to MSDN, if - pvParam==SETWALLPAPER_DEFAUL || pvParam==NULL, then wallpaper will be set to default one - pvParam[0]=='\0', then wallpaper will be removed. I cannot see any signs of such distinction in your code :)

2 1

Re: getuname: add stub implementation [try 4]
by Dmitry Timoshkov 11 Jun '06

11 Jun '06

"Vitaly Lipatov" <lav(a)etersoft.ru> wrote: > Add WINE_PREATTACH and correct numer of params for GetUName > Try4: Export functions by name (@), fix warning in FIXME > > Changelog > add minimal implementation for getuname dll and GetUName function Just curious, what application besides charmap.exe uses getuname.dll? -- Dmitry.

2 2

msi: sql parsing
by Joris Huizer 10 Jun '06

10 Jun '06

Hello, As somebody asked me whether I could try to use MSN Beta 8, I decided to give it a try; The installer quits at some point, caused by an unhandled SQL command "ALTER TABLE `Registry` HOLD" I decided to have a look at this, but I'm not familiar with msi, and my SQL knowledge isn't very big either; anyway, I added a few lines to the parser; now -- how could I find how to implement something for this? Regards, Joris diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 86ebe30..f8c9f40 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -79,7 +79,7 @@ static struct expr * EXPR_wildcard( void int integer; } -%token TK_ABORT TK_AFTER TK_AGG_FUNCTION TK_ALL TK_AND TK_AS TK_ASC +%token TK_ABORT TK_AFTER TK_ALTER TK_AGG_FUNCTION TK_ALL TK_AND TK_AS TK_ASC %token TK_BEFORE TK_BEGIN TK_BETWEEN TK_BITAND TK_BITNOT TK_BITOR TK_BY %token TK_CASCADE TK_CASE TK_CHAR TK_CHECK TK_CLUSTER TK_COLLATE TK_COLUMN %token TK_COMMA TK_COMMENT TK_COMMIT TK_CONCAT TK_CONFLICT @@ -127,7 +127,7 @@ static struct expr * EXPR_wildcard( void %type <column_list> selcollist column column_and_type column_def table_def %type <column_list> column_assignment update_assign_list constlist %type <query> query from fromtable selectfrom unorderedsel -%type <query> oneupdate onedelete oneselect onequery onecreate oneinsert +%type <query> oneupdate onedelete oneselect onequery onecreate oneinsert onealter %type <expr> expr val column_val const_val %type <column_type> column_type data_type data_type_l data_count %type <integer> number @@ -156,6 +156,7 @@ onequery: | oneinsert | oneupdate | onedelete + | onealter ; oneinsert: @@ -235,6 +236,14 @@ onedelete: } ; +onealter: + TK_ALTER TK_TABLE table TK_HOLD + { + FIXME("Unimplemented: ALTER TABLE, HOLD\n"); + $$ = NULL; + } + ; + table_def: column_def TK_PRIMARY TK_KEY selcollist { @@ -807,7 +816,7 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCW sql.len = 0; sql.view = phview; sql.mem = mem; - + r = SQL_parse(&sql); TRACE("Parse returned %d\n", r); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 05c3cda..9b628c0 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -45,6 +45,7 @@ struct Keyword { static const Keyword aKeywordTable[] = { { "ABORT", TK_ABORT }, { "AFTER", TK_AFTER }, + { "ALTER", TK_ALTER }, { "ALL", TK_ALL }, { "AND", TK_AND }, { "AS", TK_AS },

1 0

awwww
by Dan Kegel 10 Jun '06

10 Jun '06

Hey, I wanted to see if my computer could run Vista, but: $ ~/wine/programs/msiexec/msiexec /i VistaUpgradeAdvisor.msi fixme:msi:MsiInstallProductW L"VistaUpgradeAdvisor.msi" (null) err:msidb:load_string_table string table corrupt? err:msidb:load_string_table string table load failed! (000218f3 != 000047ef) Filed as http://bugs.winehq.org/show_bug.cgi?id=5395

5 6

Re: user[3/5]: handle special cases for SPI_SETDESKWALLPAPER
by Andrey Turkin 10 Jun '06

10 Jun '06

I cannot see where emptyW initialized. Andrew Ziem wrote: > The special cases remove the wallpaper or set it to default. > Previously, these cases were ignored, so Wine would crash. > <snip> > + if (NULL == pvParam || SETWALLPAPER_DEFAULT == pvParam) > + { > + static const WCHAR emptyW[1]; > + if (!SetDeskWallPaper( (LPSTR)pvParam )) > + return FALSE; > + SYSPARAMS_Save(SPI_SETDESKWALLPAPER_REGKEY, SPI_SETDESKWALLPAPER_VALNAME, emptyW, fWinIni); > + } > + else > + { > + if (!SetDeskWallPaper( (LPSTR) pvParam )) > + return FALSE; > + } > + break; >

2 1

Re: user[2/5]: implement A version of SPI_GETDESKWALLPAPER
by Andrey Turkin 10 Jun '06

10 Jun '06

Andrew Ziem wrote: > Previously, SPI_GETDESKWALLPAPER was handled by default: in the > switch, so the function (an A- function) would return a W string. > > ------------------------------------------------------------------------ > > > 5e4b86d689c899fc896d2870efaca9c335f01da0 > diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c > index 5fed316..fb54b3b 100644 > --- a/dlls/user/sysparams.c > +++ b/dlls/user/sysparams.c > @@ -2496,6 +2496,16 @@ BOOL WINAPI SystemParametersInfoA( UINT > break; > } > > + case SPI_GETDESKWALLPAPER: /* 115 */ > + { > + WCHAR buffer[MAX_PATH]; > + ret = SystemParametersInfoW( SPI_GETDESKWALLPAPER, uiParam, buffer, fuWinIni ); > + if (!WideCharToMultiByte(CP_ACP, 0, buffer, -1, pvParam, uiParam, NULL, NULL)) > + ret = FALSE; > + else > + pvParam = buffer; > + } > + > default: > ret = SystemParametersInfoW( uiAction, uiParam, pvParam, fuWinIni ); > break; > > > ------------------------------------------------------------------------ > > > I think break is needed after case. Also, for what else pvParam = buffer; need for?

1 0

Recording with "Lexia" (mci "open new")
by Peter Åstrand 10 Jun '06

10 Jun '06

Hi, I've patched Wine to make recordings work in "Lexia" (http://www.lexia.just.nu/, currently down). When I started out, recordings didn't work, and I was getting traces like: trace:mci:mciSendStringW (L"open new type waveaudio alias capture", 0x7db2ebc8, 128, (nil)) fixme:mci:mciSendStringW 'new': NIY as device name trace:mci:mciSendStringW (L"set capture time format milliseconds bitspersample 16 samplespersec 22050 channels 1 bytespersec 44100 alignment 4", 0x7db92fa8, 128, (nil)) trace:mci:mciSendStringW (L"open capture wait", (nil), 0, (nil)) trace:mci:MCI_LoadMciDriver wDevID=0001 fixme:mci:MCI_LoadMciDriver Couldn't load driver for type L"CAPTURE". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini trace:mci:mciSendStringW (L"record capture", 0x7db2ebc8, 128, (nil)) trace:mci:mciSendStringW (L"open capture wait", (nil), 0, (nil)) trace:mci:MCI_LoadMciDriver wDevID=0001 fixme:mci:MCI_LoadMciDriver Couldn't load driver for type L"CAPTURE". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini I created the patch below, but eventually, it turned out that it's sufficient to add this to system.ini: [mci] CAPTURE=mciwave.dll In other words: With this change, recordings works despite mciSendStringW returning MCIERR_MISSING_DEVICE_NAME. Strange but true. To summarize: 1) I believe the mciwave.c patch below makes sense in any case, right? Without it freed memory is used. 2) Any ideas why "open new" works, even though MCIERR_MISSING_DEVICE_NAME is returned? 3) Most importantly: Why is it necessary to add CAPTURE to system.ini? Perhaps the "alias" argument isn't correctly handled? The patch: Index: dlls/winmm/mci.c =================================================================== RCS file: /home/wine/wine/dlls/winmm/mci.c,v retrieving revision 1.69 diff -u -r1.69 mci.c --- dlls/winmm/mci.c 23 May 2006 12:48:57 -0000 1.69 +++ dlls/winmm/mci.c 8 Jun 2006 12:53:43 -0000 @@ -1283,10 +1283,9 @@ /* case dev == 'new' has to be handled */ if (!strcmpW(dev, wszNew)) { - FIXME("'new': NIY as device name\n"); - dwRet = MCIERR_MISSING_DEVICE_NAME; - goto errCleanUp; - } + /* FIXME: Use temp file name. Remove after use. */ + dev = MCI_strdupAtoW("mcitemp.wav"); + } /* otherwise, try to grab devType from open */ if (!strcmpW(verb, wszOpen)) { Index: dlls/mciwave/mciwave.c =================================================================== RCS file: /home/wine/wine/dlls/mciwave/mciwave.c,v retrieving revision 1.2 diff -u -r1.2 mciwave.c --- dlls/mciwave/mciwave.c 23 May 2006 12:48:10 -0000 1.2 +++ dlls/mciwave/mciwave.c 8 Jun 2006 12:53:43 -0000 @@ -409,18 +409,19 @@ fn = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!fn) return MCIERR_OUT_OF_MEMORY; strcpyW(fn, filename); + /* Note: Frees filename as well */ HeapFree(GetProcessHeap(), 0, (void*)wmw->openParms.lpstrElementName); wmw->openParms.lpstrElementName = fn; - if (strlenW(filename) > 0) { + if (strlenW(fn) > 0) { /* FIXME : what should be done if wmw->hFile is already != 0, or the driver is playin' */ - TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(filename)); + TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(fn)); - wmw->hFile = mmioOpenW((LPWSTR)filename, NULL, + wmw->hFile = mmioOpenW((LPWSTR)fn, NULL, MMIO_ALLOCBUF | MMIO_DENYWRITE | MMIO_READ); if (wmw->hFile == 0) { - WARN("can't find file=%s!\n", debugstr_w(filename)); + WARN("can't find file=%s!\n", debugstr_w(fn)); dwRet = MCIERR_FILE_NOT_FOUND; } else Regards, -- Peter Åstrand ThinLinc Chief Developer Cendio http://www.cendio.se Teknikringen 3 583 30 Linköping Phone: +46-13-21 46 00

2 4

riched20 bug 4452 fix still not merged?
by Dan Kegel 10 Jun '06

10 Jun '06

Hi Matt, can you add http://bugs.winehq.org/show_bug.cgi?id=4452 to your list of riched20 bugs to look at? This one even has a fix, but for some reason the fix hasn't been merged yet. Thanks, Dan

1 0

Re: notepad patches (search/replace, etc)
by Vitaliy Margolen 10 Jun '06

10 Jun '06

Thursday, June 8, 2006, 6:40:33 PM, Anoni Moose wrote: > This is my first patch to an open source project... if anyone has any comments/suggestions, please tell me. :) > These patches add full search, search next, replace, and goto line functionality to notepad. Too bad I missed the 0.9.15 release! > Changelog: > * programs/notepad/main.c, programs/notepad/dialog.c, > programs/notepad/main.h, programs/notepad/notepad_res.h, > programs/notepad/dialog.h: > notepad: Add/call functions to load/save globals settings (including font info) to registry. > -Added full Search/Search Next functionality. > -Added full Replace functionality. > -Added full Goto Line functionality. > -Load/Save to registry whether we want to wrap long lines or not. Please one patch per email. You should combine all of your changes into one patch if that's one logical change and can be applied by itself. Of course resultant code should compile and work. > @@ -638,6 +641,8 @@ > Globals.hFont=CreateFontIndirect( &lf ); > Globals.lfFont=lf; > SendMessage( Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE ); > + SETTINGS_SaveSettings(); > + Please respect indentation. Don't just copy&paste stuff all over the file. > VOID DIALOG_Search(VOID) > { > + > + if (Globals.find.hwndOwner == NULL) { > ZeroMemory(&Globals.find, sizeof(Globals.find)); > + } > Globals.find.lStructSize = sizeof(Globals.find); > Globals.find.hwndOwner = Globals.hMainWnd; Pretty much the same here: don't just insert stuff, indent it properly. And please no extra blank lines nor needles curly brackets. > + if (Globals.replace.hwndOwner == NULL) { > + ZeroMemory(&Globals.replace, sizeof(Globals.replace)); > + } Respect indentation and style of the file you changing. In this case 4-spaces not 2. > + Globals.hFindReplaceDlg = ReplaceText(&Globals.replace); > + assert(Globals.hFindReplaceDlg != 0); > +} Please don't use assert. Do a proper error checking instead. > + if (result == -1) { /* text not found. */ > + MessageBoxA(Globals.hEdit, "Cannot find text.", NULL, MB_OK | MB_ICONINFORMATION); > + } else { You should put all the text into resource files. > +WCHAR *GrabWindowTextW(HWND hWnd, DWORD *nbytes) { > + > + static WCHAR *data = NULL; > + DWORD _nbytes = 0; > + > + if (nbytes == NULL) nbytes = &_nbytes; > + > + *nbytes = (*nbytes == 0 ? GetWindowTextLengthW(hWnd) + 1 : *nbytes); > + data = HeapAlloc(GetProcessHeap(), 0, (*nbytes) * sizeof(WCHAR)); > + GetWindowTextW(hWnd, data, (*nbytes)+1); > + return data; > +} Why do you need static if you return allocated buffer? nbytes is misleading - it should be nchars. (*nbytes)+1 is incorrect. You allocated enough memory for *nbytes only. > +int SearchText(HWND hWnd, LPFINDREPLACE find, int pos); Please use windows types so they would work right on 64-bit platforms. > + "^R", CMD_REPLACE Native notepad has it as ctrl+H. Vitaliy Margolen

3 4

Re: netapi32: Improve NetUserGetInfo function
by Joris Huizer 10 Jun '06

10 Jun '06

Simon Kissane wrote: > netapi32: Improve NetUserGetInfo function > * Implemented support for all levels documented by MSDN > * Corrected error codes for nonexistent levels > * Now works with empty string as server name > > I have also attached a C program (which can be compiled with MINGW), > which tests the NetUserGetInfo functionality. > Perhaps you could write unit tests based on the test program, to show correctness of the current code - this helps avoiding regressions HTH, Joris

1 0