wine-devel June 2006

wine-devel@winehq.org

174 participants
352 discussions

Re: Broken FC5 packages - stay clear.
by Hans Leidekker 12 Jun '06

12 Jun '06

On Monday 12 June 2006 11:37, Andreas Bierfert wrote: > Why is there no BuildRequires for freetype? gphoto2? We also have > >These two are pulled in by other dependencies and thus don't need an explicit >listing (e.g. freetype by fontconfig-devel). Good, but shouldn't zlib-devel be pulled in like that too then? > zlib-devel on the other hand is not in the minimal buildroot :) Like Marcus said, freetype-devel is probably missing a dependency on zlib-devel. Wine doesn't directly depend on zlib-devel AFAICT. And it would be nice if you could add gphoto2 support. -Hans

1 0

Re: iphlpapi: forward Icmp* functions to icmp.dll
by Steven Edwards 12 Jun '06

12 Jun '06

On 6/11/06, Simon Kissane <skissane(a)gmail.com> wrote: > In WinXP, these functions are implemented in iphlpapi.dll as well as > icmp.dll (Win2000). > They are already in Wine's icmp.dll, so forward the iphlpapi to icmp.dll Being its a small amount of code in icmp.dll I think we should just duplicate it. Our dependancies should really match windows and the last time I looked iphlpapi did not depend on icmp.dll in win2k. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

3 2

Re: DDraw: New ddraw lib
by Jesse Allen 11 Jun '06

11 Jun '06

On 6/9/06, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > This is a resend of my ddraw rewrite, with some modifications Alexandre asked > for. I removed the whitespace fixes from the files which are taken from the > old ddraw code(light.c, material.c, clipper.c, viewport.c, executebuffer.c, > ddcomimpl.h, ddraw_thunks, surface_thunks). There are no functional changes > compared to the old patch, except a small change to forward the SYSTEMMEM and > WRITEONLY flags for vertexbuffers to WineD3D. > > The other files which have the same name as in the old code(main.c, > vertexbuffer.c): Those are rewrites(file deleted and re-created), so I won't > get a useful diff for them, no matter what I do. > > ChangeLog: > Stefan Dösinger: Use WineD3D for DDraw > I just want to state, the patch is very helpful when you can't use DGA. I just ran a test with Starcraft in multiplayer last night. Using OpenGL is noticibly faster than non-DGA. So I hope that it will get applied for 0.9.16. Jesse

2 6

Icmp* functions in iphlpapi.dll
by Simon Kissane 11 Jun '06

11 Jun '06

Hi In Win2000, the ICMP functions exist in icmp.dll In WinXP, they are still there, but they have also been duplicated into iphlpapi.dll How would one go about adding them to iphlpapi? Does one just duplicate all the code in the second DLL, or is there a way to have some function implemented once & then exported by multiple DLLs? (I'm a Wine newbie...) Suppose one was to add code to iphlpapi's LibMain which did LoadLibrary & GetProcAddress to get the addresses of the functions in icmp.dll, and then the iphlpapi implementations just called the icmp.dll implementations? (I'm assuming doing a static import would result in some kind of name collission?) Cheers Simon

4 3

My new hero...
by Dan Kegel 11 Jun '06

11 Jun '06

Qingdao is my new hero. He's really on a roll: http://www.winehq.org/pipermail/wine-cvs/2006-June/023427.html fixes a Visual Basic safearray redim bug, http://bugs.winehq.org/show_bug.cgi?id=5217 and he has two other fixes in unrelated areas this month. Mike, what was that you were saying about there not being any wine hackers who fixed problems all around the wine tree anymore? - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

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

kernel32.VerSetConditionMask present
by Vitaly Lipatov 10 Jun '06

10 Jun '06

VerSetConditionMask function is introduced in kernel32 science Windows 2000. Some broken applications check VerSetConditionMask present via GetProcAddress for check version of running Windows. What is the preferable method to disable export VerSetConditionMask from kernel32 when we have win98 version? -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

1 0

Re: svrapi: add stub implementation [try 2]
by Robert Shearman 10 Jun '06

10 Jun '06

Vitaly Lipatov wrote: >+1 stub NetAccessAdd >+2 stub NetAccessCheck >+3 stub NetAccessDel >+4 stub NetAccessEnum >+5 stub NetAccessGetInfo >+6 stub NetAccessGetUserPerms >+7 stub NetAccessSetInfo >+8 stub NetConnectionEnum >+9 stub NetFileClose2 >+10 stub NetFileEnum >+11 stub NetSecurityGetInfo >+12 stub NetServerGetInfo >+13 stub NetSessionDel >+14 stub NetSessionEnum >+15 stub NetSessionGetInfo >+16 stub NetShareAdd >+17 stub NetShareDel >+18 stdcall NetShareEnum(str long ptr long ptr ptr) >+19 stub NetShareGetInfo >+20 stub NetShareSetInfo > > These should all be just exported by name (@) not also by ordinal judging by the fact that they are in alphabetical order. -- Rob Shearman

1 0

Re: WineD3D: Fog fixes
by Jesse Allen 10 Jun '06

10 Jun '06

On 6/9/06, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This patch corrects a few issues with fog on transformed vertices, and > non-pixel-non-vertex fog. > > If WINED3DRS_FOGENABLE is TRUE, but WINED3RS_FOGVERTEXMODE and > WINED3DRS_FOGTABLEMODE are D3DFOG_NONE, then, according to the msdn, the > alpha channel specular color vertex color contains a pre-calculated fog > value. The same applied to transformed vertices if Vertexfog is enabled. This > patch uses glFogCoord to pass it to GL if GL_EXT_fog_coord is supported, and > disables GL fog if it isn't to minimize rendering issues. > > This patch makes Swat3 and Battlezone 2 happy, and the fog in Prince of Persia > 3D looks more correct now. I hoped that patch might solve the disappearing > objects problem in Half-Life 2, but unfortunately it doesn't, this seems not > to be fog-related :-( > > ChangeLog: > Stefan Dösinger(for CodeWeavers): Fog fixes > > This patch doesn't work with the latest fglrx saying missing symbol for glFogCoordf. Mesa is ok though. Jesse

2 1

winspool/tests: Tests for GetPrintProcessorDirectory (resend for current HEAD)
by Detlef Riekenberg 09 Jun '06

09 Jun '06

Am Freitag, den 02.06.2006, 00:11 +0200 schrieb Detlef Riekenberg: > Changelog: > - winspool/tests: Tests for GetPrintProcessorDirectory > Resend for current HEAD -- By By ... ... Detlef

1 0

Re: Yet another round of redundand NULL checks before HeapFree (found by Smatch).
by Michael Stefaniuc 09 Jun '06

09 Jun '06

Please disregard this patch as a false positive crept in. Michael Stefaniuc wrote: > hopefully this should be the last round of redundand NULL checks before > HeapFree removals. I know, famous last words. But this time i have > extended the redundant_null_check.pl Smatch script to find all non-null > variables from arbitrary complex if-expressions and check that any of > them dosn't get HeapFree'd on the truth path. > diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c > index e537bc4..bec3526 100644 > --- a/dlls/msacm32/driver.c > +++ b/dlls/msacm32/driver.c > @@ -587,7 +587,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVE > return MMSYSERR_NOERROR; > gotError: > WARN("failed: ret = %08x\n", ret); > - if (pad && !pad->hDrvr) > + if (!pad->hDrvr) nice NULL pointer dereference. > HeapFree(MSACM_hHeap, 0, pad); > return ret; > } bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

3 2

Re: user: Added specific winproc functions for calling dialog procedures.
by James Hawkins 09 Jun '06

09 Jun '06

Hey Alexandre, As of the following commit: Commit: 397bf3c2b133fe36529efcc4c1906bac1aac2da8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=397bf3c2b133fe36529efcc… Author: Alexandre Julliard <julliard at winehq.org> Date: Tue May 9 20:33:11 2006 +0200 user: Added specific winproc functions for calling dialog procedures. The VB/VC++ 6 installers crash pretty early in the setup sequence. Two things to keep in mind are that the installer works correctly if I set the win version to win98, or I revert the following part of the patch: @@ -447,14 +441,8 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, U SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 ); - if ((dlgproc = DEFDLG_GetDlgProc( hwnd ))) - { - /* Call dialog procedure */ - result = CallWindowProcA( dlgproc, hwnd, msg, wParam, lParam ); - /* 16 bit dlg procs only return BOOL16 */ - if( WINPROC_GetProcType( dlgproc ) == WIN_PROC_16 ) - result = LOWORD(result); - } + if ((dlgproc = DEFDLG_GetDlgProc( hwnd ))) /* Call dialog procedure */ + result = WINPROC_CallDlgProcA( dlgproc, hwnd, msg, wParam, lParam ); if (!result && IsWindow(hwnd)) { I've done a fair bit of digging around on this bug, and I've noticed some things that are probably obvious to you, but might help put light on the situation for others. The order of the calls before the patch is applied is: DefDlgProcA -> CallWindowProcA -> WINPROC_CallWndProc and after the patch is applied: DefDlgProcA -> WINPROC_CallDlgProcA -> WINPROC_CallWndProc I've added debug printf's in these functions to see when they're called and what certain pointers contain. With the patch applied and and win version set to win98, the debug output is the same: DefDlgProcA CallWindowProcA func: 0xffff0027 CallWindowProcA proc: 0x40a5e1ac WINPROC_CallWndProc proc: 0x403020 CallWindowProcA func: 0x41ea2020 CallWindowProcA handle_to_proc returned NULL WINPROC_CallWndProc proc: 0x41ea2020 WINPROC_CallWndProc proc: 0x41ea2020 CallWindowProcA func: 0x41ea2020 CallWindowProcA handle_to_proc returned NULL WINPROC_CallWndProc proc: 0x41ea2020 WINPROC_CallWndProc proc: 0x41ea2020 WINPROC_CallWndProc proc: 0x41ea2020 WINPROC_CallWndProc proc: 0x41ea2020 WINPROC_CallWndProc proc: 0x41ea2020 and the installer goes on as usual (we know this because of a richedit trace from the richedit control on the next install screen). Here is the debug output with the patch applied and version set to win2000: DefDlgProcA DefDlgProcA dlgproc: 0xffff0026 WINPROC_CallDlgProcA func: 0xffff0026 WINPROC_CallDlgProcA proc: 0x40a5e1f8 WINPROC_CallDlgProcA proc->thunk.proc: 0x412020 WINPROC_CallWndProc proc: 0x412020 wine: Unhandled page fault on read access to 0x00000000 at address 0x411799 (thread 0009), starting debugger... Any insight you can provide about this bug would be greatly appreciated. -- James Hawkins

1 0

Re: [WINED3D 2/9] Add the bulk of the GLSL string generation functions
by H. Verbeet 09 Jun '06

09 Jun '06

Is making the distinction between rgba and xyzw really needed? xyzw / rgba / stpq should be equivalent and the distinction is mostly for readability if you know the variable type. However, since you can't decided that purely based on whether something is a vertex shader or a pixel shader, the way it's currently done might be misleading in some cases.

2 1

Re: [WINED3D 9/9] Allow drawPrim to create and use the GLSL program
by H. Verbeet 09 Jun '06

09 Jun '06

Does this reset the currently used program to 0 when fixed function is supposed to be used again? I think we should just do glUseProgramObjectARB(programId), since when fixed function is supposed to be used the program id will be 0. That also mean you don't have to do an explicit glUseProgramObjectARB(0) at a later stage, which saves an extra shader switch, in particular if the same shader is used in the next DrawPrimitive call.

1 0

Re: Update the progress control while installing.
by Dmitry Timoshkov 09 Jun '06

09 Jun '06

"Mike McCormack" <mike(a)codeweavers.com> wrote: > --- a/dlls/msi/dialog.c > +++ b/dlls/msi/dialog.c > @@ -62,6 +62,8 @@ struct msi_control_tag > HICON hIcon; > LPWSTR tabnext; > HMODULE hDll; > + float progress_current; > + float progress_max; Is it really necessary to use float instead of long? -- Dmitry.

1 0

Re: notepad patches (search/replace, etc)
by Andreas Mohr 09 Jun '06

09 Jun '06

Hi, On Thu, Jun 08, 2006 at 08:40:33PM -0400, Anoni Moose wrote: > This is my first patch to an open source project... if anyone has any > comments/suggestions, please tell me. :) I can't help but say that your parents must have been giving you a rather "funny" name... Or, IOW, do we have any guidelines about "Anoni Moose" submissions to our project? Are they ok, not ok, ok? Loves me, loves me not, ... Anyway, thanks for a very nice collection of patches! Andreas Mohr

3 3

← Newer
1
...
7
8
9
10
11
12
13
14
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2006