- wine-devel - winehq.org

appdb needs to allow untested applications
by Dan Kegel 10 Mar '07

10 Mar '07

I tried to add an appdb entry for FINView because it's one of the applications required by the LiMux project. It's an addon for a commercial product I don't have, so I couldn't test it. That means I had to lie to the appdb to get it to accept the entry. Please remove the "only submit tested applications" restriction from the appdb, or at least allow people who know what they're doing to get around it. -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Patches in bugzilla
by Vijay Kiran Kamuju 10 Mar '07

10 Mar '07

Hi, There are some patches that are attached in the bugzilla. They havent sent to wine-patches mailing list. Can I mail them to the mailing list on their behalf? I have asked them to submit to the mailing list. The patches are submitted about 2 months back. Thanks, VJ

2 1

Quick, how do you install native dcom? Or the visual C++ runtimes? Or...
by Dan Kegel 10 Mar '07

10 Mar '07

OK, I've been doing bug triage on and off for years, but just recently I've gotten to the point where I'm tired of going to the NativeDCOM wiki page to remember how to try an app with native dcom just to see if the bug in question is a COM bug. So I wrote a trivial script to automate installing that plus a bunch of other redistributables. A draft is at http://kegel.com/wine/winetricks Usage: winetricks [dcom98|fakeie6|mdac26|mfc40|mono|vbrun60|vcrun6|wsh51|wsh56jscript] ... It's a bit like a programmer's version of winetools: it's so commandline-crufty that normal users won't go near it, but it's simple enough to extend that it will probably end up being pretty handy for anyone working on triaging bugs that appear to be due to missing redistributable libraries. Oh, or commonly-needed registry entries. - Dan

2 2

Re: Add Xcursor support
by Adam Petaccia 10 Mar '07

10 Mar '07

4 3

Re: wined3d: Allow SetCursorProperties on existing cursor
by Stefan Dösinger 10 Mar '07

10 Mar '07

Am Samstag 10 März 2007 06:10 schrieb Erich Hoover: > Real Name: > Erich Hoover > Description: > The SetCursorProperties call needs to be capable of being performed on > existing cursors. The current behavior removes the cursor handle at the > beginning of any SetCursorProperties call (and on Uninit3D). The removal > of the cursor on SetCursorProperties is counter to the documentation and > causes some applications to lose the cursor when SetCursorProperties is > re-issued (See Bug #7619 <http://bugs.winehq.org/show_bug.cgi?id=7619>). > This patch corrects this issue and permits SetCursorProperties to retrieve > the gl texture of an old cursor. > Changelog: > wined3d: Allow SetCursorProperties on existing cursor This is not completely correct: The application can Release the d3d surface after setting the cursor. This would also delete the gl texture used to draw the cursor. Also, the apps can potentially change the surface and call PreLoad. This would change the cursor without SetCursorProperties(The cursor texture does not have to be in D3DPOOL_SCRATCH, so the app can preload it manually). But you are right, a non-dirty surface causes issues with the current code. I think you can fix that by modifying LoadTexture not to release the surface memory is SFLAG_FORCELOAD is passed. (Or better, fix the SFLAG_DONOTFREE macro in wined3d_private.h). Then, when SetCursorProperties sets the surface texture to 0 remove SFLAG_INTEXTURE from the surface flags.

1 0

Settlers II: 10th Anniversary regression?
by Markus 10 Mar '07

10 Mar '07

Hi, when trying the demo of the above game ( http://appdb.winehq.org/appview.php?iVersionId=5346 ) with 0.9.30, it loads the main menu and allows you to enter a game. In 0.9.32, it does not start anymore at all (it hangs after opening a window) with the following messages: fixme:wininet:InternetSetOptionExA Flags 04000000 ignored fixme:wininet:InternetSetOptionW Option INTERNET_OPTION_CONNECT_TIMEOUT (1000): STUB fixme:wininet:InternetSetOptionExA Flags 04000000 ignored fixme:wininet:InternetSetOptionW INTERNET_OPTION_SEND/RECEIVE_TIMEOUT not supported on protocol 1 err:ntdll:RtlpWaitForCriticalSection section 0x110020 "heap.c: main process heap section" wait timed out in thread 0009, blocked by 000d, retrying (60 sec) Could this be a regression in DirectPlay? Regards, -- Markus

6 16

Question about OpenGL/D3D
by Mike Schaadt 10 Mar '07

10 Mar '07

Has anyone tested using standard window objects in a window that also had an opengl/d3d context? I believe Terragen 2 is attempting to do this. If this hasn't been tested, than it might be the cause of all of the static that appears non opengl area, making the program nearly unusable. No messages get printed to the console from wine(Terragen 2 prints out a fair bit of debug info there, but nothing from wine that would cause the problem, just a few warnings that shouldn't be related). Any thoughts?

4 4

Re: Shader instruction table whitespace cleanup
by Ivan Gyurdiev 10 Mar '07

10 Mar '07

Kevin Wallerbos wrote: > This formatting patch cleans up the spacing in the pixel/vertexshader > instruction table, making it somewhat nicer on the eyes. The lines > have become a bit longer than practical on standard resolutions, but > that shouldn't be a problem as most lines were already too long. A better thing to do is to remove the useless GLNAME_REQUIRE_GLSL, and "undefined" instruction names. In fact, it may be nice to break out the instruction names out of this table completely, since they are only necessary for some instructions, required by the map2gl function. This table is also organized poorly, you have to search through the whole thing, and then do version comparisons to find anything. If possible, it would be great to make it O(1) accessible. ===== Also, as you point out: Before patch : "most lines were already too long" [ I'd say some lines were too long ] After patch: "all lines are too long" Not sure what is gained... please don't force others to your resolution preferences. [ looking at this on a widescreen at 1680 x 1050 and it still wraps! ]

1 0

Re: user32: avoid NULL pointer access in DefWindowProcA WM_NCCREATE
by Felix Nawothnig 10 Mar '07

10 Mar '07

Jan Zerebecki wrote: > CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; > /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) > * may have child window IDs instead of window name */ > - if (HIWORD(cs->lpszName)) > + if (cs && HIWORD(cs->lpszName)) cs is never NULL at that point. Felix

2 3

Don't compare file handles to NULL
by Francois Gouget 09 Mar '07

09 Mar '07

Jacek just sent a patch fixing the following bug: file = CreateFileW(fileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY,NULL); - if(file) { + if(file != INVALID_HANDLE_VALUE) { This looks like something that could be turned into a nice Smatch test. Hint, hint... -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ In theory, theory and practice are the same, but in practice they're different.

4 13

Re: comctl32: treeview: Message sequencing tests
by Marcelo Duarte 09 Mar '07

09 Mar '07

Chris Peterson escreveu: > This is another patch for my CS130 assignment. It adds message > sequencing tests. Other changes include: I updated one of my previous > tests which was not testing the implied message; I changed a > SendMessageW to SendMessageA call in DoFocusTest to fix a problem on > Windows 98 due to a lack of default unicode support. Any > comments/suggestions are welcome. > Thanks! > -Chris > Hi! > > @@ -166,7 +315,8 @@ static void DoFocusTest(void) > assert(hChild2); > > ShowWindow(hMainWnd,SW_SHOW); > - SendMessageW(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); > + /* Using SendMessageA since Win98 doesn't have default unicode support */ > + SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); > Use SendMessage() instead. > static void TestGetSetInsertMarkColor(void) > { > COLORREF crColor = RGB(0,0,0); > - SendMessage( hTree, TVM_SETBKCOLOR, 0, crColor ); > - crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); > + SendMessage( hTree, TVM_SETINSERTMARKCOLOR, 0, crColor ); > + crColor = (COLORREF)SendMessage( hTree, TVM_GETINSERTMARKCOLOR, 0, 0 ); > ok(crColor == RGB(0,0,0), "Insert mark color reported as 0x%.8x, expected 0x00000000\n", crColor); >

2 1

Re: gdi32: Add a GetTextMetrics test, make it pass under Wine
by Lei Zhang 09 Mar '07

09 Mar '07

I tested it out on a couple machines and found many failure cases. (output attached) As a sanity check, I copied the deja vu family of fonts to a windows box and they passed the tests there. On 3/9/07, Dmitry Timoshkov <dmitry(a)codeweavers.com> wrote: > Hello, > > this patch should partially resolve a problem reported in the bug 5783. > > In Wine GetTextMetricsW returns wrong tmFirstChar/tmLastChar, and > GetFontUnicodeRanges returns wrong ranges for fonts with SYMBOL_CHARSET. > > Changelog: > gdi32: Add a GetTextMetrics test, make it pass under Wine. > > --- > dlls/gdi32/font.c | 9 ++- > dlls/gdi32/freetype.c | 4 +- > dlls/gdi32/tests/font.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++- > 3 files changed, 149 insertions(+), 5 deletions(-) > > diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c > index 1b1d8b4..785a990 100644 > --- a/dlls/gdi32/font.c > +++ b/dlls/gdi32/font.c > @@ -287,10 +287,12 @@ static void FONT_TextMetricWToA(const TEXTMETRICW *ptmW, LPTEXTMETRICA ptmA ) > ptmA->tmOverhang = ptmW->tmOverhang; > ptmA->tmDigitizedAspectX = ptmW->tmDigitizedAspectX; > ptmA->tmDigitizedAspectY = ptmW->tmDigitizedAspectY; > - ptmA->tmFirstChar = ptmW->tmFirstChar > 255 ? 255 : ptmW->tmFirstChar; > + ptmA->tmBreakChar = ptmW->tmBreakChar > 255 ? 255 : ptmW->tmBreakChar; > + /* This appears to be what Windows does */ > + ptmA->tmFirstChar = ptmW->tmBreakChar; > + if (ptmA->tmFirstChar >= 2) ptmA->tmFirstChar -= 2; > ptmA->tmLastChar = ptmW->tmLastChar > 255 ? 255 : ptmW->tmLastChar; > ptmA->tmDefaultChar = ptmW->tmDefaultChar > 255 ? 255 : ptmW->tmDefaultChar; > - ptmA->tmBreakChar = ptmW->tmBreakChar > 255 ? 255 : ptmW->tmBreakChar; > ptmA->tmItalic = ptmW->tmItalic; > ptmA->tmUnderlined = ptmW->tmUnderlined; > ptmA->tmStruckOut = ptmW->tmStruckOut; > @@ -1366,6 +1368,9 @@ BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) > /* device layer returns values in device units > * therefore we have to convert them to logical */ > > + metrics->tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); > + metrics->tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); > + > #define WDPTOLP(x) ((x<0)? \ > (-abs(INTERNAL_XDSTOWS(dc, (x)))): \ > (abs(INTERNAL_XDSTOWS(dc, (x))))) > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index db990fa..03adfe5 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -4480,7 +4480,7 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) > { > DWORD num_ranges = 0; > > - if (face->charmap->encoding == FT_ENCODING_UNICODE && pFT_Get_First_Char) > + if (pFT_Get_First_Char) > { > FT_UInt glyph_code; > FT_ULong char_code, char_code_prev; > @@ -4488,7 +4488,7 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) > glyph_code = 0; > char_code_prev = char_code = pFT_Get_First_Char(face, &glyph_code); > > - TRACE("face encoding FT_ENCODING_UNICODE, number of glyphs %ld, first glyph %u, first char %04lx\n", > + TRACE("number of glyphs %ld, first glyph %u, first char %04lx\n", > face->num_glyphs, glyph_code, char_code); > > if (!glyph_code) return 0; > diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c > index 43e9c3a..a996ff0 100644 > --- a/dlls/gdi32/tests/font.c > +++ b/dlls/gdi32/tests/font.c > @@ -408,7 +408,7 @@ static void test_GdiGetCharDimensions(void) > > if (!pGdiGetCharDimensions) > { > - skip("GetFontUnicodeRanges not available on this platform\n"); > + skip("GdiGetCharDimensions not available on this platform\n"); > return; > } > > @@ -1149,6 +1149,7 @@ static void test_GetFontUnicodeRanges(void) > > size = pGetFontUnicodeRanges(hdc, gs); > ok(size, "GetFontUnicodeRanges failed\n"); > + ok(gs->cRanges != 0, "GetFontUnicodeRanges returned empty ranges\n"); > #if 0 > for (i = 0; i < gs->cRanges; i++) > trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs); > @@ -1397,6 +1398,143 @@ else > ReleaseDC(0, hdc); > } > > +static void test_text_metrics(const LOGFONTA *lf) > +{ > + HDC hdc; > + HFONT hfont, hfont_old; > + TEXTMETRICA tmA; > + TEXTMETRICW tmW; > + UINT first_unicode_char = 0, last_unicode_char = 0; > + INT ret, test_char; > + const char *font_name = lf->lfFaceName; > + > + trace("Testing font metrics for %s, charset %d\n", font_name, lf->lfCharSet); > + > + hdc = GetDC(0); > + > + SetLastError(0xdeadbeef); > + hfont = CreateFontIndirectA(lf); > + ok(hfont != 0, "CreateFontIndirect error %u\n", GetLastError()); > + > + hfont_old = SelectObject(hdc, hfont); > + > + if (pGetFontUnicodeRanges) > + { > + DWORD size; > + GLYPHSET *gs; > + > + size = pGetFontUnicodeRanges(hdc, NULL); > + ok(size, "GetFontUnicodeRanges failed unexpectedly\n"); > + > + gs = HeapAlloc(GetProcessHeap(), 0, size); > + > + size = pGetFontUnicodeRanges(hdc, gs); > + ok(size, "GetFontUnicodeRanges failed\n"); > + ok(gs->cRanges != 0, "GetFontUnicodeRanges returned empty ranges\n"); > + > + first_unicode_char = gs->ranges[0].wcLow; > + last_unicode_char = gs->ranges[gs->cRanges - 1].wcLow + gs->ranges[gs->cRanges - 1].cGlyphs - 1; > + trace("for %s first char %x, last char %x\n", font_name, > + first_unicode_char, last_unicode_char); > + > + HeapFree(GetProcessHeap(), 0, gs); > + } > + > + SetLastError(0xdeadbeef); > + ret = GetTextMetricsA(hdc, &tmA); > + ok(ret, "GetTextMetricsA error %u\n", GetLastError()); > + > + trace("A: first %x, last %x, default %x, break %x\n", > + tmA.tmFirstChar, tmA.tmLastChar, tmA.tmDefaultChar, tmA.tmBreakChar); > + > + SetLastError(0xdeadbeef); > + ret = GetTextMetricsW(hdc, &tmW); > + ok(ret, "GetTextMetricsA error %u\n", GetLastError()); > + > + trace("W: first %x, last %x, default %x, break %x\n", > + tmW.tmFirstChar, tmW.tmLastChar, tmW.tmDefaultChar, tmW.tmBreakChar); > + > + /* This appears to be what Windows does */ > + test_char = tmW.tmBreakChar; > + if (test_char >= 2) test_char -= 2; > + if (test_char > 255) test_char = 255; > + ok(tmA.tmFirstChar == test_char, "tmFirstChar for %s %02x != %02x\n", > + font_name, tmA.tmFirstChar, test_char); > + > + /* This test failes for Marlett, Wingdings 2 and Wingdings 3, but succeeds > + * for all other 327 truetype fonts on my system. > + */ > +#if 0 > + test_char = tmW.tmLastChar > 255 ? 255 : tmW.tmLastChar; > + ok(tmA.tmLastChar == test_char, "tmLastChar for %s %02x != %02x\n", > + font_name, tmA.tmLastChar, test_char); > +#endif > + if (pGetFontUnicodeRanges) > + { > + ok(tmW.tmFirstChar == first_unicode_char, "tmFirstChar for %s %02x != %02x\n", > + font_name, tmW.tmFirstChar, first_unicode_char); > +/* FIXME: remove completely once Wine is fixed > + * GetFontUnicodeRanges in Wine returns wrong data for fonts with > + * SYMBOL_CHARSET. > + */ > +if (tmW.tmLastChar != last_unicode_char) > +todo_wine ok(tmW.tmLastChar == last_unicode_char, "tmLastChar for %s %02x != %02x\n", > + font_name, tmW.tmLastChar, last_unicode_char); > +else > + ok(tmW.tmLastChar == last_unicode_char, "tmLastChar for %s %02x != %02x\n", > + font_name, tmW.tmLastChar, last_unicode_char); > + } > + > + ret = GetDeviceCaps(hdc, LOGPIXELSX); > + ok(tmW.tmDigitizedAspectX == ret, "tmDigitizedAspectX %u != %u\n", > + tmW.tmDigitizedAspectX, ret); > + ret = GetDeviceCaps(hdc, LOGPIXELSY); > + ok(tmW.tmDigitizedAspectX == ret, "tmDigitizedAspectY %u != %u\n", > + tmW.tmDigitizedAspectX, ret); > + > + SelectObject(hdc, hfont_old); > + DeleteObject(hfont); > + > + ReleaseDC(0, hdc); > +} > + > +static INT CALLBACK enum_truetype_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) > +{ > + INT *enumed = (INT *)lParam; > + > + if (type == TRUETYPE_FONTTYPE) > + { > + (*enumed)++; > + test_text_metrics(lf); > + } > + return 1; > +} > + > +static void test_GetTextMetrics(void) > +{ > + LOGFONTA lf; > + HDC hdc; > + INT enumed; > + > + SetLastError(0xdeadbeef); > + GetTextMetricsW(0, NULL); > + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) > + { > + skip("Skipping GetTextMetrics test on a Win9x platform\n"); > + return; > + } > + > + hdc = GetDC(0); > + > + memset(&lf, 0, sizeof(lf)); > + lf.lfCharSet = DEFAULT_CHARSET; > + enumed = 0; > + EnumFontFamiliesExA(hdc, &lf, enum_truetype_font_proc, (LPARAM)&enumed, 0); > + trace("Tested metrics of %d truetype fonts\n", enumed); > + > + ReleaseDC(0, hdc); > +} > + > START_TEST(font) > { > init(); > @@ -1427,4 +1565,5 @@ START_TEST(font) > } > else > skip("Arial Black or Symbol/Wingdings is not installed\n"); > + test_GetTextMetrics(); > } > -- > 1.5.0.2 > > > > > >

1 0

re: Writing a winelib plugin
by Dan Kegel 09 Mar '07

09 Mar '07

Shachar wrote: >It used to not be possible to write a plugin, to be loaded from a >standard Linux ELF program, that will be itself a winelib shared object. >All sorts of issues regarding running wineserver and memory layout >initializations were problematic. > >I'm wondering whether there is any news on that front. Is it still not >practically possible to do this? Last time I asked about this, I got the impression that there was some hope but nobody was working on it. And I think it would require linking something statically into the program, too, so if you're trying to foist winelib shared objects onto an unsuspecting Big App, you're probably going to be out of luck even if this gets worked on. What application did you have in mind?

3 2

Re: [Bug 7503] Eve Online pasword box on login screen doesn't work
by Lei Zhang 09 Mar '07

09 Mar '07

Can we change wineprefixcreate to copy the truetype fonts (if any) from /usr/X11R6/lib/X11/fonts/TTF or /usr/share/X11/fonts/TTF or [insert distro specific X11/fonts/TTF directory] to $WINEPREFIX/drive_c/windows/fonts/ ? On 2/20/07, Wine Bugs <wine-bugs(a)winehq.org> wrote: > http://bugs.winehq.org/show_bug.cgi?id=7503 > > > > > > ------- Additional Comments From kelfe(a)gmx.de 2007-20-02 16:57 ------- > to fix the issue you need to copy the font file arial.ttf into > .wine/drive_c/windows/fonts folder (.wine is a hidden folder) > > the arial.ttf can be found in the mscorefonts packages or search engine/windows box > > I don't know if font files should be placed in the fonts folder by wine or by > the user. So close this bug or keep it open until basic fonts are installed by > wine when creating the .wine folder. > > -- > Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email > ------- You are receiving this mail because: ------- > You are the assignee for the bug, or are watching the assignee. > > >

3 3

New opengl thread context selection patches for testing
by Stefan Dösinger 09 Mar '07

09 Mar '07

Hi, Here is a new patchset for testing which implements duplicating gl contexts for new threads in wined3d. Again, it does not implement any synchronisation measures(except ENTER_GL and glFinish), so running multithreaded games is still kinda a lottery. This patchset also contains a patch for offscreen rendering, which may fix the problems introduced with TES: Oblivion before. This is just a format-patch of my git tree, the first 3 patches are unrelated. One of them is a clone of Henri's already sent patch, and the other 2 patches were sent by me already. Happy testing, Stefan

3 7

Re: [2/2] wined3d: IWineD3DDeviceImpl_UpdateSurface: return D3DERR_INVALIDCALL if source and dest format do not match
by Fabian Bieler 09 Mar '07

09 Mar '07

Please ignore this patch.

1 0

Is there someone working on dxdiag?
by Mirek 09 Mar '07

09 Mar '07

Hi, I would like to start some applications like Carmageddon TDR 2000 in HW mode, Neverwinter Nights 2 or just GetGPUAndSystemInfo.exe from Nvidia SDK demos and maybe 3DMark with HW info, but there are problems with detecting video card, I assume the main problem is in dxdiag library. So I would like to ask if there is someone working on this library, or if was there some code which was not accepted in wine tree to fix that? I am trying to hack this library, but with only small success. Mirek Slugen

3 3

Re: quartz: Check allocation failure and clear memory in DSound Renderer
by Robert Shearman 09 Mar '07

09 Mar '07

Chris Robinson wrote: > return CLASS_E_NOAGGREGATION; > > pDSoundRender = CoTaskMemAlloc(sizeof(DSoundRenderImpl)); > + if (!pDSoundRender) > + return E_OUTOFMEMORY; > + ZeroMemory(pDSoundRender, sizeof(DSoundRenderImpl)); > > pDSoundRender->lpVtbl = &DSoundRender_Vtbl; > pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl; > @@ -325,9 +328,15 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) > pDSoundRender->pClock = NULL; > pDSoundRender->init = FALSE; > pDSoundRender->started = FALSE; > - ZeroMemory(&pDSoundRender->filterInfo, sizeof(FILTER_INFO)); > The check for allocation failure is good, but clearing the memory that is going to be initialised anyway is inefficient and unnecessary. -- Rob Shearman

2 1

Re: [2/2] wined3d: IWineD3DDeviceImpl_UpdateSurface: return D3DERR_INVALIDCALL if source and dest format do not match
by H. Verbeet 09 Mar '07

09 Mar '07

On 09/03/07, Fabian Bieler <der.fabe(a)gmx.net> wrote: > + if (destFormat != srcFormat) { > + WARN("source %p and dest %p must match, returning WINED3DERR_INVALIDCALL\n", pSourceSurface, pDestinationSurface); > + return WINED3DERR_INVALIDCALL; > + } You should probably print the actual formats there, using debug_d3dformat(). Also, a test wouldn't hurt.

1 0

Fwd: wined3d: Update cursor position on ShowCursor
by Erich Hoover 09 Mar '07

09 Mar '07

Request for comments, as per http://www.winehq.com/site/sending_patches. For details on the need for this patch please see Bug #7542<http://bugs.winehq.org/show_bug.cgi?id=7542>. Thanks! Erich Hoover ehoover(a)mines.edu ---------- Forwarded message ---------- From: Erich Hoover <ehoover(a)mines.edu> Date: Mar 3, 2007 6:46 PM Subject: wined3d: Update cursor position on ShowCursor To: wine-patches(a)winehq.org Real Name: Erich Hoover Description: When ShowCursor is first called it should make the cursor appear at the OS's last known cursor position. Because of this, some applications just repetitively call ShowCursor in order to update the cursor's position. This behavior is undocumented. Changelog: wined3d: Update cursor position on ShowCursor

3 2

Re: Alexandre Julliard : advapi32: Fixed registry test that failed because of a buffer overflow.
by James Hawkins 09 Mar '07

09 Mar '07

On 3/8/07, Alexandre Julliard <julliard(a)wine.codeweavers.com> wrote: > Module: wine > Branch: master > Commit: 7e2228f15aa7a6fc0d63fe36c34906035422e95a > URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2228f15aa7a6fc0d63fe36c… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Thu Mar 8 21:06:31 2007 +0100 > > advapi32: Fixed registry test that failed because of a buffer overflow. > The test passes in Windows, so isn't this hiding a bug in our implementation of RegSetValueW? -- James Hawkins

2 1

How does wine determine to draw non-client area according to managed mode setting?
by Sunil Baek 09 Mar '07

09 Mar '07

Hello, When wine runs on managed mode, it delegate drawing non-client area(caption, frame-border) to window manager. I found NC_DrawCaption function is not invoked on managed mode. On non-managed mode, that function is invoked. I tried to find routine which determine to draw non-client area according to managed mode setting, but I can't. please give me some hints about that. Thank you.

1 0

Re: comctl32: listview tests
by Lei Zhang 09 Mar '07

09 Mar '07

On 3/8/07, George Gov <ggov(a)ucla.edu> wrote: > @@ -573,10 +699,242 @@ static void test_redraw(void) > trace("invalidate & update\n"); > InvalidateRect(hwnd, NULL, TRUE); > UpdateWindow(hwnd); > - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, redraw_listview_seq, "redraw listview", FALSE); > + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, redraw_listview_seq, "redraw listview", TRUE); This test succeeds for me, so I'm not sure why you marked it as todo. - Lei

1 0

Re: quartz: Use proper alloc/free functions for COM objects
by Detlef Riekenberg 09 Mar '07

09 Mar '07

On Do, 2007-03-08 at 03:06 -0800, Chris Robinson wrote: > Subject: [PATCH] quartz: Use proper alloc/free functions for COM > objects > + omr->messages = CoTaskMemAlloc(omr->ring_buffer_size * > sizeof(Event)); > + ZeroMemory(omr->messages, omr->ring_buffer_size * sizeof(Event)); > > + fimpl = CoTaskMemAlloc(sizeof(*fimpl)); > fimpl->IGraphBuilder_vtbl = &IGraphBuilder_VTable; > + This->ppPins = CoTaskMemAlloc((This->cStreams + 2) * sizeof(IPin > *)); > memcpy(This->ppPins, ppOldPins, (This->cStreams + 1) * > sizeof(IPin *)); > + This->ppPins = CoTaskMemAlloc(sizeof(IPin *) * 1); > memcpy(This->ppPins, ppOldPins, sizeof(IPin *) * 1); While reading your Patch, I see the above Places, where the result from the allocation is used without a NULL-check. The other allocations are checked for NULL before used. Is this correct? -- By by ... Detlef

2 1

Command and Conquer 3 Demo
by Matthew Clark 09 Mar '07

09 Mar '07

I just wanted to write to let all of the devs know how proud of the wine project I am. This Demo seems to work for the most part except for the movies in it don't seem to want to resize and when you are under attack the game crashes. Here is the console dump: fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=49332 < primary_done=49356) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=39800 < primary_done=39824) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=35960 < primary_done=35984) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=36008 < primary_done=36032) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=39968 < primary_done=39992) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=36128 < primary_done=36152) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=36128 < primary_done=36152) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=38072 < primary_done=38076) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=38072 < primary_done=38076) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=38072 < primary_done=38076) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=34232 < primary_done=34236) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=38072 < primary_done=38096) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=34232 < primary_done=34256) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=36152 < primary_done=36176) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=36152 < primary_done=36176) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=36152 < primary_done=36176) err:dsound:DSOUND_MixOne underrun on sound buffer 0x210b10 fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=34568 < primary_done=34592) wine: Unhandled page fault on read access to 0x0000fff7 at address 0x7efa2553 (thread 000e), starting debugger... fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=50292 < primary_done=50316) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=40784 < primary_done=40808) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=40784 < primary_done=40808) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=40784 < primary_done=40808) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=40784 < primary_done=40808) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=40784 < primary_done=40808) fixme:alsa:ALSA_AddRingMessage two fast messages in the queue!!!! toget = 52(WINE_WM_RESTARTING), tosave=53(UNKNOWN(0x00000000)) fixme:alsa:ALSA_AddRingMessage two fast messages in the queue!!!! toget = 36(WINE_WM_RESTARTING), tosave=37(UNKNOWN(0x00000000)) hope that helps. Again, greats that that is all that's wrong^_^ The graphics look great, it sounds great, and the videos are crystal clear(though small). -Matthew Clark

3 4

modification to allow -Wcast-qual to find potential warnings without unicode.h causing them
by Andrew Talbot 08 Mar '07

08 Mar '07

Assuming it is valid and does what is required, maybe the following pragma would be more precise. #pragma GCC diagnostic warning "-Wwrite-strings" -- Andy.

1 2

Interesting Winelib report
by Jeremy White 08 Mar '07

08 Mar '07

Hi Folks, John Gilmore alerted me to an attempted use of Winelib by the Cairo folks: http://lists.freedesktop.org/archives/cairo/2007-February/009707.html I've chatted privately with Behdad, who doesn't have a ton of time, but would be willing to poke a bit further if he had some help. I know that from time to time, people like to pick up this sort of project as a fun one, and I thought I'd see if I could spark someone into doing so with Cairo. Cheers, Jeremy

1 0

-Wcast-qual result
by Mike Schaadt 08 Mar '07

08 Mar '07

I submited a patch today that modified unicode.h that disables warnings(which allows for -Wcast-qual to actually give relevant results) I don't know if it will be accepted or not(it has the potential of being problematic if modifying unicode.h that would normally result in a warning, but this patch would cause it to be suppresed), but I figured I would at least share the results I found. after configuring with cast-qual, I stored the warnings that resulted(which I've included as an attachment for those that are interested.). There were no warnings in the make depend, and make generated 545 warnings(all from .c files). The included file does not contain the sub directory for what file generates the warning. If anyone knows how to pull that data, let me know and I'll redo it and extract that information as well. I plan on start looking through these and working on fixing some here soon, but I thought I would share what I found with this group in general.

1 0

Re: wine-devel Digest, Vol 20, Issue 30
by Alessandro Pignotti 08 Mar '07

08 Mar '07

> Date: Thu, 8 Mar 2007 08:22:59 +0100 > From: Kai Blin <kai.blin(a)gmail.com> > > > /* FIXME: Should we be storing these dwFlags or the creation ones? */ > > - lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, dwFlags, > > + /* I think we should pass creation flags, so we can distinguish > > sysplayers and not count them in the current + player total */ > > + lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, > > dwCreateFlags, hEvent, bAnsi ); > > Every time someone uses "I think" in the code, usually this calls for a > test case. This one should be rather straightforward to test. It's not possible to write a conformance test because i'm using a flag internal to wine's implementation of directplay, It's possible to safely change "I think we should" with "we have to". I've used "i think" more as an answer to the previous FIXME comment we have inherited from the author of the code. Regards Alessandro Pignotti > > Cheers, > Kai > > -- > Kai Blin, <kai Dot blin At gmail Dot com> > WorldForge developer http://www.worldforge.org/ > Wine developer http://wiki.winehq.org/KaiBlin/ > -- > Will code for cotton. -- Vi Veri Veniversum Vivus Vici -Dr. Faustus - Marlowe Public GPG Key ID 0x650B3ED9 on subkeys.gpg.net Key Fingerprint 6243 AAD3 E3EC 52D8 DFAA 2A2F 9FCD 0457 650B 3ED9 Encrypted mails are welcome

2 1

Serial port problem - again
by Aleš Rom 08 Mar '07

08 Mar '07

Hello. I'm new to this list. First I must say that I apologise for posting this mail again here. I hope you wine gurus can see what is going wrong here. If I run this app <http://appdb.winehq.org/appview.php?iAppId=4165> with WINEDEBUG=+relay , I can transfer data from my device to PC, but not all of it. It stops somewhere in the middle of the transfer. Without +relay option, device is not even accesible. It just say: [romcek@core2 ~]$ WINEDEBUG=+trace,+comm wine /home/romcek/.wine/drive_c/Program\ Files/SMA/Sunny\ Data\ Control/SDC.exe err:systray:delete_icon invalid tray icon ID specified: 0d fixme:tapi:lineInitialize (0x832f88, 0x11c0000, 0x11c2dfc, "TAPICOMM", 0x832f8c): stub. fixme:tapi:lineGetDevCapsA ((nil), 00000000, 00010003, 00000000, 0xf7eaf8): stub. fixme:tapi:lineGetDevCapsA ((nil), 00000000, 00010003, 00000000, 0xf7eb2c): stub. fixme:ras:RasEnumEntriesA ((nil),(null),0xf7fc80,0x34f5d8,0xf7ec38),stub! fixme:ras:RasEnumDevicesA ((nil),0x34f60c,0x34f608),stub! fixme:ras:RasEnumDevicesA (0x777fe0,0x34f60c,0x34f608),stub! trace:comm:GetCommState handle 0x144, ptr 0x34f9b8 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_BAUD_RATE (nil) 0 0x34f988 4 0x34f914 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_LINE_CONTROL (nil) 0 0x34f98d 3 0x34f914 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_HANDFLOW (nil) 0 0x34f970 16 0x34f914 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_CHARS (nil) 0 0x34f982 6 0x34f914 trace:comm:GetCommState OK trace:comm:dump_dcb bytesize=8 baudrate=19200 fParity=0 Parity=0 stopbits=1 trace:comm:dump_dcb ~IXON ~IXOFF trace:comm:dump_dcb fOutxCtsFlow=0 fRtsControl=0 trace:comm:dump_dcb fOutxDsrFlow=0 fDtrControl=1 trace:comm:dump_dcb ~CRTSCTS trace:comm:dump_dcb bytesize=8 baudrate=19200 fParity=0 Parity=0 stopbits=1 trace:comm:dump_dcb ~IXON ~IXOFF trace:comm:dump_dcb fOutxCtsFlow=0 fRtsControl=1 trace:comm:dump_dcb fOutxDsrFlow=0 fDtrControl=1 trace:comm:dump_dcb ~CRTSCTS trace:comm:io_control 0x144 IOCTL_SERIAL_SET_BAUD_RATE 0x34f988 4 (nil) 0 0x34f914 trace:comm:io_control 0x144 IOCTL_SERIAL_SET_LINE_CONTROL 0x34f98d 3 (nil) 0 0x34f914 trace:comm:io_control 0x144 IOCTL_SERIAL_SET_HANDFLOW 0x34f970 16 (nil) 0 0x34f914 trace:comm:io_control 0x144 IOCTL_SERIAL_SET_CHARS 0x34f982 6 (nil) 0 0x34f914 trace:comm:io_control 0x144 IOCTL_SERIAL_SET_QUEUE_SIZE 0x34f98c 8 (nil) 0 0x34f930 fixme:comm:set_queue_size insize 1024 outsize 1024 unimplemented stub trace:comm:io_control 0x144 IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61b196c8 20 0x61b19660 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61b196c8 20 0x61b19660 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61b196c8 20 0x61b19660 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61b196c8 20 0x61b19660 trace:comm:io_control 0x144 IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61b196c8 20 0x61b19660 last line is repeating and then nothing hapens. It looks like delay issue to me, but I'm not a programmer. Can someone help, plese. Thanks, Ales

1 0

[winealsa] Mind buffer loops when pausing
by Chris Bandy 08 Mar '07

08 Mar '07

This patch should fix the incorrect handling of WaveHdr loops when pausing. Like the non-loop case written before, this sums the buffer lengths between dwPlayedTotal and dwWrittenTotal to calculate the new dwPartialOffset. Instead of blindly moving from one buffer to the next, however, this traverses the list using BeginWaveHdr and PlayPtrNext. This has added benefit of correctly initializing all pointers and counters for playback. It looks correct on paper, but I don't seem to have any applications that even attempt to pause. Can anyone suggest an application to test this with? All feedback welcome. Note: this branch in the function is a 'software' pause. To test you may need to override the check for ALSA's hardware pause at line 418 (snd_pcm_hw_params_can_pause) -- Chris diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6a8a435..4ac50c6 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -319,9 +319,9 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force) * * wodPlayer helper. Resets current output stream. */ -static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) +static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) { - int err; + int err; TRACE("(%p)\n", wwo); /* flush all possible output */ @@ -329,7 +329,7 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) wodUpdatePlayedTotal(wwo, NULL); /* updates current notify list */ - wodPlayer_NotifyCompletions(wwo, FALSE); + wodPlayer_NotifyCompletions(wwo, reset); if ( (err = snd_pcm_drop(wwo->pcm)) < 0) { FIXME("flush: %s\n", snd_strerror(err)); @@ -345,9 +345,6 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) DWORD param; HANDLE ev; - /* remove any buffer */ - wodPlayer_NotifyCompletions(wwo, TRUE); - wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED; wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; @@ -368,32 +365,34 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) ((LPWAVEHDR)param)->dwFlags &= ~WHDR_INQUEUE; ((LPWAVEHDR)param)->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, param, 0); + wodNotifyClient(wwo, WOM_DONE, param, 0); } ALSA_ResetRingMessage(&wwo->msgRing); LeaveCriticalSection(&wwo->msgRing.msg_crst); } else { - if (wwo->lpLoopPtr) { - /* complicated case, not handled yet (could imply modifying the loop counter */ - FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n"); - wwo->lpPlayPtr = wwo->lpLoopPtr; - wwo->dwPartialOffset = 0; - wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */ - } else { - LPWAVEHDR ptr; - DWORD sz = wwo->dwPartialOffset; + DWORD diff = wwo->dwWrittenTotal - wwo->dwPlayedTotal; + DWORD sz; + + /* no pointers or counters need to change */ + if (diff <= wwo->dwPartialOffset) + wwo->dwPartialOffset -= diff; + else { + wwo->lpLoopPtr = NULL; + wodPlayer_BeginWaveHdr(wwo, wwo->lpQueuePtr); - /* reset all the data as if we had written only up to lpPlayedTotal bytes */ - /* compute the max size playable from lpQueuePtr */ - for (ptr = wwo->lpQueuePtr; ptr != wwo->lpPlayPtr; ptr = ptr->lpNext) { - sz += ptr->dwBufferLength; + diff -= wwo->dwPartialOffset; + sz = wwo->lpPlayPtr->dwBufferLength; + + while (sz < diff) { + wodPlayer_PlayPtrNext(wwo); + sz += wwo->lpPlayPtr->dwBufferLength; } - /* because the reset lpPlayPtr will be lpQueuePtr */ - if (wwo->dwWrittenTotal > wwo->dwPlayedTotal + sz) ERR("grin\n"); - wwo->dwPartialOffset = sz - (wwo->dwWrittenTotal - wwo->dwPlayedTotal); - wwo->dwWrittenTotal = wwo->dwPlayedTotal; - wwo->lpPlayPtr = wwo->lpQueuePtr; + + wwo->dwPartialOffset = sz - diff; + wodPlayer_BeginWaveHdr(wwo, wwo->lpQueuePtr); } + + wwo->dwWrittenTotal = wwo->dwPlayedTotal; wwo->state = WINE_WS_PAUSED; } }

2 1

Writing a winelib plugin
by Shachar Shemesh 08 Mar '07

08 Mar '07

Hi all, It used to not be possible to write a plugin, to be loaded from a standard Linux ELF program, that will be itself a winelib shared object. All sorts of issues regarding running wineserver and memory layout initializations were problematic. I'm wondering whether there is any news on that front. Is it still not practically possible to do this? Many thanks, Shachar

1 0

Re: Alexandre Julliard : wine_common_ver: Set company name to Microsoft, some apps check for that.
by Paul Chitescu 08 Mar '07

08 Mar '07

Hi! Ummm, isn't this legally dangerous? Stamping a piece of code with Microsoft's name can be interpreted as counterfeiting. Maybe a better choice would be to add a configure option --with-company-name and let the users set it to... whatever... Paul Chitescu

4 3

Re: [RESEND] [PATCH] DirectPlay should keep track of the current number of players
by Kai Blin 08 Mar '07

08 Mar '07

On Wednesday 07 March 2007 10:52, Alessandro Pignotti wrote: > + /* I think we have to add a player to the total number of players only if it's not a player created for system > + purpose like the name server. This way it seems we get a correct player number */ > + if( ~dwFlags & DPLAYI_PLAYER_SYSPLAYER ) > + This->dp2->lpSessionDesc->dwCurrentPlayers++; > + [...] > /* FIXME: Should we be storing these dwFlags or the creation ones? */ > - lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, dwFlags, > + /* I think we should pass creation flags, so we can distinguish sysplayers and not count them in the current > + player total */ > + lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, > dwCreateFlags, hEvent, bAnsi ); Every time someone uses "I think" in the code, usually this calls for a test case. This one should be rather straightforward to test. Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

RS232 latency, redirection possible?
by [IDC]Dragon 07 Mar '07

07 Mar '07

Hi, I have 2 questions about the serial port handling under Wine: 1) I see a very annoying latency in an application which talks to a controller over RS232. Under Windows, the traffic is "fluent", under Wine each command has a turnaround time of almost a second. Since there are many commands, this gets useless. I sthere anything known, some settings I can try? 2) Is it possible to map the e.g. COM1 port traffic to another device, or is it firmly assigned to matching RS232 interfaces of the Linux box? Ideally, I'd like to have the Windows app talk to an XPort device (remote RS232) connected over network. A program called "socat" (http://www.dest-unreach.org/socat) can be used to create a device and tunnel the traffic over a TCP port. I'd like to map that device to a windows-emulated COM port. Maybe this even eliminates problem 1). I hope I was able to explain especially 2) and kindly wait for answers, thanks! Jörg -- Ist Ihr Browser Vista-kompatibel? Jetzt die neuesten Browser-Versionen downloaden: http://www.gmx.net/de/go/browser

3 4

wininet: Don't discard the extra info part of a URL in InternetOpenUrl.
by Ron Yorston 07 Mar '07

07 Mar '07

A fix to winnet/internet.c turned up in 0.9.32 that's supposed to ensure that the "extra info" part of a URL is correctly included. I think there's a problem with the patch. On line 2865 space is allocated for the extra info: if (!(path_extra = HeapAlloc(GetProcessHeap(), 0, size))) Shouldn't this be in units of sizeof(WCHAR)? That is, if (!(path_extra = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)))) Ron

2 1

Work legalities
by Juan Lang 07 Mar '07

07 Mar '07

> I'm worried about the copyright of any external work I do, so I need a > little advice. > > What do I need from my employer to clear me to work on wine? > Is something verbal ok, or should I get it in writing? In the US, if you do the Wine work outside of your workplace, on your own time and with your own equipment, it should be okay. IANAL, but see e.g.: http://www.supnik.com/reid.htm --Juan

1 0

A Survey on Defect Management Practices in Free/Open Source Software
by anugupta＠pu.ac.in 07 Mar '07

07 Mar '07

Dear Wine Contributors, I seek help from designers, developers, testers,defect fixers,project managers or playing any other key role in Free/Open Source software development or maintenence in carrying out a study to identify practices and problems of defect management in various Free/Open Source Software projects. The insights gained from the study can further help us to extract publicly accessible defect data and determine impact of defect management practices on software quality. Please spend a few minutes of your precious time to fill up the Questionnaire. The most of the questions follow multiple choice formats and are quite easy to answer. To have the Online Questionnaire, please visit: http://anu.puchd.ac.in/phpESP/public/survey.php?name=FOSS_Defect_Survey (You can also copy and paste this link into your browser, and hit the 'Return' key.) I hope you will find all the questions interesting and thought-provoking. Your answers will be kept anonymous.The data thus collected will only be used for research purpose.It would be nice if you may further refer this mail to others actively engaged with Free/Open Source Software development. If you have any query or suggestions then feel free to contact. Thank You With regards, Anu Gupta Senior Lecturer Department of Computer Science and Applications, Panjab University, Chandigarh. INDIA In case of any problem in accessing/using the above mentioned link please contact: E-mail: anugupta(a)pu.ac.in anugupta98(a)gmail.com

1 0

[winealsa] Mind buffer loops when pausing
by Chris Bandy 07 Mar '07

07 Mar '07

This patch should fix the incorrect handling of WaveHdr loops when pausing. Like the non-loop case written before, this sums the buffer lengths between dwPlayedTotal and dwWrittenTotal to calculate the new dwPartialOffset. Instead of blindly moving from one buffer to the next, however, this traverses the list using BeginWaveHdr and PlayPtrNext. This has added benefit of correctly initializing all pointers and counters for playback. It looks correct on paper, but I don't seem to have any applications that even attempt to pause. Can anyone suggest an application to test this with? All feedback welcome. Note: this branch in the function is a 'software' pause. To test you may need to override the check for ALSA's hardware pause at line 418 (snd_pcm_hw_params_can_pause) -- Chris diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6a8a435..4ac50c6 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -319,9 +319,9 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force) * * wodPlayer helper. Resets current output stream. */ -static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) +static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) { - int err; + int err; TRACE("(%p)\n", wwo); /* flush all possible output */ @@ -329,7 +329,7 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) wodUpdatePlayedTotal(wwo, NULL); /* updates current notify list */ - wodPlayer_NotifyCompletions(wwo, FALSE); + wodPlayer_NotifyCompletions(wwo, reset); if ( (err = snd_pcm_drop(wwo->pcm)) < 0) { FIXME("flush: %s\n", snd_strerror(err)); @@ -345,9 +345,6 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) DWORD param; HANDLE ev; - /* remove any buffer */ - wodPlayer_NotifyCompletions(wwo, TRUE); - wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED; wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; @@ -368,32 +365,34 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) ((LPWAVEHDR)param)->dwFlags &= ~WHDR_INQUEUE; ((LPWAVEHDR)param)->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, param, 0); + wodNotifyClient(wwo, WOM_DONE, param, 0); } ALSA_ResetRingMessage(&wwo->msgRing); LeaveCriticalSection(&wwo->msgRing.msg_crst); } else { - if (wwo->lpLoopPtr) { - /* complicated case, not handled yet (could imply modifying the loop counter */ - FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n"); - wwo->lpPlayPtr = wwo->lpLoopPtr; - wwo->dwPartialOffset = 0; - wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */ - } else { - LPWAVEHDR ptr; - DWORD sz = wwo->dwPartialOffset; + DWORD diff = wwo->dwWrittenTotal - wwo->dwPlayedTotal; + DWORD sz; + + /* no pointers or counters need to change */ + if (diff <= wwo->dwPartialOffset) + wwo->dwPartialOffset -= diff; + else { + wwo->lpLoopPtr = NULL; + wodPlayer_BeginWaveHdr(wwo, wwo->lpQueuePtr); - /* reset all the data as if we had written only up to lpPlayedTotal bytes */ - /* compute the max size playable from lpQueuePtr */ - for (ptr = wwo->lpQueuePtr; ptr != wwo->lpPlayPtr; ptr = ptr->lpNext) { - sz += ptr->dwBufferLength; + diff -= wwo->dwPartialOffset; + sz = wwo->lpPlayPtr->dwBufferLength; + + while (sz < diff) { + wodPlayer_PlayPtrNext(wwo); + sz += wwo->lpPlayPtr->dwBufferLength; } - /* because the reset lpPlayPtr will be lpQueuePtr */ - if (wwo->dwWrittenTotal > wwo->dwPlayedTotal + sz) ERR("grin\n"); - wwo->dwPartialOffset = sz - (wwo->dwWrittenTotal - wwo->dwPlayedTotal); - wwo->dwWrittenTotal = wwo->dwPlayedTotal; - wwo->lpPlayPtr = wwo->lpQueuePtr; + + wwo->dwPartialOffset = sz - diff; + wodPlayer_BeginWaveHdr(wwo, wwo->lpQueuePtr); } + + wwo->dwWrittenTotal = wwo->dwPlayedTotal; wwo->state = WINE_WS_PAUSED; } }

1 0

Re: [3/4] WineD3D: Blit the offscreen texture into the drawable if needed
by Stefan Dösinger 07 Mar '07

07 Mar '07

Am Mittwoch 07 März 2007 02:43 schrieb Stefan Dösinger: Do not apply this patch yet. Cube textures aren't that easy

1 0

App DB TOP-10 issue
by speedator＠gmx.de 07 Mar '07

07 Mar '07

Hi, I want to annotate that there are apps/games twice in the Platinum List(Diablo II Lord of Destruction 1.x , Outlaws All versions) even thrice(if you add Diablo II 1.x and LoD up for such a list). Btw: Why are Outlaws and IDA Pro "top"? Doesn't seem they are so popular, nvm.

2 1

Re: [PATCH] DirectPlay should keep track of the current number of players
by Kai Blin 07 Mar '07

07 Mar '07

On Tuesday 06 March 2007 23:25, Alessandro Pignotti wrote: > Hi everyone, > this patch fixes the behaviour of dplayx that was not adding new player to > its counter. I don't see a patch. Did you attach it? Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: comctl32: Implement LVS_EX_DOUBLEBUFFER
by Dimi Paun 07 Mar '07

07 Mar '07

On Tue, March 6, 2007 16:27, Felix Nawothnig wrote: > Tested with utorrent - completly removes the flickering from #7344. > In case you're wondering about the change in EraseBkgnd() - this is how > native behaves, they recreate the double buffer on each refresh so we > need to move the erase. Please tell me if I broke anything. It looks good, but you don't cleanup the new DC if the bitmap creation fails. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

1 0

Re: [localspl/tests] Remove tempfile after running the tests
by Detlef Riekenberg 06 Mar '07

06 Mar '07

On Di, 2007-03-06 at 18:47 +0100, Paul Vriens wrote: > We had a leftover file in the temp directory. > > Changelog > Remove tempfile after running the tests Ignore my prev. mail. I looked always in "c:\temp" and found the files in "c:\tmp" :-( Sorry for the noise. -- By by ... Detlef

1 0

Re: [localspl/tests] Remove tempfile after running the tests
by Detlef Riekenberg 06 Mar '07

06 Mar '07

On Di, 2007-03-06 at 18:47 +0100, Paul Vriens wrote: > + > + /* Cleanup our temporary file */ > + DeleteFileW(tempfileW); Where / when did you see an undeleted File for this test? localspl_test.exe does not create a temporary file yet. -- By by ... Detlef

1 0

dll that just forward
by Luis Carlos Busquets Pérez 06 Mar '07

06 Mar '07

Concerning dlls dpnaddr.dll dpnlobby.dll They both are dlls with just one function and that it is forwarded to dpnet.dll. I understand that this is just for compatibility reasons. If we add to the git tree these two spec files dlls/dpnaddr/dpnaddr.spec: stdcall DirectPlay8AddressCreate( ptr ptr ptr ) dpnet.DirectPlay8AddressCreate dlls/dpnlobby/dpnlobby.spec: stdcall DirectPlay8Create(ptr ptr ptr) dpnet.DirectPlay8Create Shouldn't these do to have both dlls implemented natively in wine? Do we need to add anymore code for dll functions which are just forwarded in windows?

2 1

Regression in Lotus Notes R5 between wine-0.9.27 and wine-0.9.28
by Pedro Araujo Chaves Jr. 06 Mar '07

06 Mar '07

Hi all, There's been a regression in printing in Lotus Notes R5 somewhere between wine-0.9.27 and wine-0.9.28: it seems that the presence of an inline picture (in this case, a logo) in the mail stationery prevents all text (including header text) from being printed. Odd as it may seem, my regression testing pointed commit 21635133fb271405fefd6bce3078cf971e84c426 as the cause. I positioned my tree just before it, and the mail printed okay; I applied it, the mail came out blank again. As I still couldn't see any direct relation between the said commit and this issue, I'm posting here in the hope someone would be able to figure out what's going on. If that's the case, then, I'll file a bug report and upload a database containing a message with one of these problematic stationeries. Regards, -- - Pedro.

2 3

Re: [wordpad]updated Korean Resource
by Detlef Riekenberg 06 Mar '07

06 Mar '07

On Di, 2007-03-06 at 17:35 +0900, Hwang YunSong(황윤성) wrote: > MENUITEM "(&C)\tCtrl+C", ID_EDIT_COPY > + MENUITEM "ٿֱ(&P)\tCtrl+V", ID_EDIT_PASTE > + MENUITEM "(&C)\tDEL", ID_EDIT_CLEAR > + MENUITEM " (&S)\tCtrl+A", ID_EDIT_SELECTALL > MENUITEM SEPARATOR The idention is different. Please replace the tab with "4 Space" (Similar in the Stringtable below that Part) -- By by ... Detlef

1 0

Question some code in server/request.c
by Paul Vriens 06 Mar '07

06 Mar '07

Hi, while going through the Coverity reports I found CID-293 that mentions a possible NULL-RETURN. Marcus sent in a patch that wasn't applied. If I look at the code (starting at line 537): /* create the server directory and chdir to it */ static void create_server_dir( const char *dir ) { char *p, *server_dir; struct stat st, st2; if (!(server_dir = strdup( dir ))) fatal_error( "out of memory\n" ); /* first create the base directory if needed */ p = strrchr( server_dir, '/' ); *p = 0; create_dir( server_dir, &st ); /* now create the server directory */ *p = '/'; create_dir( server_dir, &st ); if (chdir( server_dir ) == -1) fatal_perror( "chdir %s", server_dir ); if (stat( ".", &st2 ) == -1) fatal_perror( "stat %s", server_dir ); if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino) fatal_error( "chdir did not end up in %s\n", server_dir ); free( server_dir ); } it looks to me that 'p' is not used at all (this is so since June 2002). Am I completely missing something? Cheers, Paul.

5 5

Re: ddraw: Don't include window border in default surface size (ignore the other patch)
by Stefan Dösinger 06 Mar '07

06 Mar '07

Am Sonntag 04 März 2007 20:49 schrieb Samuel Lidén Borell: > If no width or height is passed to CreateSurface, use GetClientRect > instead of GetWindowRect to calculate a default size. tbh, the whole thing is wrong. Whatever cooperative level is used, and whatever the surface size is, windows creates a front buffer surface of the full screen size. So if you have a res of 1400x1050 and a window of 64x64, the front buffer is 1400x1050 pixels in size. I wanted to change that somewhen, but the windowed d3d rendering needs some adjustments for it(Not the usual opengl problem).

1 0

Re: [1/2] gdi32: Implement AddFontMemResourceEx api.
by Dmitry Timoshkov 06 Mar '07

06 Mar '07

"Byeong-Sik Jeon" <wjsqudtlr(a)gmail.com> wrote: > These patches fix the BUG #5865 > http://bugs.winehq.org/show_bug.cgi?id=5865. > > changelog: > Implement AddFontMemResourceEx. You shouldn't need to create a temp file, FT_New_Memory_Face is able to load font data from memory just fine. FT_New_Memory_Face is already used by OpenFontFile, you need to adapt existing code to not require fonts to be passed as a file name in general. -- Dmitry.

2 2

Re: 0001-server-main.c-fixed-command-line-parsing-using-GNU-getopt
by Dmitry Timoshkov 06 Mar '07

06 Mar '07

"Srivatsa Kanchi, R" <skanchi(a)nexthop.com> wrote: > replaced the custom 'parse_args' function with GNU getopt And what's wrong with current parser, except it being custom? > applied some coding style to limit code 80 characters /line Please leave existing style alone, even if you don't like it. -- Dmitry.

2 3

Working on DIBEngine for SOC
by Ivan de Jesus Deras Tabora 06 Mar '07

06 Mar '07

Hello everyone. I'm thinking about participating in the Google SOC 2007. Given that Wine in one of my favorite Open Source projects I find interesting the idea of implementing the DIBEngine. In the past I've worked in some Open Source projects, one of them QT-Win32 and also I did little contributions to the OFC (Open Foundation Class). I've experience with C coding, mostly from working on Educational OS like GeekOS and PintOS. >From what I understood the hard part of this project is INTEGRATION. I mean integrating the new code into the Wine repository without breaking everything? Am I right? About the drawing code, I read that is possible to use the X11 code, also the ReactOS code and the old Transgaming DIBEngine (incomplete). Is that correct? Waiting for your comments and ideas. Regards, Ivan

5 4

Re: AppDB performance issue
by Tony Lambregts 05 Mar '07

05 Mar '07

Nick Law wrote: > Hi Tony, > Just lately, I've noticed that AppDB seems to be very slow, i.e it can > take15 seconds or more for a page to come up or simply to login. Is > there a bandwidth problem or is the server getting overwhelmed or is > it a problem at my end (UK). 30 seconds later it's back to being very > responsive as if the server was a bit overloaded for 30 seconds or so. > Other websites I try at the time work fine including winehq. Is winehq > on a different server ? > I have noticed this too and it is very annoying. Yes www.winehq.org qpdb.winehq.or and bugs.winehq.org are all on the same server. Winehq and bugzilla are quite snappy but the AppDB is a pig now. I have know idea what is wrong -- Tony Lambregst

9 19

Current wine and HL2 family - well done!
by Luke Bratch 05 Mar '07

05 Mar '07

> without an annoying graphics glitch causing parts of skies to be > replaced with some bogus contents like white, black, mirrors of a part of > ground etc. Are you finding no errors at all? In Counter-Strike: Source, when running in anything above DX7 mode, on the map "de_aztec", the screen is often completely black - it appears to be when looking at water. ___________________________________________________________ Inbox full of unwanted email? Get leading protection and 1GB storage with All New Yahoo! Mail. http://uk.docs.yahoo.com/nowyoucan.html

7 15

mingw linking problem
by Stefan Leichter 05 Mar '07

05 Mar '07

Hello, i'm trying to build wine/its dlls with mingw. This fail for some dlls at the linking, eg. comdlg32.dll misses the imports _IID_IContextMenu, _IID_IShellFolder, _IID_IPersistFolder2, _IID_IShellBrowser, _IID_ICommDlgBrowser, _IID_IShellView, _SID_STopLevelBrowser My investigations are showing that mingw has the missing imports in libshell32.a., but the linker links against wine's shell32.dll. The missing symbols are also in wine's libuuid.a, but this is not used because the linker does not see the file. When i extend the linker call with -L../../dlls/uuid i can link the comdlg32.dll successfully.. I have tried to find the symbols with strings on my win2k box, but the symbols are not there. So the first question is: What is the correct way to build the dll? The second question when we agreed on the first one is: Can someone please fix configure/Makefile.in to work properly . Thanks Stefan

3 3

Visualizing skip on test.winehq.org (and getting rid of visible desktop border)
by Paul Vriens 05 Mar '07

05 Mar '07

Hi, currently all tests on test.winehq.org show the blue border to indicate the test is running on a visible desktop. I think we can get rid of this one as winetest will not run if we don't have a visible desktop. My idea is to visualize the skipped tests by using the blue border at the single test level to indicate tests are skipped (see attached picture). Comments, idea's, thoughts? Cheers, Paul.

3 2

fc4 rpms
by Bill Medland 05 Mar '07

05 Mar '07

Is there any chance that someone with the ability can create the fedora core 4 wine rpms for version 0.9.30? Bill Medland

4 4

Re: Problems with Alice
by gslink 05 Mar '07

05 Mar '07

After considerable digging the problems with sound in Alice were traced to a bad software load. While digging another thing came to our attention that may be of interest to others. When we put in the latest fixes to FC6 Wine quit running. This was traced to the fact that the latest fixes contain a set of fixes for the X server and replace the open GL library. The drivers posted by Nvidia, which were installed, have their own GL library and will not work with the RH GL library. If you install an update to FC and are using the Nvidia drivers reinstall the drivers if things in the X server quit working. This is true even if the kernel version is not changed.

1 0

Re: secur32: NTLM's AcquireCredentialHandleA/W should accept domains and usernames with lengths of 0.
by Kai Blin 05 Mar '07

05 Mar '07

On Monday 05 March 2007 13:02, Robert Shearman wrote: > + if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) > + { > + trace("NTLM package not installed, skipping test\n"); > + return; > + } I've just started using skip() for skipping tests. Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

2 1

Writing IDL and other definition files
by Jeff L 05 Mar '07

05 Mar '07

I am looking at writing a piece of IDL and a header file I am wrestling with how to do it without infringing copyright. IDL looks particularly hard to write from first principles and is probably hard to write in a different way as the functions being implemented are defined and require IDL similar code. Is there any advice as to what type of code can be copied and what constitutes a rewrite to avoid copyright? Jeff

2 2

Re: [msi, 1/5, try 5] msi: Add OLE automation conformance test.
by James Hawkins 04 Mar '07

04 Mar '07

On 3/4/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > Changes: Ok, try 5. This time there are five patches, as this first > patch is a (moderately) comprehensive conformance test for MSI OLE > automation, which checks all the functions that will be implemented, and > does basic checks like set a property, then get it, is the property what > we set it to? I hope this helps get it into git. > > These patches add partial OLE automation support for MSI and then add > JScript/VBScript support for MSI (as the MSI specs specifically state > that applications that need this functionality must install Windows > Script themselves). As a proof of concept, sufficient automation support > is added to conform to the conformance test and to fix bug #7357. > Doesn't compile: ../../../tools/winegcc/winegcc -B../../../tools/winebuild -mconsole automation.o db.o format.o iface.o install.o msi.o package.o record.o suminfo.o testlist.o -o msi_test.exe.so ../../../libs/port/libwine_port.a -lcabinet -lmsi -lshell32 -lole32 -ladvapi32 -lkernel32 -luuid automation.o: In function `invoke': /home/truiken/wine/dlls/msi/tests/automation.c:389: undefined reference to `VariantInit' /home/truiken/wine/dlls/msi/tests/automation.c:404: undefined reference to `VariantClear' /home/truiken/wine/dlls/msi/tests/automation.c:398: undefined reference to `VariantChangeTypeEx' -- James Hawkins

2 3

Re: [PATCH 1/2] comctl32: Added getter-setter tests for the tab control (second attempt)
by Vitaliy Margolen 04 Mar '07

04 Mar '07

The_Hagop wrote: > @@ -1,5 +1,6 @@ > /* Unit test suite for tab control. > * > + * Copyright 2007 Hagop Hagopian > * Copyright 2003 Vitaliy Margolen > * > * This library is free software; you can redistribute it and/or These are sorted in historical order. > @@ -52,6 +59,8 @@ > > static HFONT hFont = 0; > > +static HWND hTab; > + > static HWND > create_tabcontrol (DWORD style, DWORD mask) > { You using exactly the same name as parameter to all of your functions. This creates lots of confusion. Please remove this global variable and pass it as a function parameter instead. > + /* Creating a tooltip window*/ > + hwndTT = CreateWindowEx(WS_EX_TOPMOST, > + TOOLTIPS_CLASS, > + NULL, > + WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP, > + CW_USEDEFAULT, > + CW_USEDEFAULT, > + CW_USEDEFAULT, > + CW_USEDEFAULT, > + hTab, > + NULL, > + 0, > + NULL > + ); > + > + SetWindowPos(hwndTT, > + HWND_TOPMOST, > + 0, > + 0, > + 0, > + 0, > + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); This looks just plain bad. Please put all parameters one after another. There are absolutely no need to have each on it's own line. > + ti.rect.left = rect.left; > + ti.rect.top = rect.top; > + ti.rect.right = rect.right; > + ti.rect.bottom = rect.bottom; You can assign structures to structures in C: ti.rect = rect; > + todo_wine{ > + /* Testing CurFocus with negative value */ > + SendMessage(hTab, TCM_SETCURFOCUS, -1, 0); > + focusIndex = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); > + expect(-1, focusIndex); > + } Here and all other places - the only part of the test that's failing is "expect(,)". Add "todo_wine" at front of it only. Also it would be interesting to test larger negative numbers, like -10. This is because number of places use -1 to indicate that nothing is selected. So in a sense you might be getting a correct number. > + expect((int) extendedStyle, (int) prevExtendedStyle); > + todo_wine{ > + extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); > + expect(TCS_EX_FLATSEPARATORS, (int) extendedStyle); > + } Why are you casting DWORD to int? > +static void test_getters_setters(INT nTabs) > +{ > + RECT rTab; > + INT nTabsRetrieved; > + INT rowCount; > + > + hTab = createFilledTabControl(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); > + ok(hTab != NULL, "Failed to create tab control\n"); > + > + SendMessage(hTab, TCM_SETMINTABWIDTH, 0, -1); > + > + /* Testing GetItemCount */ > + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); > + expect(nTabs, nTabsRetrieved); > + > + /* Testing GetRowCount */ > + rowCount = SendMessage(hTab, TCM_GETROWCOUNT, 0, 0); > + expect(1, rowCount); > + > + /* Testing GetItemRect */ > + SendMessage(hTab, TCM_GETITEMRECT, 0 , (LPARAM) &rTab ); > + CheckSize(hTab, TAB_DEFAULT_WIDTH, -1 , "Default Width"); > + > + test_getset_curFocus(hTab, nTabs); > + test_getset_curSel(hTab, nTabs); > + > + test_getset_extendedStyle(hTab); > + test_getset_unicodeFormat(hTab); > + test_getset_item(hTab); > + test_getset_tooltip(hTab); > + > + DestroyWindow(hTab); > +} All your small functions should go inside this function. There is no need to create 100 small functions that do 1-3 tests. > + > + test_getters_setters(5); > } This part part of your patch appears to be malformed. Vitlaiy

2 2

Current wine and HL2 family - well done!
by Pavel Troller 04 Mar '07

04 Mar '07

Hi! Normally I'm writing complaints here, so for a bit of compensation, I would like to inform that yesterday's wine runs HL2 family of games for the first time without an annoying graphics glitch causing parts of skies to be replaced with some bogus contents like white, black, mirrors of a part of ground etc. So, many thanks to all the DirectX developers especially from my sons, they are very pleased and wish you all the best, especially continuous progress in wine development (a bit egocentric from them, but nice :-)) ). With regards, Pavel Troller

2 1

Re: gdi32: Add a EnumFontFamilies test, make it pass under Wine. Try 2
by Dmitry Timoshkov 04 Mar '07

04 Mar '07

"Dmitry Timoshkov" <dmitry(a)codeweavers.com> wrote: > this patch should fix the problem reported in the bug #7571. > > This version of the patch adds a test for the case of enumerating "Symbol"-like > fonts (pointed out by Huw), and makes it pass under Wine as well. > > Changelog: > gdi32: Add a EnumFontFamilies test, make it pass under Wine. Please do not commit this patch, according to the comments in the bug above it needs more work. -- Dmitry.

1 0

Re: Fix compilation on systems that don't support nameless unions.
by Dmitry Timoshkov 04 Mar '07

04 Mar '07

"Francois Gouget" <fgouget(a)free.fr> wrote: > This fixes compilation with gcc 2.95. > > programs/cmd/batch.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) As a more general solution that would also prevent this kind of breakage in future would be to move #define NONAMELESSUNION #define NONAMELESSSTRUCT from directory.c to wcmd.h. -- Dmitry.

1 0

Re: (resend) Scroll window fix
by Peter Oberndorfer 03 Mar '07

03 Mar '07

On Tuesday 13 February 2007 14:38, Aric Stewart wrote: > finds the case where the scrolling amount exceeds the window but still > falls within the clipping rect. This generates an additional update > region that needs to be invalidated. > includes a test > Hi, I think your patch has a problem. It calls CombineRgn with the deleted Region hrgnClip. I don't know if it impacts real world applications, but i just saw a warning about a invalid handle in my debug log. Maybe moving DeleteObject below the if solves the problem? I don't know... @@ -870,6 +870,26 @@ INT WINAPI ScrollWindowEx( HWND hwnd, IN CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); RedrawWindow( hwnd, NULL, hrgnTemp, rdw_flags); DeleteObject( hrgnClip ); //<<<<<<< deleted here + + /* Catch the case where the scolling amount exceeds the size of the + * original window. This generated a second update area that is the + * location where the original scrolled content would end up. + * This second region is not returned by the ScrollDC and sets + * ScrollWindowEx apart from just a ScrollDC. + * + * This has been verified with testing on windows. + */ + if (abs(dx) > abs(rc.right - rc.left) || + abs(dy) > abs(rc.bottom - rc.top)) + { + DeleteObject( hrgnTemp ); + hrgnTemp = CreateRectRgn(rc.left + dx, rc.top + dy, rc.right+dx, rc.bottom + dy); + CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND ); //<<<<<<< used here + CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp, RGN_OR ); + + if( !bOwnRgn) + CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); + } } DeleteObject( hrgnTemp ); Greetings Peter

1 0

msi ole automation update
by Misha Koshelev 03 Mar '07

03 Mar '07

Hi everbody, I have been working on some more stuff for the MSI OLE automation, and I now have a moderately comprehensive conformance test (1000 or so lines, tests each function implemented at least for basic functionality, tests things like return codes, if you set a property and then get it do you get what you set it to, etc.). A few small patches are needed to then make my OLE automation code (which is still hanging out in wine-patches, not in git yet) pass this test. I am going to wait to send all these new patches to wine-patches until my other patches get reviewed/committed by Alexandre. However, I thought I would post them here for any comments. I am going to be _quite_ busy starting Monday for a month though, so I may likely not be able to make any serious modifications to them if people see large problems until April. However, if anyone has any comments about these or my patches already sitting in wine-patches, please do let me know. Thanks Misha

1 1

re: GSoC project proposal: Implement the Negotiate and Kerberos SSPs based on GSSAPI
by Dan Kegel 03 Mar '07

03 Mar '07

Kai wrote: >My toy idea is to not implement the ASN.1 stuff myself but instead make >use of GSSAPI for this.... Can you explain for us non-knowledgeable folks what ASN.1 stuff you're talking about? >Should using GSSAPI not work for us for whatever reason, I think it should be >well within the GSoC timeframe to bite the bullet and cobble together an >ASN.1 parser for Negotiate, handle negotiation in Wine and use libkrb5 for >Kerberos. When I first looked at gssapi back in '98 or so, it seemed to be mostly an annoying convenience layer that just got in the way of my project (which was to add authentication to a network game library). Here's a rule of thumb: if a convenience layer does any networking for you, it will do it wrong. Let's look at Heimdal's networking, for instance. In heimdal, its networking implementation uses select(). We've spent a lot of time purging all select()'s from Wine's source tree because any application that uses select() breaks once you have fd's in your app with values above 1024. Sure, we can fix that by submitting patches to Heimdal to use poll() instead, but there are are sure to be other problems. The best thing to do is eschew all functions that do networking for you, and do it all yourself. So, can you do what you're thinking of without being forced to let gssapi do networking for you? For those just tuning in, here's some context: http://www.stacken.kth.se/lists/heimdal-discuss/2006-12/msg00030.html http://www.stacken.kth.se/lists/heimdal-discuss/2006-12/msg00033.html - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

Re: [PATCH 2/2] comctl32: Added message sequence tests for the tab control
by Vitaliy Margolen 03 Mar '07

03 Mar '07

The_Hagop wrote: > assert(tabHandle); > > - SetWindowLong(tabHandle, GWL_STYLE, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TCS_FOCUSNEVER | style); > - SendMessage (tabHandle, WM_SETFONT, 0, (LPARAM) hFont); > + if (!tabHandle) > + { > + HeapFree(GetProcessHeap(), 0, info); > + return NULL; > + } This check is redundant. assert will terminate the test if window was not created properly. You probably should remove it and skip the test. > @@ -448,22 +717,42 @@ > INT nTabsRetrieved; > INT rowCount; > > + parent_wnd = createParentWindow(); > + ok(parent_wnd != NULL, "Failed to create parent window!\n"); > + ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_wnd_seq, "create parent window", TRUE); > + flush_sequences(sequences, NUM_MSG_SEQUENCES); > + No need to test window creation sequence here. It's tested in much more details in user32/tests/msg.c Also you are leaking parent window - you don't destroying it at the end of the test. And, same as hTab, don't make it global. You are not using it outside one function. > @@ -474,6 +763,9 @@ > test_getset_tooltip(hTab); > > DestroyWindow(hTab); > + > + ok_sequence(sequences, TAB_SEQ_INDEX, destroy_tab_control_seq, "Tab sequence, after removing tab control from parent", FALSE); > + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Parent sequence, after removing tab control from parent", FALSE); > } > > START_TEST(tab) Same thing here - there are no common controls' related messages in them- no need to test what's already being tested in the other places. And last but not the least - your tests fail on windows 2k and xp pro in interactive mode (set WINETEST_INTERACTIVE=1): tab: 911 tests executed (0 marked as todo, 20 failures), 0 skipped. Vitaliy.

1 0

Re: DirectPlay should convert dwReserved1/2 registry keys from strings to DWORDs
by Joris Huizer 03 Mar '07

03 Mar '07

if( i == 0 ) - memcpy( &lpSpData->dwReserved1, returnBuffer, sizeof(lpSpData->dwReserved1) ); + sscanf(returnBuffer, "%x", &lpSpData->dwReserved1); Couldnt you use: strcpy(lpSpData->dwReserved1,returnBuffer); Sorry for only replying now; Your solution is equivalent, except that it is looks more complicated regards, Joris --------------------------------- The fish are biting. Get more visitors on your site using Yahoo! Search Marketing.

2 2

Re: [2/?]WineD3D: Adjust the rhw transformation for offscreen rendering
by Stefan Dösinger 03 Mar '07

03 Mar '07

Am Samstag 03 März 2007 02:53 schrieb Stefan Dösinger: > I hope I explained it correctly, these tripple upside down matrix things > are the perfect way to get insane. Actually that is not totally correct - it should be - Y, -Y - height. It works because all games I have seen use Y = 0 I'll resend a fixed patch

1 0

Re: DirectPlay should convert dwReserved1/2 registry keys from strings to DWORDs
by Kai Blin 03 Mar '07

03 Mar '07

On Friday 02 March 2007 22:54, Alessandro Pignotti wrote: > Hi, > This is the first of several patches that will make builtin dplayx > compatible with native dpwsockx, so we can kill the native override of > dplayx This patch adds two compile-time warnings about implicitly declaring sscanf. Please include the appropriate header or provide the function header if you use sscanf. Other than that, this patch stops builtin dplay from blowing up in my face with native dpwsockx.dll. Good work. Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: (resend) Scroll window fix
by Dmitry Timoshkov 03 Mar '07

03 Mar '07

"Aric Stewart" <aric(a)codeweavers.com> wrote: > + SetRect( &rc, 0,40, 100,60); > + SetRect( &cliprc, 0,0, 100,100); > + ScrollWindowEx( hwnd1, 0, -25, &rc, &cliprc, hrgn, &rcu, SW_INVALIDATE); > + SetRectRgn( tmprgn, 0,15,98,35); > + CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); > + SetRectRgn( tmprgn, 0, 40, 98, 60); > + CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); > + ok( EqualRgn( exprgn, hrgn), "wrong update region in excessive scroll\n"); Under which version of Windows this was tested? According to test.winehq.org this test doesn't pass under any of Win98, NT4, Win2000 nor XP invalidating the (now committed) fix. I'd vote to revert this patch as obviously incorrect. -- Dmitry.

3 4

GSoC project proposal: Implement the Negotiate and Kerberos SSPs based on GSSAPI
by Kai Blin 03 Mar '07

03 Mar '07

Hi folks, after I spent my last two summers toying with the NTLM SSP, I'm considering to implement Negotiate and Kerberos this time. As we've discussed on WineConf, there's more than one way to do this. My toy idea is to not implement the ASN.1 stuff myself but instead make use of GSSAPI for this. (With the added bonus that when using Heimdal GSSAPI, we should be able to do NTLM via GSSAPI, too, so Negotiate can actually negotiate between Kerberos and NTLM). I'm not 100% sure that this approach will work, but then again, if I got and write the proof of concept now, I won't have much to do during the summer. Should using GSSAPI not work for us for whatever reason, I think it should be well within the GSoC timeframe to bite the bullet and cobble together an ASN.1 parser for Negotiate, handle negotiation in Wine and use libkrb5 for Kerberos. Dan Kegel seemed to prefer this approach, anyway. In any case I would like to keep the NTLM provider using ntlm_auth in as a fallback solution. What do you think? Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: winex11.drv: Try to work around an access violation in dib_convert
by Dmitry Timoshkov 03 Mar '07

03 Mar '07

"Louis. Lenders" <xerox_xerox2000(a)yahoo.co.uk> wrote: > @@ -849,7 +858,17 @@ static void convert_888_to_0888_asis(int > for (x=0; x < w2; x++) { > /* Do 4 pixels at a time: 3 dwords in and 4 dwords out */ > DWORD srcval1,srcval2; > - srcval1=srcpixel[0]; > + /* Some apps crash in following code-line, possibly they pass a bad pointer*/ > + __TRY > + { > + srcval1=srcpixel[0]; > + } > + __EXCEPT(exception_filter) > + { > + return; > + } > + __ENDTRY; An exception handler should be set around the whole conversion cycle, not around a single pixel read since it's a very expensive (slow) operation in Wine (unlike in Windows). -- Dmitry.

1 0

Re: [2/3] wined3d: The texldl instruction takes 3 arguments
by Ivan Gyurdiev 03 Mar '07

03 Mar '07

> Changelog: > - The texldl instruction takes 3 arguments > Can the SW shader handlers be deleted now that the rest of the SW code is gone. They just get out of sync when you do things like this.

2 1

Re: [programs/cacls] Dummy implementation of cacls.exe (try 2)
by Nigel "Nia-Chiang" Liang 02 Mar '07

02 Mar '07

Yes, sorry about that. Here is the modified patch -Nigel On 3/2/07, James Hawkins <truiken(a)gmail.com> wrote: > > On 3/2/07, Nigel Nia-Chiang Liang <ncliang(a)gmail.com> wrote: > > Hi, > > > > This patch implements a dummy version of cacls.exe to fix bug 7593. > > > > +#RC_SRCS = wcmdrc.rc > +#RC_BINSRC = wcmdrc.rc > +#RC_BINARIES = wcmd.ico > > Did you accidentally leave these in? > > -- > James Hawkins >

1 0

Re: Re: Re: Forum proposal
by "Luis C. Busquets Pérez" 02 Mar '07

02 Mar '07

I understand that for some people the mailing list is a far better thing. May be for some other, a forum is better. Why not having both? Running a forum does not exclude continuing with the mailing lists and could add users and developpers who find more easy coordinate through a forum. Configuring phpBB (www.phpbb.com) does not take more than 1 hour . I have made a try in 30 minutes starting from not knowing anything about this package: http://ns2.ilidium.com:8011/ Why not trying both systems? > I fully agree with Jonathan - the mail lists that have gone to forums I've dropped off. I can check the mail lists > quickly, easily, filter as necessary and get what I need without having to sign on and wade through a bunch of posts. > If people really want forums setup a forum and let those who want it use it. > > > > From: Jonathan Allen <jonathan(a)barumtrading.co.uk> > > Date: 2007/03/01 Thu AM 11:20:18 EST > > To: wine-devel(a)winehq.org > > Subject: Re: Forum proposal > > > > On Thu, Mar 01, 2007 at 05:15:03PM +0100, Luis Carlos Busquets Pérez wrote: > >> > > Instead of having the mailing lists, I think that a "forum" would increase >> > > and facilitate the group working. >> > > > > I could agree less. IMHO a mailing list works well by making sure that > > everyone gets everything, without them needing to go anywhere to get it. > > A forum wil immediately disenfranchise all thsoe who have no immediate > > need to go and visit the forum site every day and so will miss important > > annoucements and so on. Bad idea. > > > > Jonathan

9 13

Re: [programs/cacls] Dummy implementation of cacls.exe
by James Hawkins 02 Mar '07

02 Mar '07

On 3/2/07, Nigel Nia-Chiang Liang <ncliang(a)gmail.com> wrote: > Hi, > > This patch implements a dummy version of cacls.exe to fix bug 7593. > +#RC_SRCS = wcmdrc.rc +#RC_BINSRC = wcmdrc.rc +#RC_BINARIES = wcmd.ico Did you accidentally leave these in? -- James Hawkins

1 0

Re: kernel32: Implement ReplaceFileA/ReplaceFileW
by Felix Nawothnig 02 Mar '07

02 Mar '07

(CC-ing wine-devel again) Erich Hoover wrote: >> The "right" way would probably to do the copying yourself by >> read/write.. but I dunno. > Except that it would ignore the permissions issues that have already > been coded into the copy routines (and any updates that may eventually No, CreateFile (and friends) does the permissions checks (which you would still have to call). > be made to these routines). Also, it seems to me that MSDN is > describing the list of function calls that ReplaceFile actually makes. No it doesn't? Your other objections were right. Your last version follows for wine-devel. > ------------------------------------------------------------------------ > > /************************************************************************** > * ReplaceFileW (KERNEL32.@) > * ReplaceFile (KERNEL32.@) > */ > BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName,LPCWSTR lpReplacementFileName, > LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, > LPVOID lpExclude, LPVOID lpReserved) > { > HANDLE hReplaced, hReplacement; > BOOL skipBackup = FALSE; > > if(dwReplaceFlags) > FIXME("Ignoring flags %x\n", dwReplaceFlags); > /* First two arguments are mandatory */ > if(!lpReplacedFileName || !lpReplacementFileName) > { > SetLastError( ERROR_INVALID_PARAMETER ); > return FALSE; > } > /* > * Lock the "replacement" file, fail if it does not exist > */ > if((hReplacement = CreateFileW(lpReplacementFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > return FALSE; > } > if(!LockFile( hReplacement, 0, 0, 0, 0 )) > { > CloseHandle( hReplacement ); > return FALSE; > } > /* > * Lock the "replaced" file while we're working. > */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > /* If "replaced" does not exist then create it for the lock, but skip backup */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > return FALSE; > } > skipBackup = TRUE; > } > if(!LockFile( hReplaced, 0, 0, 0, 0 )) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > CloseHandle( hReplaced ); > return FALSE; > } > /* > * If the user wants a backup then that needs to be performed first > */ > if( lpBackupFileName && !skipBackup ) > { > /* If an existing backup exists then copy over it */ > if(!CopyFileW( lpReplacedFileName, lpBackupFileName, FALSE )) > goto replace_fail; > } > /* > * Now that the backup has been performed (if requested), copy the replacement > * into place > */ > if(!CopyFileW( lpReplacementFileName, lpReplacedFileName, FALSE )) > { > /* Assume that all access denied errors are a write problem. */ > if(GetLastError() == ERROR_ACCESS_DENIED) > SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); > else > SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); > goto replace_fail; > } > /* Delete the replacement file */ > if(!DeleteFileW( lpReplacementFileName )) > return FALSE; > /* Unlock the handles */ > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > /* All done, file replacement successful */ > return TRUE; > > replace_fail: > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > return FALSE; > }

2 4

Re: ntdll: make exception test not hang when creating process fails
by Robert Shearman 02 Mar '07

02 Mar '07

Peter Oberndorfer wrote: > --- > Did not seem to happen in the wild, > but just make sure the test fails gracefully > if launching the child fails > > Applies on top of the patch which should fix test result reporting > If it doesn't happen in the wild, then it should stay as an "ok". -- Rob Shearman

1 0

Re: kernel32: Set object security on process object in CreateProcess.[try2]
by Vitaliy Margolen 02 Mar '07

02 Mar '07

Vitaliy Margolen wrote: > Removed todo from succeeding tests. > > Tests showed that only DACL can be set this way. Owner and group > are taken from the token. And we don't need SACL at this time if ever. > --- > dlls/advapi32/tests/security.c | 3 --- > dlls/kernel32/process.c | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 3 deletions(-) Any reason this patch was not applied? Vitaliy.

2 1

[TOOLS/RFC] Use skip information on test.winehq.org
by Paul Vriens 02 Mar '07

02 Mar '07

Hi, This patch add the skip information to test.winehq.org. I'm not a 100% sure what will happen to the already existing reports when summary.js is patched. This however is only relevant for someone opening the popup window for old reports. There could be an issue when somebody is running an old(er) winetest version and sends the results to test.winehq.org. The summary.txt will be different for the later added ones compared to the ones that are already there. Should I change the fileversion (from 3 to 4)? In that case only new type winetest reports will be accepted by test.winehq.org. Any other remarks and/or suggestions? Changelog Use skip information Cheers, Paul. Index: winetest/dissect =================================================================== RCS file: /home/wine/tools/winetest/dissect,v retrieving revision 1.21 diff -u -p -r1.21 dissect --- winetest/dissect 1 Mar 2007 18:30:28 -0000 1.21 +++ winetest/dissect 2 Mar 2007 10:10:21 -0000 @@ -143,9 +143,9 @@ if ($wine) { /Test output:\r?/ or mydie "no test header: $_"; my ($unit, $test, $source, $rev, $result); -my ($lines,$total, $todo, $failed); +my ($lines,$total, $todo, $failed, $skipped); $unit = undef; # state machine starts -$total = $todo = $failed = 0; +$total = $todo = $failed = $skipped = 0; $lines = 0; while (<IN>) { if (!defined $unit) { # new test @@ -165,13 +165,14 @@ while (<IN>) { $total += $2; $todo += $3; $failed += $4; + $skipped += $5; print OUT; } elsif (s/$unit:$test done $(-?\d+)$\r?$//) { chomp; # current test ended if ($lines==0) { - $result = "failed $1 -"; + $result = "failed $1 - -"; } else { - $result = "$total $todo $failed"; + $result = "$total $todo $failed $skipped"; } FINISH: print SUM "- $unit $test $result $source $rev\n"; @@ -183,7 +184,7 @@ while (<IN>) { mydie "can't rename $tmpfile to $testfile: $!\n"; } $unit = undef; - $total = $todo = $failed = 0; + $total = $todo = $failed = $skipped = 0; $lines = 0; } else { # current test output print OUT; @@ -191,7 +192,7 @@ while (<IN>) { } if (defined $unit) { $_=""; - $result = "failed - -"; + $result = "failed - - -"; goto FINISH; } close SUM or mydie "error writing $tmpdir/summary.txt: $!"; Index: winetest/gather =================================================================== RCS file: /home/wine/tools/winetest/gather,v retrieving revision 1.17 diff -u -p -r1.17 gather --- winetest/gather 11 Jan 2007 17:03:43 -0000 1.17 +++ winetest/gather 2 Mar 2007 10:10:21 -0000 @@ -94,10 +94,10 @@ foreach my $file (glob "$datadir/$build/ next; } while (<TEST>) { - my ($digest, $unit, $test, $count, $todo, $error, + my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; - $testref->{results}->{$testname} = [$count, $todo, $error]; + $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname}; if ($count ne "failed") { @@ -215,7 +215,7 @@ sub singletest { print OUT " <td class=\"${vis}note\">.</td>\n"; } else { my $file = "$test->{dir}/$testname.txt"; - my ($count, $todo, $error) = @{$test->{results}->{$testname}}; + my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; if ($count eq "failed") { my $msg = $todo eq "-"?"crash": $todo == 258?"timeout":"failed"; @@ -226,8 +226,8 @@ sub singletest { print OUT <<"EOF"; <td class="$vis$class"><a href="$file" - title="$count tests, $todo TODO, $error errors" - onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error);" + title="$count tests, $todo TODO, $error errors, $skipped skipped" + onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" >$error</a></td> EOF } Index: winetest/resultform.html =================================================================== RCS file: /home/wine/tools/winetest/resultform.html,v retrieving revision 1.1 diff -u -p -r1.1 resultform.html --- winetest/resultform.html 19 Feb 2004 22:00:34 -0000 1.1 +++ winetest/resultform.html 2 Mar 2007 10:10:21 -0000 @@ -34,6 +34,10 @@ <td>Errors:</td> <td><input type="text" name="errors" size="6" readonly></td> </tr> + <tr> + <td>Skipped:</td> + <td><input type="text" name="skipped" size="6" readonly></td> + </tr> </form> </body> </html> Index: winetest/summary.js =================================================================== RCS file: /home/wine/tools/winetest/summary.js,v retrieving revision 1.2 diff -u -p -r1.2 summary.js --- winetest/summary.js 11 Jan 2005 16:00:44 -0000 1.2 +++ winetest/summary.js 2 Mar 2007 10:10:22 -0000 @@ -9,7 +9,7 @@ function isopen () { return result_window && result_window.document && result_window.document.results; } -function refresh (test, version, tests, todo, errors) { +function refresh (test, version, tests, todo, errors, skipped) { if (isopen ()) { var form = result_window.document.results; form.test.value = test; @@ -17,6 +17,7 @@ function refresh (test, version, tests, form.tests.value = tests; form.todo.value = todo; form.errors.value = errors; + form.skipped.value = skipped; result_window.focus (); } } @@ -31,5 +32,6 @@ function clone () { cf.tests.value = rf.tests.value; cf.todo.value = rf.todo.value; cf.errors.value = rf.errors.value; + cf.skipped.value = rf.skipped.value; } }

1 0

Re: kernel32: Fix GetComputerNameA to not count trailing NULL
by Dmitry Timoshkov 02 Mar '07

02 Mar '07

"Alasdair Sinclair" <alasdairs(a)dsl.pipex.com> wrote: > GetComputerNameA shouldn't count the trailing NULL when returning the > buffer. > --- a/dlls/kernel32/computername.c > +++ b/dlls/kernel32/computername.c > @@ -390,8 +390,7 @@ BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) > else > { > WideCharToMultiByte ( CP_ACP, 0, nameW, -1, name, len, NULL, 0 ); > - name[len] = 0; > - *size = len; > + *size = len - 1; > ret = TRUE; This change requires a test case. -- Dmitry.

1 0

Re: [try3, 4/4] msi: Add full JScript/VBScript support.
by James Hawkins 02 Mar '07

02 Mar '07

On 3/1/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > No changes from previous version. > > Implements the IActiveScriptSite interface which links with the session > object implemented in patch #3 and then adds a call to the script > handler from the common script handling function implemented in patch > #1. This fixes bug #7357 and possibly others. > > Changelog: > > * msi: Add full JScript/VBScript support. > +static HRESULT ASS_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ I'm not trying to be immature, but you should probably come up with a better prefix. + * Call a script. This is our meat and potatoes. + * - Currently, since the function is relatively new, it will always end up returning S_OK. + * Think of it like a bonus feature, we can run the script - great. If we have a problem, + * we are no worse off than if this function had not been called. + */ +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function, LPCWSTR action) +{ ... +/* return ret; */ + return ERROR_SUCCESS; /* FIXME: Until thoroughly tested, always return success */ This is wrong...and a hack. Don't be afraid of bugs. By always returning ERROR_SUCCESS, you're just hiding the bugs. What testing are you referring to? If a user runs an installer and the script fails, yet we return ERROR_SUCCESS, how are we going to know that the script is the problem? +static HRESULT WINAPI MsiActiveScriptSite_GetLCID(IActiveScriptSite* iface, LCID* plcid) +{ + MsiActiveScriptSite *This = (MsiActiveScriptSite *)iface; + TRACE("(%p/%p)->(%p) stub!\n", This, iface, plcid); + return E_NOTIMPL; +} If it's a stub, it needs to be marked with a FIXME. -- James Hawkins

2 3

Re: [try3, 1/4] msi: Added handlers for JScript/VBScript actions that call one script function.
by James Hawkins 01 Mar '07

01 Mar '07

On 3/1/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > I am resending the entire patchset as James Hawkins suggested. The only > changes from my previous patchset are in patch #2 (add full IDL from > Windows Installer 3.0 vs 2.0 in the old patchset) and patch #3 (added > more proper variant handling using GetDispId as per Rob's suggestion and > removed unnecessary comments as per James' suggestion). > > Just as a reminder, these patches add JScript/VBScript support for > MSI (as the MSI specs specifically state that applications that need > this functionality must install Windows Script themselves) and partial > but easily expandable OLE automation functionality for MSI. As a proof > of concept, sufficient automation support is added to fix bug #7357. > > Patch #1 creates custom action handlers for all 8 script custom action > types using a framework similar to that used for calling DLL functions. > These custom action handlers all converge on one function that is passed > a script and a function to be called (if any), and it outputs these in a > FIXME. > > Changelog: > > * msi: Added handlers for JScript/VBScript actions that call one script > function. > +static DWORD WINAPI ACTION_CallScript( const LPGUID guid ) +{ + msi_custom_action_info *info; + MSIHANDLE hPackage; + UINT r = ERROR_FUNCTION_FAILED; + + info = find_action_by_guid( guid ); + if (!info) + { + ERR("failed to find action %s\n", debugstr_guid( guid) ); + return r; + } + + FIXME("function %s, script %s\n", debugstr_w( info->function ), debugstr_w( info->dllname ) ); + + hPackage = alloc_msihandle( &info->package->hdr ); + if (hPackage) + { + r = S_OK; + MsiCloseHandle( hPackage ); + } + else + ERR("failed to create handle for %p\n", info->package ); + + return r; +} Looks like you're leaking info. If you're going to go down this route, leaving a stub ACTION_CallScript, then just print the FIXME and be on your way. Each patch should be atomic, and assuming this patch gets applied but none of the others do, you're left with some weird code that allocates a handle then frees it for no apparent reason. + r = MSI_RecordReadStream(row, 2, buffer, &sz); + if (r != ERROR_SUCCESS) + { + msi_free(buffer); + return r; + } + + buffer[sz] = 0; + szw = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, buffer, -1, bufferw, 0); + bufferw = msi_alloc(sizeof(WCHAR)*szw); + if (!szw) + { + msi_free(bufferw); + return ERROR_FUNCTION_FAILED; + } + + r = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, buffer, -1, bufferw, szw); + msi_free(buffer); + if (!r) + { + msi_free(bufferw); + return ERROR_FUNCTION_FAILED; + } This would be a lot cleaner if you used a 'goto done;' at each of these error points. Also, is there a reason you're not using strdupAtoW? done: msi_free(bufferw) ... return r; -- James Hawkins

2 1

re: Forum proposal
by Dan Kegel 01 Mar '07

01 Mar '07

Wojciech wrote: >But there's one thing with forums that IMVHO mailing-lists can't do. TBMS >forums build better comunities than mailing-lists. Mailing lists are just >concentrated on the topics, disallowing any OT. Good. Let's keep it that way. I think we have a great community as it is. If you really want a web interface that makes posting to the mailing list easy, maybe we could get Google Groups to carry wine-devel. It's as close to a nice web interface as you're going to get, I think. The other gateways I've seen between 'forums' and mailing lists all sucked, IMHO. - Dan

1 0

Re: [final, sorry] msi: Expand IDL file to contain all OLE automation interfaces.
by James Hawkins 01 Mar '07

01 Mar '07

On 3/1/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > Ok, sorry about posting patches to uncomitted patches, I have > reintegrated these changes back into my patches. The change in this > patch is the IDL file now contains all OLE automation interfaces as of > native installer version 3.0 (as opposed to 2.0). > > As a reminder this is part 2 of 4 of my patchset: > > 1. > http://www.winehq.org/pipermail/wine-patches/2007-February/036359.html > 2. This patch > 3. Next patch > 4. > http://www.winehq.org/pipermail/wine-patches/2007-February/036362.html > You need to resubmit the whole series if you resubmit parts of it. -- James Hawkins

2 3

Unknown issue with test.winehq.org
by Paul Vriens 01 Mar '07

01 Mar '07

Hi, So finally we have a working winetest executable and the test.winehq.org scripts should be able to handle the new reports. Could someone have a look what the issue currently is on the webserver as I've sent several reports (a few hours ago) and they are not handled yet? Cheers, Paul.

3 5

Re: Re: Forum proposal
by brettholcomb＠bellsouth.net 01 Mar '07

01 Mar '07

I fully agree with Jonathan - the mail lists that have gone to forums I've dropped off. I can check the mail lists quickly, easily, filter as necessary and get what I need without having to sign on and wade through a bunch of posts. If people really want forums setup a forum and let those who want it use it. > > From: Jonathan Allen <jonathan(a)barumtrading.co.uk> > Date: 2007/03/01 Thu AM 11:20:18 EST > To: wine-devel(a)winehq.org > Subject: Re: Forum proposal > > On Thu, Mar 01, 2007 at 05:15:03PM +0100, Luis Carlos Busquets Pérez wrote: > > Instead of having the mailing lists, I think that a "forum" would increase > > and facilitate the group working. > > I could agree less. IMHO a mailing list works well by making sure that > everyone gets everything, without them needing to go anywhere to get it. > A forum wil immediately disenfranchise all thsoe who have no immediate > need to go and visit the forum site every day and so will miss important > annoucements and so on. Bad idea. > > Jonathan > > >

2 1

Forum proposal
by Luis Carlos Busquets Pérez 01 Mar '07

01 Mar '07

Dear all, Instead of having the mailing lists, I think that a "forum" would increase and facilitate the group working. I wonder if you share my view and who is in charge of the web serving so that trying to set up the forum. Luis C. Busquets Pérez T. +34 93 796 05 81 M. +32 473 353 128 M. +34 620501328

2 1

Error Invalid EXE Format when executing a exe.so built with winelib
by Roger Wimbert 01 Mar '07

01 Mar '07

Here is the Debug output: warn:module:load_builtin_dll failed to load .so lib for builtin L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so": /bb/home/.wine/dosdevices/z:/bb/s/bc/wine/dmsw.exe.so: cannot allocate memory in static TLS block warn:module:load_dll Failed to load module L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so"; status=c000007b warn:module:load_builtin_dll failed to load .so lib for builtin L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so": /bb/home/.wine/dosdevices/z:/bb/s/bc/wine/dmsw.exe.so: cannot allocate memory in static TLS block warn:module:load_dll Failed to load module L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so"; status=c000007b wine: could not load L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so": Fehlerhaftes EXE-Format f³r It has something to do with TLS memory or threads, but the /lib/tls/libc.so is linked in: (rw 8 amd64) /bb/s/bc/wine 105>ldd dmsw.exe.so linux-gate.so.1 => (0xffffe000) libwine.so.1 => /usr/local/lib/libwine.so.1 (0x557be000) libm.so.6 => /lib/tls/libm.so.6 (0x558e8000) libc.so.6 => /lib/tls/libc.so.6 (0x5590a000) libdl.so.2 => /lib/libdl.so.2 (0x55a1f000) /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0x56555000) Our system: (rw 8 amd64) /bb/s/bc/wine 106>uname -a Linux amd64 2.6.5-7.193-smp #1 SMP Wed Jul 20 14:39:18 UTC 2005 x86_64 x86_64 x86_64 GNU/Linux glibc has version 2.3.3 A simple program does work, but no program which uses threads. wine is created with the 32 bit libraries. If I use the original exe of my program with wine, it does work. Does anyone has an idea what is going wrong? The makefile is attached. Thanks a lot. ### Generated by Winemaker TOPSRCDIR = /bb/s TOPOBJDIR = /bb/s/bc/wine SRCDIR = . SUBDIRS = DLLS = EXES = dmsw.exe ### Common settings CEXTRA = -mno-cygwin -fno-pic -fno-PIC CXXEXTRA = -mno-cygwin CFLAGS = -D_DMSW RCEXTRA = RCFLAGS = -DBB_WINE INCLUDE_PATH = -I. -I/bb/nt/wine -I/bb/s/i -I/bb/fg/i -I/bb/ze/i -I/bb/fe/i -I/bb/pbm/i -I/bb/wb1/i DLL_PATH = LIBRARY_PATH = LIBRARIES = -lmsvcrt40 -lws2_32 -lversion -lnetapi32 -liphlpapi -lcomctl32 -lshlwapi -lwinmm ### dmsw.exe sources and settings dmsw_exe_MODULE = dmsw.exe dmsw_exe_C_SRCS = /bb/s/c/bbcrypt.c \ /bb/s/c/bbdes.c \ /bb/s/c/bbmalloc.c \ /bb/s/c/bbmd5.c \ /bb/s/c/bbo.c \ /bb/s/c/bbtwofish.c \ /bb/s/c/cmp.c \ /bb/s/c/costri.c \ /bb/s/c/cpy.c \ /bb/s/c/datec.c \ /bb/s/c/dfa.c \ /bb/fg/c/dgcode.c \ /bb/fg/c/dgvar.c \ /bb/s/c/dhinfo.c \ /bb/s/c/dholz.c \ /bb/fg/c/digcte.c \ /bb/fg/c/digecm.c \ /bb/fg/c/digranox.c \ /bb/fg/c/digvec.c \ /bb/s/c/dirview.c \ /bb/s/c/dirwalk.c \ /bb/s/c/dmsb.c \ /bb/s/c/dmsc.c \ /bb/s/c/dmsca.c \ /bb/s/c/dmse.c \ /bb/s/c/dmsf.c \ /bb/s/c/dmsfr.c \ /bb/s/c/dmsg.c \ /bb/s/c/dmsh.c \ /bb/s/c/dmshc.c \ /bb/s/c/dmsl.c \ /bb/s/c/dmsliz.c \ /bb/s/c/dmsm.c \ /bb/s/c/dmsmv.c \ /bb/s/c/dmsp.c \ /bb/s/c/dmsr.c \ /bb/s/c/dmss.c \ /bb/s/c/dmssb.c \ /bb/s/c/dmst.c \ /bb/s/c/dmstast.c \ /bb/s/c/dmsw.c \ /bb/s/c/dmswf.c \ /bb/s/c/dmswicon.c \ /bb/s/c/dmsy.c \ /bb/s/c/encode.c \ /bb/s/c/fileleng.c \ /bb/s/c/fordat.c \ /bb/s/c/gtypes.c \ /bb/fg/c/image.c \ /bb/fg/c/imgprint.c \ /bb/s/c/itoa.c \ /bb/fg/c/jpegconv.c \ /bb/s/c/lru.c \ /bb/s/c/ltoa.c \ /bb/s/c/map.c \ /bb/s/c/msleep.c \ /bb/s/c/packbits.c \ /bb/s/c/packdiff.c \ /bb/s/c/pfad.c \ /bb/fg/c/rgbtools.c \ /bb/s/c/rtt.c \ /bb/s/c/scrinfo.c \ /bb/s/c/set.c \ /bb/s/c/sockcom.c \ /bb/s/c/softdum.c \ /bb/s/c/swap.c \ /bb/s/c/syslog.c \ /bb/s/c/textino.c \ /bb/fg/c/tiffconv.c \ /bb/s/c/udpcom.c \ /bb/s/c/utoa.c \ /bb/s/c/vgl.c \ /bb/s/c/w32argv.c \ /bb/fg/c/w32bmp.c \ /bb/s/c/w32error.c \ /bb/s/c/w32font.c \ /bb/fg/c/w32ico.c \ /bb/s/c/w32macadr.c \ /bb/s/c/w32pfad.c \ /bb/s/c/w32pipe.c \ /bb/s/c/w32print.c \ /bb/s/c/w32puts.c \ /bb/s/c/w32reg.c \ /bb/fg/c/w32scalebmp.c \ /bb/s/c/w32screen.c \ /bb/s/c/w32scroll.c \ /bb/s/c/w32toolbar.c \ /bb/s/c/w32tools.c \ /bb/s/c/w32winms.c \ /bb/s/c/wsinit.c \ /bb/s/c/zeitc.c dmsw_exe_CXX_SRCS= dmsw_exe_RC_SRCS = /bb/nt/rc/dmsw/dmsw_wine.rc dmsw_exe_LDFLAGS = -mwindows \ -mno-cygwin dmsw_exe_DLL_PATH= dmsw_exe_DLLS = odbc32 \ ole32 \ oleaut32 \ winspool dmsw_exe_LIBRARY_PATH= dmsw_exe_LIBRARIES= uuid dmsw_exe_OBJS = $(dmsw_exe_C_SRCS:.c=.o) \ $(dmsw_exe_CXX_SRCS:.cpp=.o) \ $(dmsw_exe_RC_SRCS:.rc=.res) ### Global source lists C_SRCS = $(dmsw_exe_C_SRCS) CXX_SRCS = $(dmsw_exe_CXX_SRCS) RC_SRCS = $(dmsw_exe_RC_SRCS) ### Tools CC = winegcc CXX = wineg++ RC = wrc ### Generic targets all: $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) ### Build rules .PHONY: all clean dummy $(SUBDIRS): dummy @cd $@ && $(MAKE) # Implicit rules .SUFFIXES: .cpp .rc .res DEFINCL = $(INCLUDE_PATH) $(DEFINES) $(OPTIONS) .c.o: $(CC) -c $(CFLAGS) $(CEXTRA) $(DEFINCL) -o $@ $< .cpp.o: $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< .cxx.o: $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< .rc.res: $(RC) $(RCFLAGS) $(RCEXTRA) $(DEFINCL) -fo$@ $< # Rules for cleaning CLEAN_FILES = y.tab.c y.tab.h lex.yy.c core *.orig *.rej \ \\\#*\\\# *~ *% .\\\#* clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o) $(RM) $(DLLS:%=%.so) $(EXES:%=%.so) $(EXES:%.exe=%) $(SUBDIRS:%=%/__clean__): dummy cd `dirname $@` && $(MAKE) clean $(EXTRASUBDIRS:%=%/__clean__): dummy -cd `dirname $@` && $(RM) $(CLEAN_FILES) ### Target specific build rules DEFLIB = $(LIBRARY_PATH) $(LIBRARIES) $(DLL_PATH) $(dmsw_exe_MODULE).so: $(dmsw_exe_OBJS) $(CC) $(dmsw_exe_LDFLAGS) -o $@ $(dmsw_exe_OBJS) $(dmsw_exe_LIBRARY_PATH) $(DEFLIB) $(dmsw_exe_DLLS:%=-l%) $(dmsw_exe_LIBRARIES:%=-l%)

2 2

Re: [PATCH] generate stand alone AC_CONFIG_FILES() lines.
by Saulius Krasuckas 01 Mar '07

01 Mar '07

* On Tue, 27 Feb 2007, Marcus Meissner wrote: > Another try to generate stand alone AC_CONFIG_FILES lines > to make git merges easier. Thank you Marcus (and others) very much for that :)

1 0

Re: [9/12] WineD3D: When multithreading, call glFinish after drawing
by H. Verbeet 01 Mar '07

01 Mar '07

Would GL_NV_fence be usefull here?

2 1

Re: ntdll: implement NtAllocateLocallyUniqueId with server call (resend)
by Alexandre Julliard 01 Mar '07

01 Mar '07

Juan Lang <juan_lang(a)yahoo.com> writes: > Any feedback on this one? > > ChangeLog: implement NtAllocateLocallyUniqueId with server call In general it's better to define server-specific types based on simple C types instead of using Windows data types in server requests. This gives us more control about the data layout, and avoids confusion with things like long/LONG etc. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [6/6] d3d9: Add a mova rounding test
by Alexandre Julliard 01 Mar '07

01 Mar '07

"H. Verbeet" <hverbeet(a)gmail.com> writes: > It should be noted that native d3d rounds to nearest even while Wine > doesn't. Applications are not supposed to depend on that though. > > Changelog: > - Add a mova rounding test The test fails here: ../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok visual.c:405: Test failed: Expected color 00ffff00, got 00000000 (for input -2.400000) visual.c:405: Test failed: Expected color 00ffff00, got 00000000 (for input -1.600000) visual.c:405: Test failed: Expected color 0000ffff, got 00000000 (for input -0.400000) visual.c:405: Test failed: Expected color 0000ffff, got 00000000 (for input 0.400000) visual.c:405: Test failed: Expected color 00ff00ff, got 00000000 (for input 1.600000) visual.c:405: Test failed: Expected color 00ff00ff, got 00000000 (for input 2.400000) make: *** [visual.ok] Error 6 -- Alexandre Julliard julliard(a)winehq.org

3 4

Wine's Wiki Defaced
by Francois Gouget 01 Mar '07

01 Mar '07

Someone has defaced Wine's Wiki frontpage. Also I have either forgotten my password or the user accounts don't work anymore. Could someone look into this? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ War doesn't determine who's right. War determines who's left.

2 2

DIB Engine & GSoC
by Benoit Pradelle 01 Mar '07

01 Mar '07

Hi, I would like participate to the Google Summer Of Code with Wine by implementing a DIB Engine. I've searched a lot of informations about the DIB Engine but i still got one question : for you, how important is a DIB Engine in Wine ? Ben.

1 0

Re: user32: add more tests for GetUpdateRect()
by Dmitry Timoshkov 01 Mar '07

01 Mar '07

"Clinton Stimpson" <cjstimpson(a)utwire.net> wrote: > Here's another test to add to test_GetUpdateRect(). > This case doesn't uses CS_PARENTDC as suggested in bug #7360. > +static LRESULT WINAPI test_GetUpdateRect_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + return DefWindowProc(hwnd, msg, wparam, lparam); > +} You can just specify 'cls.lpfnWndProc = DefWindowProcA;' to avoid useless test_GetUpdateRect_window_procA body. > + cls.style = 0; > + cls.lpfnWndProc = test_GetUpdateRect_window_procA; > + cls.cbClsExtra = 0; > + cls.cbWndExtra = 0; > + cls.hInstance = GetModuleHandleA(0); > + cls.hIcon = 0; > + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); > + cls.hbrBackground = GetStockObject(WHITE_BRUSH); > + cls.lpszMenuName = NULL; > + cls.lpszClassName = "CSParentDCWindowClass"; Strange class name since it doesn't use CS_PARENTDC style at all. -- Dmitry.

1 0

Re: [2/6] winex11.drv: Try to get an opengl visual with aux buffers
by Vitaliy Margolen 01 Mar '07

01 Mar '07

> I don't know if that patch wasn't applied because other patches of my patchset > weren't applied, or because something is wrong with this patch. If something > is wrong with this patch please tell me > @@ -3083,33 +3083,44 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) > XVisualInfo *X11DRV_setup_opengl_visual( Display *display ) > { > XVisualInfo *visual = NULL; > - /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, */ > - int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None}; > + /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, > + * WineD3D and Some applications can make use of aux buffers > + */ > + int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_AUX_BUFFERS, 1, GLX_DOUBLEBUFFER, None}; [skip] > + int dblBuf2[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None}; [skip] > + int dblBuf3[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_STENCIL_SIZE, 8, GLX_DOUBLEBUFFER, None}; [skip] > + int dblBuf4[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, None}; 3 levels was bad enough. Can we put this in an array and iterate through it instead of adding more levels? Specific comments can go there as well. Vitaliy.

1 0

Re: ntdll: Some code cleanup
by Vitaliy Margolen 01 Mar '07

01 Mar '07

Felix Nawothnig wrote: > - if (last) > - { > - LdrShutdownProcess(); > - exit( exit_code ); > - } > - else > - { > - LdrShutdownThread(); > - server_exit_thread( exit_code ); > - } > + NtTerminateThread( GetCurrentThread(), func( arg ) ); > + exit(0); /* To avoid a compiler warning, never reached. */ server_exit_thread() and NtTerminateThread() (which calls server_abort_thread()) are not the same things! Former gracefully exits the current thread freeing it's memory. Later rips it out from the process without freeing any resources. Needless to say you can't do that. Vitaliy.

1 0

Re: kernel32: Remove server-call from ExitThread()
by Dmitry Timoshkov 01 Mar '07

01 Mar '07

"Felix Nawothnig" <flexo(a)holycrap.org> wrote: > - if (last) > - { > - LdrShutdownProcess(); > - exit( code ); > - } > - else RtlExitUserThread( code ); > + TerminateThread( GetCurrentThread(), code ); > + exit(code); /* To avoid a compiler warning, never reached. */ > } New code now calls exit() unconditionally killing the whole process. If you follow the TerminateThread way you will notice that exit() is being already called on its time. -- Dmitry.

1 0

Re: [2/6] winex11.drv: Try to get an opengl visual with aux buffers
by Ivan Gyurdiev 01 Mar '07

01 Mar '07

Something's wrong with this patch: it has more 2 nested if statements. I suggest early returns on negated condition, gotos, and subroutines to fix the problem :) > I don't know if that patch wasn't applied because other patches of my patchset > weren't applied, or because something is wrong with this patch. If something > is wrong with this patch please tell me > > ------------------------------------------------------------------------ > > From 029e9756abed6c2647950f86e9227ba47d366ebe Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Tue, 27 Feb 2007 15:53:43 +0100 > Subject: [PATCH] winex11.drv: Try to get an opengl visual with aux buffers > > Applications may profit from auxilliary buffers. Because we have to find > the visual at initialization time try to find a visual with aux buffers > first, if none is found fall back to the usual default visual without > aux buffers > --- > dlls/winex11.drv/opengl.c | 35 +++++++++++++++++++++++------------ > 1 files changed, 23 insertions(+), 12 deletions(-) > > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index fdb92ae..9c1060a 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -3083,33 +3083,44 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) > XVisualInfo *X11DRV_setup_opengl_visual( Display *display ) > { > XVisualInfo *visual = NULL; > - /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, */ > - int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None}; > + /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, > + * WineD3D and Some applications can make use of aux buffers > + */ > + int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_AUX_BUFFERS, 1, GLX_DOUBLEBUFFER, None}; > if (!has_opengl()) return NULL; > > wine_tsx11_lock(); > visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf); > wine_tsx11_unlock(); > if (visual == NULL) { > - /* fallback to 16 bits depth, no alpha */ > - int dblBuf2[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_STENCIL_SIZE, 8, GLX_DOUBLEBUFFER, None}; > - WARN("Failed to get a visual with at least 24 bits depth\n"); > + /* Try without aux buffers */ > + int dblBuf2[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None}; > + WARN("Failed to get a visual with at least one aux buffer\n"); > > wine_tsx11_lock(); > visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf2); > wine_tsx11_unlock(); > if (visual == NULL) { > - /* fallback to no stencil */ > - int dblBuf2[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, None}; > - WARN("Failed to get a visual with at least 8 bits of stencil\n"); > + /* fallback to 16 bits depth, no alpha */ > + int dblBuf3[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_STENCIL_SIZE, 8, GLX_DOUBLEBUFFER, None}; > + WARN("Failed to get a visual with at least 24 bits depth\n"); > > wine_tsx11_lock(); > - visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf2); > + visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf3); > wine_tsx11_unlock(); > if (visual == NULL) { > - /* This should only happen if we cannot find a match with a depth size 16 */ > - FIXME("Failed to find a suitable visual\n"); > - return visual; > + /* fallback to no stencil */ > + int dblBuf4[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, None}; > + WARN("Failed to get a visual with at least 8 bits of stencil\n"); > + > + wine_tsx11_lock(); > + visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf4); > + wine_tsx11_unlock(); > + if (visual == NULL) { > + /* This should only happen if we cannot find a match with a depth size 16 */ > + FIXME("Failed to find a suitable visual\n"); > + return visual; > + } > } > } > } > > ------------------------------------------------------------------------ > > >

1 0

One school's list of must-have apps
by Dan Kegel 28 Feb '07

28 Feb '07

Here's a school that actually did transition to Linux: http://searchopensource.techtarget.com/originalContent/0,289142,sid39_gci12… They didn't use Wine. Here's what they said about legacy windows apps: "Using Wyse terminals, the district also planned to offer students and staff thin-client desktops running OpenOffice.org. Ericom software – a Citrix alternative -- enabled the terminals to run the district's existing and irreplaceable Microsoft Windows educational applications, including Type to Learn, Reading Counts and Kid Pix." - Dan

1 0

Using ex-user32 controls from native comctl32 6
by Felix Nawothnig 28 Feb '07

28 Feb '07

(CC-ing to Frank Richter because I hope he knows the answer :) Hi. I've been trying to make wine use the ex-user32 controls (listbox, scrollbox, etc.) in comctl32 where Microsoft copied them to in version 6 to get message traces of those controls (I know I could use msg spy tools on Windows but comparing two Wine spy logs is way more straight forward, especially since those tools don't get you stuff like +win). You need a manifest file on Windows to get application to use comctl6 but we don't use that since we've chosen to theme the user controls via subclassing. I've tried to just remove registration of the classes from our user32 and use native comctl32 6 (which otherwise works nice) but no success. So, any idea how Windows makes comctl32 register the user classes? Felix

2 2

msiexec.exe service registration
by Jeremy 28 Feb '07

28 Feb '07

In msiexec.c, the DoRegServer calls OpenSCManager, however, on a fresh installation, ie no ~/.wine, the HKLM\CurrentControlSet\Services does not yet exist, so that OpenSCManager fails. What is the correct way to guarantee that this key exists? Regards, Jeremy

2 1

msi automation patches
by Misha Koshelev 28 Feb '07

28 Feb '07

Ok, so since my patches weren't commited to git yet, I've consolidated the new automation changes I've made in the attached patches. James and Rob, if they look good to you I will submit these version to wine-patches (so my total will once again be four patches, 1 is http://www.winehq.org/pipermail/wine-patches/2007-February/036359.html , 2 and 3 attached, and 4 is http://www.winehq.org/pipermail/wine-patches/2007-February/036362.html ) and wait to submit anything more for automation until all 4 patches are in. Please let me know Rob (I used DispGetParam, thanks a lot, so probably just need to look at my AutomationObject::Invoke and then the individual object Invoke handlers in the 0003 patch below) and James (I guess in regards to comments and formatting). Thanks a lot Misha

1 0

Re: [8/8] WineD3D: Use the source surface's texture for writing the backup
by H. Verbeet 28 Feb '07

28 Feb '07

On 28/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: >The hwstretch blit code creates a new texture each time it is called to back up the back buffer and >releases it afterwards. It is more efficient to keep the texture and release it with the surface. This >patch uses the source surface's texture to do the job. Because the source surface is an active render >target its texture is either only needed for blitting(onscreen target) or will be completely overwritten >on the next render target change(offscreen target). Is this supposed to work with FBOs?

1 0

Re: [4/8] WineD3D: Prepare only fixed function samplers for blit
by H. Verbeet 28 Feb '07

28 Feb '07

On 28/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: >+ /* The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed >+ * function texture unit. No need to care for higher samplers >+ */ >+ for(i = GL_LIMITS(texture_stages) - 1; i > 0 ; i--) { You should use GL_LIMITS(textures) here, since that's the number of fixed function texture units.

1 0

Re: [8/12] WineD3D: Create multithreading contexts for swapchains
by Mirek 28 Feb '07

28 Feb '07

Stefan Dösinger napsal(a): > This patch finishes the opengl side of multithreaded direct3d, which was > started with the state management rewrite(well, almost, no offscreen rendering > yet) It does not make Direct3D thread safe, because there is no protection > against race conditions. > > This patch improves multithreaded games a bit. They do not crash any more in a > gl call, but running them is kinda like a lottery, especially on smp systems. > > Vitaly and Andras have reported success with Prince of Persia 3D: Sands of > Time and some other games, and on my laptop Empire Earth is running. Empire > Earth deadlocks regularly on my dual core system at ddraw creation. I can even run Tom Clancy's Rainbow Six Vegas, but there are still problems with offscreen rendering. Mirek > > > ------------------------------------------------------------------------ > > From 49cc9a0aa6e06f559540758d5b0ed2252208a0ad Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Sun, 25 Feb 2007 00:18:25 +0100 > Subject: [PATCH] WineD3D: Create multithreading contexts for swapchains > > This patch adds a routine to clone the main context of a swapchain to use it with a different thread on the > same drawable. This will enable multithreaded direct3d rendering, or better enable an attempt to do that. > From the opengl point of view it will work, but because concurrency control is not implemented yet(appart > of ENTER_GL() / LEAVE_GL() ) games may crash randomly, show strange behavior, ... > > The other problem is that this code was only tested with the open source radeon driver yet. While what > wined3d is doing here should be allowed by the spec, some drivers may have some bugs when using multiple > contexts on one drawable. > --- > dlls/wined3d/context.c | 4 ++-- > dlls/wined3d/swapchain.c | 30 ++++++++++++++++++++++++++++++ > dlls/wined3d/wined3d_private.h | 2 ++ > 3 files changed, 34 insertions(+), 2 deletions(-) > > diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c > index 3a815b3..8545568 100644 > --- a/dlls/wined3d/context.c > +++ b/dlls/wined3d/context.c > @@ -626,8 +626,8 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU > } > > if(!context) { > - /* TODO: Create a new context for the thread */ > - FIXME("Context creation for a new thread not implemented yet\n"); > + /* Create a new context for the thread */ > + context = IWineD3DSwapChainImpl_CreateContextForThread(swapchain); > } > } else { > context = ((IWineD3DSwapChainImpl *) swapchain)->context[0]; > diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c > index 2977a05..3b8e3e8 100644 > --- a/dlls/wined3d/swapchain.c > +++ b/dlls/wined3d/swapchain.c > @@ -510,3 +510,33 @@ const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = > IWineD3DSwapChainImpl_SetGammaRamp, > IWineD3DSwapChainImpl_GetGammaRamp > }; > + > +WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain *iface) { > + WineD3DContext *ctx; > + IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *) iface; > + WineD3DContext **newArray; > + > + TRACE("Creating a new context for swapchain %p, thread %d\n", This, GetCurrentThreadId()); > + > + ctx = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, > + This->context[0]->display, This->win); > + if(!ctx) { > + ERR("Failed to create a new context for the swapchain\n"); > + return NULL; > + } > + > + newArray = HeapAlloc(GetProcessHeap(), 0, sizeof(*newArray) * This->num_contexts + 1); > + if(!newArray) { > + ERR("Out of memory when trying to allocate a new context array\n"); > + DestroyContext(This->wineD3DDevice, ctx); > + return NULL; > + } > + memcpy(newArray, This->context, sizeof(*newArray) * This->num_contexts); > + HeapFree(GetProcessHeap(), 0, This->context); > + newArray[This->num_contexts] = ctx; > + This->context = newArray; > + This->num_contexts++; > + > + TRACE("Returning context %p\n", ctx); > + return ctx; > +} > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 45e69bf..fa4232c 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -1341,6 +1341,8 @@ typedef struct IWineD3DSwapChainImpl > > extern const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl; > > +WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain *iface); > + > /***************************************************************************** > * Utility function prototypes > */ > > > ------------------------------------------------------------------------ > >

2 1

Re: [7/7] cmd.exe: Support rd dir1 dir2 dir3 etc
by Alexandre Julliard 28 Feb '07

28 Feb '07

"Ann & Jason Edmeades" <us(a)edmeades.me.uk> writes: > diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h > index d6357f0..a7a73ae 100644 > --- a/programs/cmd/wcmd.h > +++ b/programs/cmd/wcmd.h > @@ -27,6 +27,9 @@ > #include <stdio.h> > #include <ctype.h> > > +#include "wine/debug.h" > +WINE_DEFAULT_DEBUG_CHANNEL(cmd); Adding tracing is OK, but this should go in the C files that need it, not in a header. -- Alexandre Julliard julliard(a)winehq.org

1 0

wine and msys rxvt.exe
by Wesley Parish 28 Feb '07

28 Feb '07

I installed msys a couple of years back, and decided to test rxvt.exe: bash-3.1$ wine .wine/drive_c/msys/1.0/bin/rxvt.exe libGL warning: 3D driver claims to not support visual 0x4b fixme:netapi32:NetWkstaUserGetInfo Level 1 processing is partially implemented fixme:advapi:LsaOpenPolicy ((null),0x68f478,0x00000001,0x68f494) stub fixme:advapi:LsaClose (0xcafe) stub fixme:advapi:LsaOpenPolicy ((null),0x68f488,0x000f0fff,0x68f484) stub fixme:netbios:NetServerEnum Stub ((null) 101 0x68ef04 -1 0x68ef08 0x68ef0c 8 L"DOMAIN" (nil)) fixme:advapi:LsaClose (0xcafe) stub fixme:netapi32:NetUserGetInfo Level 3 is not implemented fixme:netapi32:NetUserGetInfo Level 3 is not implemented failed to load libX11.dllbash-3.1$ bash-3.1$ wine --version wine-0.9.29 Those are the error messages. My version of wine is a little old. Have the fixme's been fixed in the latest wine? thanks Wesley Parish -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

7 8

Re: msi: Add proper parameter handling to OLE automation interfaces.
by Robert Shearman 28 Feb '07

28 Feb '07

Misha Koshelev wrote: > +/* Macros for variant conversions */ > +#define V_DECLARE \ > + VARIANTARG vararg[pDispParams->cArgs]; \ > + int iVarCount; \ > + HRESULT hr = S_OK; \ > + memset(vararg, 0, sizeof(vararg)); > +#define V_PREPARE(n, type) \ > + VariantInit(&vararg[n]); \ > + hr = VariantChangeTypeEx(&vararg[n], &pDispParams->rgvarg[n], lcid, 0, VT_##type); \ > + if (FAILED(hr)) \ > + { \ > + *puArgErr = n; \ > + goto v_finish; \ > + } > +#define V_PREPAREOPT(n, type) \ > + VariantInit(&vararg[n]); \ > + if (FAILED(VariantChangeTypeEx(&vararg[n], &pDispParams->rgvarg[n], lcid, 0, VT_##type))) \ > + VariantClear(&vararg[n]); > +#define V_PREPARED(n) (V_VT(&vararg[n]) != VT_EMPTY) > +#define V(n, type) V_##type(&vararg[n]) > +#define V_RETURN(value, type) \ > + V_VT(pVarResult) = VT_##type; \ > + V_##type(pVarResult) = value; > +#define V_FAIL hr = E_FAIL; > +#define V_DEFAULT \ > + default: \ > + hr = DISP_E_MEMBERNOTFOUND; > +#define V_FINISH \ > + goto v_finish; /* suppress warnings about unused label v_free */ \ > +v_finish: \ > + for (iVarCount = 0; iVarCount < pDispParams->cArgs; iVarCount++) \ > + if (V_PREPARED(iVarCount)) \ > + VariantClear(&vararg[iVarCount]); \ > + return hr; > This is quite ugly. You can at replace at least some of this with calls to DispGetParam. A lot of the methods only have one parameter so will end up simpler without using these macros. -- Rob Shearman

1 0

Re: msi: automation: clean up comments.
by James Hawkins 28 Feb '07

28 Feb '07

On 2/27/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > Looking back at James comments, maybe I did have a little too much > commenting there :) > You're sending patches that change code that hasn't been committed yet. Instead, you need to go back and change the original patch and resend. -- James Hawkins

1 0

Re: msi: Expand OLE automation interface parameter handling.
by James Hawkins 28 Feb '07

28 Feb '07

On 2/27/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > This applies on top of my other OLE automation patches. Added new > checks: > Why don't you wait until the other patches are committed before sending these new patches? It makes it hard to review, because I don't have your other patches applied. > - Parameter we are looking for is not passed? > - Only set puArgErr if it is passed > - Make sure pVarResult is valid before we write to it > - Don't return S_FAIL. MSDN doesn't mention it in the Invoke help, so we > won't use it. > You need to add tests for these items. -- James Hawkins

1 0

Success story with Flash on Wine
by Dan Kegel 28 Feb '07

28 Feb '07

http://blog.brokenfunction.com/2007/02/27/debugging-flash-on-linux/ says "... How strange, the wine-powered standalone player is the most stable Flash player I've used yet. On Windows it would occasionally be unable to connect to the debugger until I restarted Eclipse, usually related to having to many players open at the same time. On Linux it will crash unexpectedly. Now I can have a dozen debuggers open at the same time with no crashes yet." Cool!

1 0

Re: Make sure keyboard state is up to date before processing GetAsyncKeyState.
by Detlef Riekenberg 28 Feb '07

28 Feb '07

On Di, 2007-02-27 at 20:28 +0900, Aric Stewart wrote: > --- a/dlls/winex11.drv/keyboard.c > +++ b/dlls/winex11.drv/keyboard.c > @@ -94,6 +94,9 @@ static int kcControl, kcAlt, kcShift, kc > > static char KEYBOARD_MapDeadKeysym(KeySym keysym); > > +extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, > + const HANDLE *handles, DWORD timeout, DWORD mask, > DWORD flags); I have no Idea about the code, but... IMHO, that declaration fit perfect into x11drv.h -- By by ... Detlef

2 1

Re: xcopy try 3
by Alexandre Julliard 27 Feb '07

27 Feb '07

"Ann & Jason Edmeades" <us(a)edmeades.me.uk> writes: > diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in > new file mode 100755 All the files you create or modify are marked executable, could you please fix that? -- Alexandre Julliard julliard(a)winehq.org

3 2

Commit 37591409b28c2000e70bd0d3c654a3a7559a4a26 breaks accentuation
by Pedro Araujo Chaves Jr. 27 Feb '07

27 Feb '07

Hi all, After some regression testing, I found out that commit 37591409b28c2000e70bd0d3c654a3a7559a4a26 by Dmitry Timoshkov breaks accentuation - at least for Brazilian Portuguese in Lotus Notes R5. I did some testing and found out that only TrueType fonts are affected - that is, the fonts Notes lists as 'default foo' without the double-T icon are all accented properly. To make matters worse, the affected fonts don't behave the same way. For example, the string áéíóú ÁÉÍÓÚ àèìòù ÀÈÌÒÙ ãõ ÃÕ âêîôû ÂÊÎÔÛ äëïöü ÄËÏÖÜ renders as įéķóś ĮÉĶÓŚ ąčģņł ĄČĢŅŁ ćõ ĆÕ āźīōū ĀŹĪŌŪ äėļöü ÄĖĻÖÜ with Trebuchet MS. You can see they're pretty different - well, most of you, at least. However, that's only a display-and-print issue, as I can copy the text and paste it elsewhere, and the accents are in their right places (and in the right letters, for that matter) - as one would expect. Regarding Microsoft fonts, by the way, Calibri, Candara, Consolas, Constantia, Corbel, Segoe Print, and Segoe Script (couldn't test Cambria) all behave exactly like Trebuchet MS, whereas Segoe UI behaves just like Times New Roman, which shows problems only with graves and tildes. However the behavior is kinda random among the many other fonts (from many unrelated sources, of course) I tested, so I (still) didn't do an exhaustive check for a pattern. Would anybody have any word on this? Cheers, Pedro.

2 2

Re: wininet: Constify a formal parameter of CommitURLCache{A|W}() (Resend)
by James Hawkins 27 Feb '07

27 Feb '07

On 2/26/07, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > What is wrong with this patch, please? > This isn't how it's defined in the SDK headers. -- James Hawkins

2 5

Re: dplay: directplay should initialize session Guid patch + conformance tests
by Detlef Riekenberg 27 Feb '07

27 Feb '07

On Di, 2007-02-27 at 13:15 +0100, Alessandro Pignotti wrote: > +dlls/dplayx/tests/Makefile That is will not work since today, as the format changed. The correct entry is created by "tools/make_makefiles" I updated the wiki, that autogenerated code should not be included in a Patch -- By by ... Detlef

1 0

Re: [3/12 WineD3D/DDraw: Forward DDSCL_MULTITHREADED to WineD3D
by H. Verbeet 27 Feb '07

27 Feb '07

On 26/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Note: that this patch conflicts with the ddraw thread safety patch. After this > patch here is applied, I will send an updated thread safety patch for the > ddraw implementation > What exactly is this supposed to fix? We already pass the behaviour flags through to IWineD3DImpl_CreateDevice(), so shouldn't wined3d just handle it there?

2 1

Re: dplay: directplay should initialize session Guid patch +conformance tests
by Dmitry Timoshkov 27 Feb '07

27 Feb '07

"Alessandro Pignotti" <alex.pigna(a)inventati.org> wrote: > +BOOL FAR PASCAL EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnection, > + DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, > + LPVOID lpContext) > +{ This doesn't look like a proper type of callb ack for IDirectPlayX_EnumConnections. > + bzero(&sessionDesc,sizeof(DPSESSIONDESC2)); > + bzero(&zeroGuid,16); Use memset instead of non-portable bzero. > + LPDIRECTPLAY4 pDP = NULL; This initialization is redundant. If you also could use 4 spaces indents instead of tabs, and add an empty line after data declarations that would be nice as well. And a personal opinion: all that lines without a single space delimiting variables, functions, equal signs are absolutely not readable. -- Dmitry.

2 1

Re: ntdll: resend 1/4 NtCreateMailslotFile tests
by Alexandre Julliard 27 Feb '07

27 Feb '07

Jeff Latimer <lats(a)yless4u.com.au> writes: > diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in > index cccc4c5..4ceccfd 100644 > --- a/dlls/ntdll/tests/Makefile.in > +++ b/dlls/ntdll/tests/Makefile.in > @@ -14,6 +14,7 @@ CTESTS = \ > generated.c \ > info.c \ > large_int.c \ > + mailslot.c \ Naming it file.c would be better, since that's the name of the corresponding source file, and that makes it more general so it can later contain other tests too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [4/6] cmd.exe : Prompt during rd /s command
by Alexandre Julliard 27 Feb '07

27 Feb '07

"Ann & Jason Edmeades" <us(a)edmeades.me.uk> writes: > + /* Load the translated 'Are you sure' message */ > + LoadString (hinst, WCMD_YESORN, buffer, sizeof(buffer)); > + > + /* Loop waiting on a Y or N */ > + while (answer[0] != 'Y' && answer[0] != 'N') { Making the message translatable is good, but the Y/N answers need to be translatable too... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/12] - [12/12] WineD3D (multithreading)
by Mirek 27 Feb '07

27 Feb '07

Hi, this series of patches broke some textures in TES IV: Oblivion, should I create bug in winebugs? I tried some other apps, they looks ok. (bug is here after patch 7/12 and 8/12). Mirek

2 6

Re: dplay: directplay should initialize session Guid patch + conformance tests
by Kai Blin 27 Feb '07

27 Feb '07

On Saturday 24 February 2007 22:10, Alessandro Pignotti wrote: > Thanks for the suggestions, this version of the patch uses IsEqualGUID and > eliminates C++ style comments and insert a proper copyright notice in the > added file You might want to use #include "wine/test.h" instead of #include <wine/test.h>, all the other tests do that. Also, you should split out the test from the START_TEST(dplayx) function into a function called e.g. test_session_guid and do all the testing there. Also, please use IsEqualGUID() in EnumConnectionsCallback, too. Sorry for not replying earlier, but last week was kind of a mess, and I'm slowly catching up. Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

GDI surfaces, GDI heap and wined3d's VideoMemorySize
by Rok Mandeljc 27 Feb '07

27 Feb '07

Hey all, I've been experiencing an odd behavior in Baldur's Gate 2; when "VideoMemorySize" registry key for wined3d is set to anything greater than 64MB (69MB, actually), it stops before playing intro movie, printing following line: err:clipping:CLIPPING_UpdateGCRegion hVisRgn is zero. Please report this. Tracing the source of issue by inserting custom traces I got the following: IDirectDrawImpl_CreateNewSurface -> IWineD3DDeviceImpl_CreateSurface (decides to use GDI surface) -> IWineGDISurfaceImpl_PrivateSetup -> IWineD3DSurfaceImpl_GetDC -> CreateCompatibleDC -> CreateRectRgn -> REGION_CreateRegion -> GDI_AllocObject -> alloc_large_heap alloc_large_heap fails because it can't find next large handle and returns NULL, which is passed up the chain, where CreateCompatibleDC puts it in dc->hVisRgn. Then DC_InitDC is called with that dc, which calls CLIPPING_UpdateGCRegion, and that one finally chokes on it, printing afore-mentioned line and calling exit(1). Now, when the game is run with 64MB of VideoMemorySize, upon reaching the same point, IDirectDrawImpl_CreateNewSurface returns WINED3DERR_OUTOFVIDEOMEMORY (because of "IWineD3DDevice_GetAvailableTextureMem(iface) <= _size" check in D3DCREATERESOURCEOBJECTINSTANCE macro) and intro movie starts playing. So it seems Baldur's Gate 2 is trying to create as many surfaces as possible before running out of memory. And the problem arises when specified memory size is large enough to take up all GDI's heap... Sorry for the long-winded description of the problem, but I'm not sure where and how this should be fixed (is it wined3d issue or should GDI have its heap enlarged?), otherwise I'd do it myself... Regards, Rok -=-=-=-=-=- Never say "Never" unless it is to say "Never Give Up." -=-=-=-=-=--=-=-=-=-=- * Generated by TagZilla 0.066 * http://tagzilla.mozdev.org *

7 6

Re: [PATCH] seperate AC_CONFIG_FILES.
by Detlef Riekenberg 27 Feb '07

27 Feb '07

On Mo, 2007-02-26 at 22:06 +0100, Marcus Meissner wrote: > -AC_CONFIG_FILES([ > -Make.rules > -dlls/Makedll.rules > -dlls/Makeimplib.rules > -dlls/Maketest.rules > -programs/Makeprog.rules > -Makefile > -dlls/Makefile Does "tools/make_makefiles" still work after your Patch? - for a new dll - for a new test - for a new program I'm unable to test that here (my autoconf is to old) -- By by ... Detlef

2 1

configure: Break single-line ac_config_files list into multiple lines.
by Saulius Krasuckas 27 Feb '07

27 Feb '07

This long line breaks automated rebasing of one of testing branches on (namely ntoskrnl) on my box every time a new dll or program is added. That's because I need to merge conflict for this line by my hand. And I am not sure what stops us from keeping "ac_config_files" list multiline, so merging in future could be automatical. --- configure | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 325 insertions(+), 1 deletions(-) diff --git a/configure b/configure index fb9c11f..67f1942 100755 --- a/configure +++ b/configure @@ -20427,7 +20427,331 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/browseui/Makefile dlls/browseui/tests/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/credui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/ddrawex/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/itss/tests/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/odbccp32/tests/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/serialui/tests/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/sfc_os/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/snmpapi/tests/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winealsa.drv/Makefile dlls/winearts.drv/Makefile dlls/wineaudioio.drv/Makefile dlls/winecoreaudio.drv/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineesd.drv/Makefile dlls/winejack.drv/Makefile dlls/winejoystick.drv/Makefile dlls/winemp3.acm/Makefile dlls/winenas.drv/Makefile dlls/wineoss.drv/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wing32/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/tests/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" +ac_config_files="$ac_config_files \ + Make.rules \ + dlls/Makedll.rules \ + dlls/Makeimplib.rules \ + dlls/Maketest.rules \ + programs/Makeprog.rules \ + Makefile \ + dlls/Makefile \ + dlls/activeds/Makefile \ + dlls/advapi32/Makefile \ + dlls/advapi32/tests/Makefile \ + dlls/advpack/Makefile \ + dlls/advpack/tests/Makefile \ + dlls/amstream/Makefile \ + dlls/atl/Makefile \ + dlls/avicap32/Makefile \ + dlls/avifil32/Makefile \ + dlls/browseui/Makefile \ + dlls/browseui/tests/Makefile \ + dlls/cabinet/Makefile \ + dlls/cabinet/tests/Makefile \ + dlls/capi2032/Makefile \ + dlls/cards/Makefile \ + dlls/cfgmgr32/Makefile \ + dlls/clusapi/Makefile \ + dlls/comcat/Makefile \ + dlls/comcat/tests/Makefile \ + dlls/comctl32/Makefile \ + dlls/comctl32/tests/Makefile \ + dlls/comdlg32/Makefile \ + dlls/comdlg32/tests/Makefile \ + dlls/compstui/Makefile \ + dlls/credui/Makefile \ + dlls/crtdll/Makefile \ + dlls/crypt32/Makefile \ + dlls/crypt32/tests/Makefile \ + dlls/cryptdll/Makefile \ + dlls/cryptnet/Makefile \ + dlls/ctl3d32/Makefile \ + dlls/d3d8/Makefile \ + dlls/d3d8/tests/Makefile \ + dlls/d3d9/Makefile \ + dlls/d3d9/tests/Makefile \ + dlls/d3dim/Makefile \ + dlls/d3drm/Makefile \ + dlls/d3dx8/Makefile \ + dlls/d3dxof/Makefile \ + dlls/dbghelp/Makefile \ + dlls/dciman32/Makefile \ + dlls/ddraw/Makefile \ + dlls/ddraw/tests/Makefile \ + dlls/ddrawex/Makefile \ + dlls/devenum/Makefile \ + dlls/dinput/Makefile \ + dlls/dinput/tests/Makefile \ + dlls/dinput8/Makefile \ + dlls/dmband/Makefile \ + dlls/dmcompos/Makefile \ + dlls/dmime/Makefile \ + dlls/dmloader/Makefile \ + dlls/dmscript/Makefile \ + dlls/dmstyle/Makefile \ + dlls/dmsynth/Makefile \ + dlls/dmusic/Makefile \ + dlls/dmusic32/Makefile \ + dlls/dnsapi/Makefile \ + dlls/dnsapi/tests/Makefile \ + dlls/dplay/Makefile \ + dlls/dplayx/Makefile \ + dlls/dpnet/Makefile \ + dlls/dpnhpast/Makefile \ + dlls/dsound/Makefile \ + dlls/dsound/tests/Makefile \ + dlls/dswave/Makefile \ + dlls/dxdiagn/Makefile \ + dlls/dxerr8/Makefile \ + dlls/dxerr9/Makefile \ + dlls/dxguid/Makefile \ + dlls/gdi32/Makefile \ + dlls/gdi32/tests/Makefile \ + dlls/glu32/Makefile \ + dlls/gphoto2.ds/Makefile \ + dlls/hhctrl.ocx/Makefile \ + dlls/hid/Makefile \ + dlls/hlink/Makefile \ + dlls/hlink/tests/Makefile \ + dlls/iccvid/Makefile \ + dlls/icmp/Makefile \ + dlls/ifsmgr.vxd/Makefile \ + dlls/imaadp32.acm/Makefile \ + dlls/imagehlp/Makefile \ + dlls/imm32/Makefile \ + dlls/infosoft/Makefile \ + dlls/infosoft/tests/Makefile \ + dlls/inseng/Makefile \ + dlls/iphlpapi/Makefile \ + dlls/iphlpapi/tests/Makefile \ + dlls/itss/Makefile \ + dlls/itss/tests/Makefile \ + dlls/kernel32/Makefile \ + dlls/kernel32/tests/Makefile \ + dlls/localspl/Makefile \ + dlls/localspl/tests/Makefile \ + dlls/lz32/Makefile \ + dlls/lz32/tests/Makefile \ + dlls/mapi32/Makefile \ + dlls/mapi32/tests/Makefile \ + dlls/mciavi32/Makefile \ + dlls/mcicda/Makefile \ + dlls/mciseq/Makefile \ + dlls/mciwave/Makefile \ + dlls/midimap/Makefile \ + dlls/mlang/Makefile \ + dlls/mlang/tests/Makefile \ + dlls/mmdevldr.vxd/Makefile \ + dlls/monodebg.vxd/Makefile \ + dlls/mpr/Makefile \ + dlls/mprapi/Makefile \ + dlls/msacm32.drv/Makefile \ + dlls/msacm32/Makefile \ + dlls/msacm32/tests/Makefile \ + dlls/msadp32.acm/Makefile \ + dlls/mscms/Makefile \ + dlls/mscms/tests/Makefile \ + dlls/mscoree/Makefile \ + dlls/msdmo/Makefile \ + dlls/msftedit/Makefile \ + dlls/msg711.acm/Makefile \ + dlls/mshtml/Makefile \ + dlls/mshtml/tests/Makefile \ + dlls/msi/Makefile \ + dlls/msi/tests/Makefile \ + dlls/msimg32/Makefile \ + dlls/msisys.ocx/Makefile \ + dlls/msnet32/Makefile \ + dlls/msrle32/Makefile \ + dlls/msvcrt/Makefile \ + dlls/msvcrt/tests/Makefile \ + dlls/msvcrt20/Makefile \ + dlls/msvcrt40/Makefile \ + dlls/msvcrtd/Makefile \ + dlls/msvcrtd/tests/Makefile \ + dlls/msvfw32/Makefile \ + dlls/msvidc32/Makefile \ + dlls/mswsock/Makefile \ + dlls/msxml3/Makefile \ + dlls/msxml3/tests/Makefile \ + dlls/nddeapi/Makefile \ + dlls/netapi32/Makefile \ + dlls/netapi32/tests/Makefile \ + dlls/newdev/Makefile \ + dlls/ntdll/Makefile \ + dlls/ntdll/tests/Makefile \ + dlls/ntdsapi/Makefile \ + dlls/objsel/Makefile \ + dlls/odbc32/Makefile \ + dlls/odbccp32/Makefile \ + dlls/odbccp32/tests/Makefile \ + dlls/ole32/Makefile \ + dlls/ole32/tests/Makefile \ + dlls/oleacc/Makefile \ + dlls/oleaut32/Makefile \ + dlls/oleaut32/tests/Makefile \ + dlls/olecli32/Makefile \ + dlls/oledlg/Makefile \ + dlls/olepro32/Makefile \ + dlls/olesvr32/Makefile \ + dlls/opengl32/Makefile \ + dlls/powrprof/Makefile \ + dlls/psapi/Makefile \ + dlls/psapi/tests/Makefile \ + dlls/pstorec/Makefile \ + dlls/qcap/Makefile \ + dlls/quartz/Makefile \ + dlls/quartz/tests/Makefile \ + dlls/query/Makefile \ + dlls/rasapi32/Makefile \ + dlls/resutils/Makefile \ + dlls/riched20/Makefile \ + dlls/riched20/tests/Makefile \ + dlls/riched32/Makefile \ + dlls/rpcrt4/Makefile \ + dlls/rpcrt4/tests/Makefile \ + dlls/rsabase/Makefile \ + dlls/rsabase/tests/Makefile \ + dlls/rsaenh/Makefile \ + dlls/rsaenh/tests/Makefile \ + dlls/sane.ds/Makefile \ + dlls/secur32/Makefile \ + dlls/secur32/tests/Makefile \ + dlls/security/Makefile \ + dlls/sensapi/Makefile \ + dlls/serialui/Makefile \ + dlls/serialui/tests/Makefile \ + dlls/setupapi/Makefile \ + dlls/setupapi/tests/Makefile \ + dlls/sfc/Makefile \ + dlls/sfc_os/Makefile \ + dlls/shdoclc/Makefile \ + dlls/shdocvw/Makefile \ + dlls/shdocvw/tests/Makefile \ + dlls/shell32/Makefile \ + dlls/shell32/tests/Makefile \ + dlls/shfolder/Makefile \ + dlls/shlwapi/Makefile \ + dlls/shlwapi/tests/Makefile \ + dlls/snmpapi/Makefile \ + dlls/snmpapi/tests/Makefile \ + dlls/spoolss/Makefile \ + dlls/stdole2.tlb/Makefile \ + dlls/stdole32.tlb/Makefile \ + dlls/sti/Makefile \ + dlls/strmiids/Makefile \ + dlls/svrapi/Makefile \ + dlls/tapi32/Makefile \ + dlls/twain_32/Makefile \ + dlls/unicows/Makefile \ + dlls/url/Makefile \ + dlls/urlmon/Makefile \ + dlls/urlmon/tests/Makefile \ + dlls/user32/Makefile \ + dlls/user32/tests/Makefile \ + dlls/userenv/Makefile \ + dlls/usp10/Makefile \ + dlls/usp10/tests/Makefile \ + dlls/uuid/Makefile \ + dlls/uxtheme/Makefile \ + dlls/uxtheme/tests/Makefile \ + dlls/vdhcp.vxd/Makefile \ + dlls/vdmdbg/Makefile \ + dlls/version/Makefile \ + dlls/version/tests/Makefile \ + dlls/vmm.vxd/Makefile \ + dlls/vnbt.vxd/Makefile \ + dlls/vnetbios.vxd/Makefile \ + dlls/vtdapi.vxd/Makefile \ + dlls/vwin32.vxd/Makefile \ + dlls/w32skrnl/Makefile \ + dlls/winealsa.drv/Makefile \ + dlls/winearts.drv/Makefile \ + dlls/wineaudioio.drv/Makefile \ + dlls/winecoreaudio.drv/Makefile \ + dlls/winecrt0/Makefile \ + dlls/wined3d/Makefile \ + dlls/winedos/Makefile \ + dlls/wineesd.drv/Makefile \ + dlls/winejack.drv/Makefile \ + dlls/winejoystick.drv/Makefile \ + dlls/winemp3.acm/Makefile \ + dlls/winenas.drv/Makefile \ + dlls/wineoss.drv/Makefile \ + dlls/wineps.drv/Makefile \ + dlls/winequartz.drv/Makefile \ + dlls/winex11.drv/Makefile \ + dlls/wing32/Makefile \ + dlls/wininet/Makefile \ + dlls/wininet/tests/Makefile \ + dlls/winmm/Makefile \ + dlls/winmm/tests/Makefile \ + dlls/winnls32/Makefile \ + dlls/winspool.drv/Makefile \ + dlls/winspool.drv/tests/Makefile \ + dlls/wintab32/Makefile \ + dlls/wintrust/Makefile \ + dlls/wintrust/tests/Makefile \ + dlls/wldap32/Makefile \ + dlls/wnaspi32/Makefile \ + dlls/wow32/Makefile \ + dlls/ws2_32/Makefile \ + dlls/ws2_32/tests/Makefile \ + dlls/wsock32/Makefile \ + dlls/wtsapi32/Makefile \ + documentation/Makefile \ + fonts/Makefile \ + include/Makefile \ + libs/Makefile \ + libs/port/Makefile \ + libs/wine/Makefile \ + libs/wpp/Makefile \ + loader/Makefile \ + programs/Makefile \ + programs/clock/Makefile \ + programs/cmd/Makefile \ + programs/cmdlgtst/Makefile \ + programs/control/Makefile \ + programs/eject/Makefile \ + programs/expand/Makefile \ + programs/explorer/Makefile \ + programs/hh/Makefile \ + programs/icinfo/Makefile \ + programs/iexplore/Makefile \ + programs/msiexec/Makefile \ + programs/notepad/Makefile \ + programs/oleview/Makefile \ + programs/progman/Makefile \ + programs/regedit/Makefile \ + programs/regsvr32/Makefile \ + programs/rpcss/Makefile \ + programs/rundll32/Makefile \ + programs/start/Makefile \ + programs/taskmgr/Makefile \ + programs/uninstaller/Makefile \ + programs/view/Makefile \ + programs/wineboot/Makefile \ + programs/winebrowser/Makefile \ + programs/winecfg/Makefile \ + programs/wineconsole/Makefile \ + programs/winedbg/Makefile \ + programs/winefile/Makefile \ + programs/winemenubuilder/Makefile \ + programs/winemine/Makefile \ + programs/winepath/Makefile \ + programs/winetest/Makefile \ + programs/winevdm/Makefile \ + programs/winhelp/Makefile \ + programs/winver/Makefile \ + programs/wordpad/Makefile \ + server/Makefile \ + tools/Makefile \ + tools/widl/Makefile \ + tools/winebuild/Makefile \ + tools/winedump/Makefile \ + tools/winegcc/Makefile \ + tools/wmc/Makefile \ + tools/wrc/Makefile" cat >confcache <<\_ACEOF -- 1.4.4.2

5 5

Re: kernel32: Implement ReplaceFileA/ReplaceFileW
by Felix Nawothnig 27 Feb '07

27 Feb '07

Erich Hoover wrote: > Real Name: > Erich Hoover > Description: > Implements the functions ReplaceFileA and ReplaceFileW in kernel32 > (Bug #7544). Also provides conformance test code to ensure proper > functionality. > Changelog: > kernel32: Implement ReplaceFileA/ReplaceFileW Your patch seems to introduce lots of race cons. It's possible these exist on Win32 too but can't we avoid them?

2 4

Re: [7/12] WineD3D: Select an onscreen context based on the thread
by Stefan Dösinger 27 Feb '07

27 Feb '07

Am Montag 26 Februar 2007 13:49 schrieb Stefan Dösinger: Alexandre, do not patch 7, 8 and 9 yet, they are reported to cause regressions. Patch 10, 11 and 12 should apply without them too.

1 0

Re: Add localizable strings support for popup menu in selection tree control.
by James Hawkins 26 Feb '07

26 Feb '07

On 2/26/07, Крылов Николай <krna(a)rambler.ru> wrote: > diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c > index 35a192c..3826326 100644 > --- a/dlls/msi/dialog.c > +++ b/dlls/msi/dialog.c > @@ -1755,17 +1755,41 @@ msi_seltree_popup_menu( HWND hwnd, INT x > HMENU hMenu; > INT r; > > + static const WCHAR szMenuLocal[] = > {'M','e','n','u','L','o','c','a','l',0}; > + static const WCHAR szMenuAllLocal[] = > {'M','e','n','u','A','l','l','L','o','c','a','l',0}; > + static const WCHAR szMenuAdvertise[] = > {'M','e','n','u','A','d','v','e','r','t','i','s','e',0}; > + static const WCHAR szMenuAbsent[] = > {'M','e','n','u','A','b','s','e','n','t',0}; > + /* If msi_dialog_get_uitext returns NULL - use default strings: */ > + static const WCHAR szMenuLocalDef[] = > {'I','n','s','t','a','l','l',' ','f','e','a','t','u','r','e',' ', > 'l','o','c','a','l','l','y',0}; > + static const WCHAR szMenuAllLocalDef[] = > {'I','n','s','t','a','l','l',' ','e','n','t','i','r','e',' > ','f','e','a','t','u','r','e',0}; > + static const WCHAR szMenuAdvertiseDef[] = > {'I','n','s','t','a','l','l',' ','o','n',' ','d','e','m','a','n','d',0}; > + static const WCHAR szMenuAbsentDef[] = {'D','o','n','\'','t',' > ','i','n','s','t','a','l','l',0}; > + > + LPWSTR szLocal,szAllLocal,szAdvertise,szAbsent; > + struct msi_selection_tree_info *info; > + > + info = GetPropW(hwnd, szButtonData); > + > + szLocal= msi_dialog_get_uitext( info->dialog, szMenuLocal ); > + szAllLocal= msi_dialog_get_uitext( info->dialog, szMenuAllLocal ); > + szAdvertise= msi_dialog_get_uitext( info->dialog, szMenuAdvertise > ); > + szAbsent= msi_dialog_get_uitext( info->dialog, szMenuAbsent ); > + > /* create a menu to display */ > hMenu = CreatePopupMenu(); > > - /* FIXME: load strings from resources */ > - AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_LOCAL, "Install > feature locally"); > - AppendMenuA( hMenu, MF_GRAYED, 0x1000, "Install entire feature"); > - AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ADVERTISED, "Install > on demand"); > - AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ABSENT, "Don't > install"); > + /* Use strings from resources */ > + AppendMenuW( hMenu, MF_ENABLED, INSTALLSTATE_LOCAL, > (szLocal==NULL)?szMenuLocalDef:szLocal ); > + AppendMenuW( hMenu, MF_GRAYED, 0x1000, > (szAllLocal==NULL)?szMenuAllLocalDef:szAllLocal ); > + AppendMenuW( hMenu, MF_ENABLED, INSTALLSTATE_ADVERTISED, > (szAdvertise==NULL)?szMenuAdvertiseDef:szAdvertise ); > + AppendMenuW( hMenu, MF_ENABLED, INSTALLSTATE_ABSENT, > (szAbsent==NULL)?szMenuAbsentDef:szAbsent ); > r = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_TOPALIGN | > TPM_RETURNCMD, > x, y, 0, hwnd, NULL ); > DestroyMenu( hMenu ); > + if(szLocal) msi_free(szLocal); > + if(szAllLocal) msi_free(szAllLocal); > + if(szAdvertise) msi_free(szAdvertise); > + if(szAbsent) msi_free(szAbsent); > return r; > } > Don't check values for NULL before freeing them. The check is redundant, and we spent a long time removing such checks. -- James Hawkins

1 0

Wine and XP Themes
by Andrew J. Barr 26 Feb '07

26 Feb '07

I would like to use the XP ClearLooks theme that is available to make Wine apps blend in with my GNOME desktop. However, it seems that using themes in Wine makes it rather slow. Is this a known problem, is there a workaround of some kind, a registry setting or a patch, or is it best just not to use themes with Wine right now? I am running Wine 0.9.31. According to a Google search, there seem to be scattered reports of this problem but no diagnosis or solution. Regards, Andrew Barr (cc'd replies requested)

5 4

Using InternalGetWindowText Instead of Sending WM_GETTEXT when Drawing Window Captions
by Robert Shearman 26 Feb '07

26 Feb '07

Hi Alexandre, A patch of yours from 2.5 years ago (http://source.winehq.org/git/wine.git/?a=commitdiff;h=b72994b6d4a04352e1893…) changed the behaviour to not send WM_GETTEXT any more. My experiments on Windows show that WM_GETTEXT should be used. Can you remember what the reasoning behind the change in this patch was? -- Rob Shearman

2 3

wine or wine-preloader exit with code 2 on x86_64
by Escuder Nicolas 26 Feb '07

26 Feb '07

Hello, I have build wine with the help of wiki WineOn64bit LDFLAGS="-L/lib32 -L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32" ./configure --prefix=/opt/wine --datadir=/usr/share But wine or wine-preloader always return 2 as you can see : [root@nico wine-0.9.31]# loader/wine-preloader [root@nico wine-0.9.31]# echo $? 2 [root@nico wine-0.9.31]# ./wine --version [root@nico wine-0.9.31]# echo $? 2 Anyone can help please ? See you, Escuder Nicolas

1 0

Re: [2/4 revised] msi: Expand IDL file to contain all OLE automation interfaces.
by James Hawkins 26 Feb '07

26 Feb '07

On 2/25/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > This patch expands the IDL to contain all OLE automation interfaces that > the freely downloadable MS Windows Installer contains, and adds a > msiserver_dispids.h file that has define statements for all the dispids. > > Changelog: > > * msi: Expand IDL file to contain all OLE automation interfaces. > * Copyright (C) 2007 Mike McCormack + * Misha Koshelev You have to repeat the Copyright (C) 2007 part for your name. + [id(DISPID_INSTALLER_OPENDATABASE)] + Database* OpenDatabase( + [in] BSTR DatabasePath, + [in] VARIANT OpenMode); + [id(DISPID_INSTALLER_SUMMARYINFORMATION), propget] + SummaryInfo* SummaryInformation( + [in] BSTR PackagePath, + [in, optional, defaultvalue(0)] long UpdateCount); + [id(DISPID_INSTALLER_ENABLELOG)] + void EnableLog( + [in] BSTR LogMode, + [in] BSTR LogFile); Did you copy and paste this from OleView? This formatting is ridiculous. -- James Hawkins

2 1

Re: dlls: Move the 16-bit dll stubs to the appropriate subdirectories.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Brian Gerst <bgerst(a)didntduck.org> writes: >>From 36873109949f308cc9d34f4df9bb0af4c219262b Mon Sep 17 00:00:00 2001 > From: Brian Gerst <bgerst(a)didntduck.org> > Date: Sat, 24 Feb 2007 08:59:48 -0500 > Subject: dlls: Move the 16-bit dll stubs to the appropriate subdirectories. This won't work, they won't be found when running inside the build tree. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32: rebar[2/3]: WM_SETFONT should send a RBN_HEIGHTCHANGED if necessary (with testcase)
by Alexandre Julliard 26 Feb '07

26 Feb '07

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > This allows as to eliminate the third parameter of REBAR_Layout. > From 2edae3656159e84a0366b65e1bd1d13e3089dc97 Mon Sep 17 00:00:00 2001 > From: =?utf-8?q?Miko=C5=82aj_Zalewski?= <mikolaj(a)zalewski.pl> > Date: Mon, 19 Feb 2007 20:42:08 +0100 > Subject: [PATCH] comctl32: rebar: WM_SETFONT should send a RBN_HEIGHTCHANGED if necessary (with testcase) The tests fail here: ../../../tools/runtest -q -P wine -M comctl32.dll -T ../../.. -p comctl32_test.exe.so rebar.c && touch rebar.ok rebar.c:696: Test failed: (int)SendMessage(hRebar, RB_GETROWCOUNT, 0, 0) expected 2 got 1 rebar.c:696: Test failed: invalid rect (notify) (-1,-1) (-1,-1) - expected (0,0) (672,20) make: *** [rebar.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

We should have a .desktop file for the Uninstaller application
by Scott Ritchie 26 Feb '07

26 Feb '07

As it is, most people don't even know this handy uninstaller applet exists. So let's fix that. Thanks, Scott Ritchie

3 2

Re: [3/4 revised] msi: Add partial, expandable OLE automation support.
by James Hawkins 26 Feb '07

26 Feb '07

On 2/25/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > This patch adds OLE automation support to MSI. It does this by creating > a wrapper class, which implements any of the OLE automation classes as > long as a function is given which is called from within the wrapper > classes invoke method after appropriate error checking. Basic > functionality is implemented, and it is fairly straightforward to add > the rest as the methods are all already implemented as functions in the > DLL. > +/* + * If you would like to implement a new automation function/object, look towards the bottom of this + * file for the "meat and potatoes" section. + */ + +/* FIXME: I don't know how big this should be */ +#define MAX_MSI_STRING 1000 + +/* + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just + * need to implement Invoke function for each dispinterface that is called from within + * the AutomationObject Invoke function which performs error checking, and pass the new + * function to create_automation_object. + */ + +typedef interface AutomationObject AutomationObject; + +interface AutomationObject { + /* + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo + */ + const IDispatchVtbl *lpVtbl; + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; + + /* Object reference count */ + LONG ref; + + /* Clsid for this class and it's appropriate ITypeInfo object */ + LPCLSID clsid; + ITypeInfo *iTypeInfo; + + /* The MSI handle of the current object */ + MSIHANDLE msiHandle; + + /* A function that is called from IDispatch::Invoke, specific to this type of object. By the + * time this function is called, basic error checking has been done in the AutomationObject + * Invoke function */ + HRESULT (STDMETHODCALLTYPE *funcInvoke)( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); +}; You went a little comment crazy here (and elsewhere). You should tone it down a bit. Good code explains itself and requires little or no commenting. + /* + * Perform a sanity check on the parameters. + */ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + /* + * Initialize the return parameter. + */ + *ppvObject = 0; + + /* + * Compare the riid with the interface IDs implemented by this object. + */ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, This->clsid)) + *ppvObject = This; + else if (IsEqualGUID(riid, &IID_IProvideClassInfo)) + *ppvObject = (IProvideClassInfo*)&(This->lpvtblIProvideClassInfo); + else if (IsEqualGUID(riid, &IID_IProvideClassInfo2)) + *ppvObject = (IProvideClassInfo2*)&(This->lpvtblIProvideClassInfo2); + else if (IsEqualGUID(riid, &IID_IProvideMultipleClassInfo)) + *ppvObject = (IProvideMultipleClassInfo*)&(This->lpvtblIProvideMultipleClassInfo); + + /* + * Check that we obtained an interface. + */ + if ((*ppvObject)==0) + { + TRACE("() : asking for unsupported interface %s\n",debugstr_guid(riid)); + return E_NOINTERFACE; + } + + /* + * Query Interface always increases the reference count by one when it is + * successful + */ + IClassFactory_AddRef(iface); + + return S_OK; +} Way too many comments. It may seem like nitpicking, but the comments clutter up the code and don't provide any useful information. -- James Hawkins

1 0

Re: msi: Add full JScript/VBScript support and partial expandable OLE automation support. [PATCH 3/3]
by Robert Shearman 26 Feb '07

26 Feb '07

Misha Koshelev wrote: > +/* Macros to get pointer to AutomationObject) from the other VTables. */ > Typo with extra ")" here. > +HRESULT WINAPI SessionImpl_Invoke( > + AutomationObject* This, > + DISPID dispIdMember, > + REFIID riid, > + LCID lcid, > + WORD wFlags, > + DISPPARAMS* pDispParams, > + VARIANT* pVarResult, > + EXCEPINFO* pExcepInfo, > + UINT* puArgErr) > +{ > + WCHAR szString[MAX_MSI_STRING]; > + DWORD dwLen = MAX_MSI_STRING; > + IDispatch *iDispatch = NULL; > + MSIHANDLE msiHandle; > + LANGID langId; > + UINT ret; > + INSTALLSTATE iInstalled, iAction; > Some error checking here would be good, like you do in AutomationObject_Invoke. > + > + switch (dispIdMember) > + { > ... > +/* > + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just > + * need to implement Invoke function for each dispinterface and pass the new function > + * to create_automation_object. > + */ > + > +typedef struct { > + /* > + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo > + */ > + const IDispatchVtbl *lpVtbl; > + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; > + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; > + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; > + > + /* Object reference count */ > + LONG ref; > + > + /* Clsid for this class and it's appropriate ITypeInfo object */ > + LPCLSID clsid; > + ITypeInfo *iTypeInfo; > + > + /* The MSI handle of the current object */ > + MSIHANDLE msiHandle;; > + > + /* A function that is called from IDispatch::Invoke, specific to this type of object */ > + LPVOID funcInvoke; > +} AutomationObject; > You shouldn't need to expose the implementation details of AutomationObject outside of automation.c. > + > +/* This is the function that one needs to call to create an automation object. */ > +extern HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, LPVOID funcInvoke); > It is dangerous to use LPVOID as the type to pass a function in. > + > +/* We need to expose these functions because our IActiveScriptSite calls it */ > +extern HRESULT WINAPI LoadTypeInfo(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid); > +extern HRESULT WINAPI SessionImpl_Invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); > + > +/* Disp Ids > + * (not complete, look in msiserver.idl to add more) */ > +typedef enum { > + RecordDispId_StringData=1, > + RecordDispId_IntegerData, > + RecordDispId_SetStream, > + RecordDispId_ReadStream, > + RecordDispId_FieldCount, > + RecordDispId_IsNull, > + RecordDispId_DataSize, > + RecordDispId_ClearData, > + RecordDispId_FormatText > +} RecordDispId; > + > +typedef enum { > + ViewDispId_Execute=1, > + ViewDispId_Fetch, > + ViewDispId_Modify, > + ViewDispId_Close, > + ViewDispId_ColumnInfo, > + ViewDispId_GetError > +} ViewDispId; > + > +typedef enum { > + DatabaseDispId_DatabaseState=1, > + DatabaseDispId_SummaryInformation, > + DatabaseDispId_OpenView, > + DatabaseDispId_Commit, > + DatabaseDispId_PrimaryKeys, > + DatabaseDispId_Import, > + DatabaseDispId_Export, > + DatabaseDispId_Merge, > + DatabaseDispId_GenerateTransform, > + DatabaseDispId_ApplyTransform, > + DatabaseDispId_EnableUIPreview, > + DatabaseDispId_TablePersistent, > + DatabaseDispId_CreateTransformSummaryInfo > +} DatabaseDispId; > + > +typedef enum { > + SessionDispId_Installer=1, > + SessionDispId_Property, > + SessionDispId_Language, > + SessionDispId_Mode, > + SessionDispId_Database, > + SessionDispId_SourcePath, > + SessionDispId_TargetPath, > + SessionDispId_DoAction, > + SessionDispId_Sequence, > + SessionDispId_EvaluateCondition, > + SessionDispId_FormatRecord, > + SessionDispId_Message, > + SessionDispId_FeatureCurrentState, > + SessionDispId_FeatureRequestState, > + SessionDispId_FeatureValidStates, > + SessionDispId_FeatureCost, > + SessionDispId_ComponentCurrentState, > + SessionDispId_ComponentRequestState, > + SessionDispId_SetInstallLevel, > + SessionDispId_VerifyDiskSpace, > + SessionDispId_ProductProperty, > + SessionDispId_FeatureInfo, > + SessionDispId_ComponentCost > +} SessionDispId; > See dlls/oleaut32/tests/tmarshal_dispids.h and dlls/oleaut32/tests/tmarshal.idl for how to use DISPIDs properly. > +typedef struct { > + IActiveScriptSite lpVtbl; > + AutomationObject *session; > You don't actually access this as anything other than an IDispatch object, so you might as well change to "IDispatch *session". > +LPCWSTR read_script_from_file(LPCWSTR szFile, INT type) > Should be static. > +/* JScript or VBScript? */ > +LPCWSTR progid_from_type(INT type) > Should also be static. > + > +/* > + * Call a script. This is our meat and potatoes. > + * - Currently, since the function is relatively new, it will always end up returning S_OK. > + * Think of it like a bonus feature, we can run the script - great. If we have a problem, > + * we are no worse off than if this function had not been called. > + */ > +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR filename, LPCWSTR function, LPCWSTR action) > +{ > + LPCWSTR script = NULL, progId = NULL; > + HRESULT hr; > + IActiveScript *iActiveScript = NULL; > + IActiveScriptParse *iActiveScriptParse = NULL; > I haven't seen this variable notation style before. In Hungarian notation "p" is used instead of "i" to show a pointer to an object exposing the interface declared. -- Rob Shearman

2 2

Re: wined3d: Use application provided fog range when fog is enabled.
by Stefan Dösinger 26 Feb '07

26 Feb '07

Am Montag 26 Februar 2007 02:03 schrieb Vitaliy Margolen: > This should fix fog issues with PoP SoT. > --- > dlls/wined3d/state.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) Just wanted to add that this would fix the fixed function Z vs specular color alpha selection with table and vertex fog. Vertex shaders seem to be treated as transformed vertices. That said, the way the fixed function pipeline uses was developed by looking at what games need. The patch Vitaly sent looks good to me, but if there are any regressions I will have to try to write a unit test(though it will be tricky due to the pixel exactness thingy)

1 0

Re: [2/2] user32: do not call NULL message callback
by Robert Shearman 25 Feb '07

25 Feb '07

Fabian Bieler wrote: > @@ -8894,23 +8894,20 @@ static void test_nullCallback(void) > HWND hwnd; > MSG msg; > > - if(0) > - { > - hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, > - 100, 100, 200, 200, 0, 0, 0, NULL); > - ok (hwnd != 0, "Failed to create overlapped window\n"); > + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (hwnd != 0, "Failed to create overlapped window\n"); > > - ShowWindow(hwnd, SW_SHOW); > - UpdateWindow( hwnd ); > + ShowWindow(hwnd, SW_SHOW); > + UpdateWindow( hwnd ); > > - SendMessageCallbackA(hwnd,WM_NULL,0,0,NULL,0); > + SendMessageCallbackA(hwnd,WM_NULL,0,0,NULL,0); > > - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > > - ok(1, "\n"); > + ok(1, "\n"); > > - DestroyWindow(hwnd); > - } > + DestroyWindow(hwnd); > } > > START_TEST(msg) > You might as well add the test and fix the bug in one patch since the second patch is no shorter due to all of the whitespace changes. -- Rob Shearman

1 0

Re: a big fan (now with bad news)
by Joris Huizer 25 Feb '07

25 Feb '07

Aww... yes, I'm seeing that too According the the wine application database (http://appdb.winehq.org/appview.php?iVersionId=469) some settings help it get a bit further, but it reports: "Microsoft Internet Explorer has encountered a problem and needs to close. We are sorry for the inconvenience." (With a "debug" button) With these messages: fixme:shell:StopWatchMode () stub! fixme:shdocvw:IEWinMain "" 10 fixme:ole:CoResumeClassObjects stub err:module:DelayLoadFailureHook failed to delay load urlmon.dll.CreateURLMoniker wine: Call from 0x7b842138 to unimplemented function urlmon.dll.CreateURLMoniker, aborting fixme:imm:ImmDisableIME (-1): stub fixme:advapi:RegisterEventSourceW ((null),L"Microsoft Internet Explorer"): stub fixme:advapi:ReportEventA (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x632f6ec0,0x632f6a84): stub fixme:advapi:ReportEventW (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x161400,0x632f6a84): stub err:eventlog:ReportEventW L"iexplore.exe" err:eventlog:ReportEventW L"6.0.2800.1106" err:eventlog:ReportEventW L"" err:eventlog:ReportEventW L"0.0.0.0" err:eventlog:ReportEventW L"00000000" fixme:advapi:DeregisterEventSource (0xcafe4242) stub fixme:wininet:InternetGetConnectedState always returning LAN connection. Hitting "debug" crashes as an unimplemented function in urlmon is called - that seems weird, as it should be using the native version of urlmon... oh well I guess you need to use ies4linux to get a working IE for now. I had it installed as some program thought it needed it - hadn't noticed it didn't actually run Jeffrey Sabarese <core5fedora(a)gmail.com> wrote: Hi Joris, Thanks again for corresponding with me on this. (i realize there's much text here, so please take you time, get to it when you can...) for the link, just think: "this dude is such a 'NOVICE'!! he really should take more 'NOTES'!!!..." get it? novicenotes? hee hee then a text search (upper right) of WinE ie will get you there, undoubtedly. but that's not why i am writing. i wanted to let you know that the "genuine" installer, http://www.microsoft.com/windows/ie/ie6/downloads/critical/ie6sp1/default.m… did not succeed in placing a useable software on the system. it seemed to "install" just fine, but launching it: [ wine '/home/user/.wine/drive_c/Program Files/Internet Explorer/iexplore.exe' ] brings up a window w/ nothing but "white space". as if it "wants" to launch, but doesn't quite get there. when ie was installed via "ies4linux", i DID experience a similar activity, but only if i launched IE via WinE application link, for example, if i linked to IE from... say EditPlus, as an external browser, i would get the same: a window w/ nothing in it-- as you might see after an app has crashed, the window's still up, but no screen-updating, so you get a "frozen" image, or white screen. so, the only time i've ever seen it look "right" myself was using the "non-standard" ies4linux launcher, as i've illustrated specifically, here some time ago (showing the 3 versions of IE in that package): http://digisquirrel.blogspot.com/2006/08/fiddlers-three.html please understand that i want to install it the proper, WinE developers' recommended way, so this is why i continue to research the subject (and continue to probably annoy you, for which i apologize). What might i be doing wrong? i noticed in my blog entry-- (a different one this time) http://novicenotes.com/2006/08/04/ie_on_linux_wine/ where i discussed DCOM98.EXE . i haven't actively installed that component this time-- so unless it came down w/ the MS installer, might i need to have that installed as well? any other feedback you have on this subject is appreciated. perhaps you have URL w/ the preferred, WinE dev's method? (assuming it's "okay [legal]" to do the MS installer) thank you for your generous help!! --Jeff Sabarese PS. I apologize if it's been an invasion-- i thought i mailed to the "list" last time, but it looks like i sent just to you last time? (and i know i sent only to you this time, so if you wish to forward to the list, please do so. i have a real problem w/ being not-concise [as you've noticed, i'm sure], so i tried to spare the other members for now. sorry i can't seem to shorten things more than i do). On 2/24/07, Joris Huizer wrote: > I think I don't have it anymore, though I'd like to > see - though I'm pretty sure you got it covered well, > like before. > > regards, > > Joris > > > > --- Jeffrey Sabarese wrote: > > > hey there! thanks for the valuable lesson learned > > here! > > > > btw-- i changed my web log info , per > > recommendations i received in > > this mail conversation. if you still have the link > > and care to see > > it-- you'll see that i've now got the wineHQ URL > > there, and a > > recommendation about IE6 should install properly > > :) > > > > On 2/23/07, Joris Huizer > > wrote: > > > > > > --- Jeffrey Sabarese > > wrote: > > > > > > > > > > > I tried [ yum remove wine ], and then [yum > > install > > > > wine] which went > > > > without a hitch, but there's no change in my > > Primary > > > > User (the broken > > > > one) > > > > HOWEVER, WinE continues to run perfectly under > > other > > > > user accounts, and ROOT. > > > > > > > > > > The wine configuration is in ~/.wine > > > Remove/rename it for a fresh start. Wine will > > > automatically recreate the ~/.wine directory with > > > required contents for normal functionality (but > > then > > > you need to do installation of every program > > again) > > > > > > > > > > > > > > > ____________________________________________________________________________________ > > > Yahoo! Music Unlimited > > > Access over 1 million songs. > > > http://music.yahoo.com/unlimited > > > > > > > > > > > > > > > -- > > /* ************************************************ > > */ > > Quanta+ Web Development IDE: > > http://quanta.kdewebdev.org/ > > Quanta+ Wiki: > > http://tinyurl.com/3dzqxk > > Other Quanta Tips: > > http://invisiblepixels.org/progs/quanta.html > > /* ************************************************ > > */ > > > > > > > ____________________________________________________________________________________ > Looking for earth-friendly autos? > Browse Top Cars by "Green Rating" at Yahoo! Autos' Green Center. > http://autos.yahoo.com/green_center/ > -- /* ************************************************ */ Quanta+ Web Development IDE: http://quanta.kdewebdev.org/ Quanta+ Wiki: http://tinyurl.com/3dzqxk Other Quanta Tips: http://invisiblepixels.org/progs/quanta.html /* ************************************************ */ --------------------------------- Need Mail bonding? Go to the Yahoo! Mail Q&A for great tips from Yahoo! Answers users.

2 1

Re: msi: Add handlers for JScript/VBScript actions that call one script function. [PATCH 2/3]
by Robert Shearman 25 Feb '07

25 Feb '07

Misha Koshelev wrote: > All > actual script implementation is left (for the next patch) in the > call_script function. Patches should attempt to be atomic changes that compile and pass all tests without another patch needing to be applied on top. I suggest you implement automation.c and the associated header file in patch 2 and combine this patch with the rest of patch 3. > +static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + if (GetTempFileNameW(fmt, f1, 0, tmp_file) == 0) > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, NULL, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + r = store_binary_to_temp(package, source, tmp_file); > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, target, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + info = do_msidbCustomActionTypeScript( package, type, file->TargetPath, target, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + if (GetTempFileNameW(fmt, f1, 0, tmp_file) == 0) > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, NULL, action ); > + > + return wait_thread_handle( info ); > +} > It would seem simpler here to just open the file here for the one case that has an external file and just pass in the LPWSTR script for all cases. -- Rob Shearman

1 0

Success with enhanced cd's... kind of
by Dan Kegel 24 Feb '07

24 Feb '07

I noticed that my copy of "No!" by "They Might Be Giants" is an "enhanced cd", so I inserted it into my Ubuntu Dapper laptop. Ubuntu only noticed the audio tracks, so I had to actually use the commandline to mount the data tracks: sudo mount -oro,loop -tiso9660 /dev/cdrom /mnt After that it went fine; wine was able to run the flash app on the disc. Looks like others have complained about this, e.g. http://ubuntuforums.org/showthread.php?p=2143161 but I didn't see any bug reports about it, so I filed https://launchpad.net/ubuntu/+bug/87663 - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

RE: xcopy try 2
by Ann & Jason Edmeades 24 Feb '07

24 Feb '07

Hi Detlef, (again) >Configure.ac - I included that because another 'regular' developer who >added a dll recently added it (See:) > http://www.winehq.org/pipermail/wine-patches/2007-February/036243.html) >I'll leave it in for that reason unless there's a big problem with it (I >always thought you were supposed to send in configure.ac but not configure) I stand corrected - tools\make_makefiles does that update for me as well as the others :-) Jason

1 0

Re: xcopy try 2
by Detlef Riekenberg 24 Feb '07

24 Feb '07

On Fr, 2007-02-23 at 16:44 +0000, Ann & Jason Edmeades wrote: Looks nice, but a view over the code result in some more comments: --- a/configure.ac +++ b/configure.ac Not needed, when sending the Patch (and that line causes already an offset, when patching wine) "tools/make_makefiles" takes care of all required changes and when Alexandre commit your Patch, the changes from make_makefiles and autoconf are included in the commit. +EXTRADEFS = -DUNICODE There is no need for that define. Remove that line to get a warning for all ANSI-Functions, that missed the "W" +C_SRCS = \ + xcopy.c Spaces are wrong before the filename. You must use TAB in makefiles +/* Prototypes */ This can be avoided completly, when you rearange your functions (so main() is then the last function in the file) + printf("Invalid number of parameters - Use xcopy /? for help\n"); The text should be read from the resources, so it can be localized . You should convert the UNICODE-Message with WideCharToMultiByte. When the output-handle is the console, printing UNICODE-messages avoid converting the message twice (xcopy and kernel32) > + if (*argvW[0] != '/') { > + if (suppliedsource[0] == 0x00) { > + lstrcpyW(suppliedsource, *argvW); > + } else { > + lstrcpyW(supplieddestination, *argvW); > + } This is wrong. tested with: "xcopy file1 file2 file3" Your code would copy file1 to file3, while w2k fails with "Unzulässige Parameteranzahl" (Invalid number of parameters) I suggest to initialize supplieddestination as empty string and copy the arg to supplieddestination only, when it is emtpy. When supplieddestination was not empty, quit with the error. You need to fill supplieddestination with the default "." before /* Trace out the supplied information */, when it is still empty at that location. + if (flags & OPT_SIMULATE) { + printf("%d file(s) would be copied\n", filesCopied); + } else { + printf("%d file(s) copied\n", filesCopied); + } As Above: Format-Pattern from the resource and WriteFile() + if (GetFullPathName(suppliedsource, MAX_PATH, "W" missing: => GetFullPathNameW (More Functions in various locations and WIN32_FIND_DATA => WIN32_FIND_DATAW) I did not test the code very much, but I think, you did. (ToDo-Reminder: "xcopy file1 name_not_found" => is "name_not_found" a file or a directory) Thanks for your work. It's pretty good as start! -- By by ... Detlef

3 2

New wintest executable is there (but there are some issues due to introduction of skip)
by Paul Vriens 24 Feb '07

24 Feb '07

Hi, as of today there's a new winetest executable available at the usual place: http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/ There is however an issue with the generated reports. It looks like this is introduced when the 'skip' thingy was added to the test infrastructure. I'm currently going through the perl scripts but have no fix yet. Most likely we have to patch the 'dissect' script at line 158: } elsif (s/^($test: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/$1/) { The previous lines were like: advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 crypt: 69 tests executed, 0 marked as todo, 0 failures. advapi32:crypt done (0) now it's: advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 crypt: 69 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:crypt done (0) Anybody? Cheers, Paul.

3 3

Re: dplay: directplay should initialize session Guid patch + conformance tests
by Stefan Dösinger 24 Feb '07

24 Feb '07

Am Samstag 24 Februar 2007 17:25 schrieb Alessandro Pignotti: > Hi everyone, > the directx sdk says that directplay has to initialize sesison guid in > SESSIONDESC2 struct that is passed by the application with the Open call. > This patch adresses that issue and includes proper conformance test. > It should be noted that the tests works under windows, but not yet under > wine, because it has not a working directplay service provider > implementation and it's not possible to mix builtin dplayx with native > service provider (i'm working on a patch to tha problem too) Use todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid not initialized"); For tests which are known to fail

2 1

Re: dplay: directplay should initialize session Guid patch + conformance tests
by Paul Vriens 24 Feb '07

24 Feb '07

Alessandro Pignotti wrote: > On Saturday 24 February 2007 19:31, Stefan Dösinger wrote: > >> todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid >> not initialized"); >> >> For tests which are known to fail > > This version of the patch follows Stefan's advice. > > > > ------------------------------------------------------------------------ > > diff --git a/configure.ac b/configure.ac > index 672dd78..4ef4e23 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1587,6 +1587,7 @@ dlls/dnsapi/Makefile > dlls/dnsapi/tests/Makefile > dlls/dplay/Makefile > dlls/dplayx/Makefile > +dlls/dplayx/tests/Makefile > dlls/dpnet/Makefile > dlls/dpnhpast/Makefile > dlls/dsound/Makefile > diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c > index f5c630a..475e59c 100644 > --- a/dlls/dplayx/dplay.c > +++ b/dlls/dplayx/dplay.c > @@ -2828,6 +2828,8 @@ static HRESULT WINAPI DP_SecureOpen > > This->dp2->bHostInterface = TRUE; > > + //Initializing session GUID > + CoCreateGuid(&(lpsd->guidInstance)); > hr = DP_SetSessionDesc( This, lpsd, 0, TRUE, bAnsi ); > if( FAILED( hr ) ) > { > diff --git a/dlls/dplayx/tests/Makefile.in b/dlls/dplayx/tests/Makefile.in > new file mode 100644 > index 0000000..02007d1 > --- /dev/null > +++ b/dlls/dplayx/tests/Makefile.in > @@ -0,0 +1,14 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = dplayx.dll > +IMPORTS = kernel32 ole32 dxguid > +EXTRALIBS = > + > +CTESTS = \ > + dplayx.c > + > +@MAKE_TEST_RULES@ > + > +@DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c > new file mode 100644 > index 0000000..ba96125 > --- /dev/null > +++ b/dlls/dplayx/tests/dplayx.c > @@ -0,0 +1,55 @@ > +#include <wine/test.h> > +#include <dplay.h> > + > +BOOL validSP=0; > + > +BOOL FAR PASCAL EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnection, > + DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, > + LPVOID lpContext) > +{ > + if(!memcmp(lpguidSP,&DPSPGUID_TCPIP,16)) > + { > + //I'm forcing TCP/IP Sevice provider > + HRESULT hr=IDirectPlayX_InitializeConnection((LPDIRECTPLAY4)lpContext,lpConnection,0); > + todo_wine > + { > + ok(SUCCEEDED(hr),"It's not possible to initialize TCP/IP service provider\n"); > + } > + if(SUCCEEDED(hr)) > + validSP=1; > + > + return FALSE; > + } > + return TRUE; > +} > + > +START_TEST(dplayx) > +{ > + LPDIRECTPLAY4 pDP = NULL; > + GUID appGuid; > + GUID zeroGuid; > + DPSESSIONDESC2 sessionDesc; > + CoInitialize(NULL); > + CoCreateGuid(&appGuid); > + CoCreateInstance(&CLSID_DirectPlay,NULL, CLSCTX_ALL, > + &IID_IDirectPlay4A,(VOID**)&pDP); > + IDirectPlayX_EnumConnections(pDP,&appGuid,EnumConnectionsCallback, > + pDP,0); > + if(validSP) > + { > + bzero(&sessionDesc,sizeof(DPSESSIONDESC2)); > + bzero(&zeroGuid,16); > + sessionDesc.dwSize=sizeof(DPSESSIONDESC2); > + sessionDesc.dwFlags=DPSESSION_CLIENTSERVER; > + memcpy(&sessionDesc.guidApplication,&appGuid,16); > + sessionDesc.lpszSessionNameA="DPlay conformance test"; > + sessionDesc.dwMaxPlayers=10; > + sessionDesc.dwCurrentPlayers=0; > + sessionDesc.guidInstance=CLSID_DirectPlay; > + IDirectPlayX_Open(pDP,&sessionDesc,DPOPEN_CREATE); > + todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid not initialized"); > + } > + IDirectPlayX_Release(pDP); > + CoUninitialize(); > + > +} > > > ------------------------------------------------------------------------ > > Hi, no clue about dplayx but: - there are some C++ style comments, please use C-style - there is no copyright/license information Cheers, Paul.

1 0

Re: [PATCH] user32: do not call NULL message callback
by Felix Nawothnig 24 Feb '07

24 Feb '07

Fabian Bieler wrote: > Windows silently ignores NULL pointers supplied to SendMessageCallback as > callback function. A testcase would be nice. Felix

2 2

Re: include/d3d9types.h: Remove Size from D3DVOLUME_DESC
by H. Verbeet 24 Feb '07

24 Feb '07

On 24/02/07, Rok Mandeljc <rok.mandeljc(a)email.si> wrote: > According to both MSDN and wine's d3d9 sources, Size was removed from > D3DVOLUME_DESC in DX9. This patch seems to have fixed crash in d3dx9_30.dll at NeverWinter Nights 2 startup (I assume it was due to wrong offset of Width, Height and Depth due to Size's presence). > > Regards, > Rok > Nice find, this fixes some stack corruption in a couple of applications.

2 1

Re: kernel32: Set object security on process object in CreateProcess.
by Robert Shearman 24 Feb '07

24 Feb '07

Vitaliy Margolen wrote: > + > + /* set process security */ > + if (ret && psa && psa->lpSecurityDescriptor) > + { > + NTSTATUS status; > + > + status = NtSetSecurityObject( info->hProcess, DACL_SECURITY_INFORMATION, > + psa->lpSecurityDescriptor ); > + ret = status == STATUS_SUCCESS; > + if (!ret) SetLastError( RtlNtStatusToDosError( status ) ); > + } > + > It would be better to pass the security descriptor (or just the DACL if you would prefer) in the new_process call. You should be able to change the security structure validation functions to return the number of bytes used. Therefore, you should be able to put the security data before the other variable data in the new_process call. Also, I think several tests in advapi32 should succeed after this patch is applied so you will need to patch that too. -- Rob Shearman

2 1

test.winehq.com status
by Felix Nawothnig 24 Feb '07

24 Feb '07

Hi. Anyone knows what happened to test.winehq.com/data? There has been no new crossbuilds for quite some time now... Felix

4 5

ANN: Wiki upgrade
by Dimi Paun 24 Feb '07

24 Feb '07

Folks, We finished upgrading the wiki to MoinMoin 1.5.7. Please let me know if you encounter any problems. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

3 2

Re: winex11.drv: Catch and report screen resolution change errors.
by Vitaliy Margolen 24 Feb '07

24 Feb '07

> winex11.drv: Catch and report screen resolution change errors. This patch brakes Half-life based games in virtual desktop. Vitaliy.

2 1

Re: dbghelp: Match the crc for debug link files in elf_locate_debug_link so that we get the correct debug file before trying to parse it.
by Eric Pouech 24 Feb '07

24 Feb '07

Robert Shearman a écrit : > > Keep the debuglink elf_file_map mapped until after > elf_new_public_symbols is called, otherwise we could use unmapped memory. this is still not the full valid solution... what should be done is: when we search for a given section, we should look first in the original .so, then, if not found, in the .gnu_debuglink one... your patch only covers the case where all relevant information is to be found in the .gnu_debuglink file, which is not guaranteed A+

2 3

Re: [6/13]D3D: Index buffer fixes
by Mirek 24 Feb '07

24 Feb '07

Some games are still broken with latest 13 patches from your tree. Oblivion still hangs while loading game and Flatout 2 crashed after 2 seconds with this output: athlon64:/usr/games/flatout2# ./flatout2 fixme:d3d:IWineD3DDeviceImpl_CreateAdditionalSwapChain The app requests more than one back buffer, this can't be supported properly. Please configure the application to use double buffering(=1 back buffer) if possible fixme:d3d:IWineD3DDeviceImpl_GetAvailableTextureMem (0x17fe20) : stub, simulating 256MB for now, returning 256MB left fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub err:ole:CoInitializeEx Attempt to change threading model of this apartment from multi-threaded to apartment threaded fixme:wave:DBSB_MMAPLoop Can't access sound driver's buffer directly. err:ole:CoInitializeEx Attempt to change threading model of this apartment from multi-threaded to apartment threaded fixme:win:WIN_CreateWindowEx Parent is HWND_MESSAGE wine: Unhandled page fault on read access to 0x7c3a4270 at address 0x7c3a4270 (thread 0011), starting debugger... Unhandled exception: page fault on read access to 0x7c3a4270 in 32-bit code (0x7c3a4270). fixme:d3d:IWineD3DDeviceImpl_EvictManagedResources (0x17fe20) : stub Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:7c3a4270 ESP:7b8cea60 EBP:7b8ceab8 EFLAGS:00210246( - 00 -RIZP1) EAX:00000000 EBX:7c3be764 ECX:00000000 EDX:7b8cea90 ESI:7b8cea90 EDI:00010028 Stack dump: 0x7b8cea60: 00000000 00000000 00000000 00000000 0x7b8cea70: fffffffd 00000000 00000000 00000000 0x7b8cea80: 00000001 7ffd2000 00000018 7ef935ef 0x7b8cea90: 00000000 00000012 00000000 00000000 0x7b8ceaa0: 00002357 00000000 00000000 7efe5368 0x7b8ceab0: 0173fc34 7c3a41b0 7b8ceb58 7efc81bb Backtrace: =>1 0x7c3a4270 (0x7b8ceab8) 2 0x7efc81bb call_thread_func+0x3b(rtl_func=<register EDI not in topmost frame>, arg=<register ESI not in topmost frame>) [/root/.WineCVS/sources/cvswine/wine/dlls/ntdll/thread.c:371] in ntdll (0x7b8ceb58) 3 0x7efc8461 in ntdll (+0x48461) (0x7b8cf458) err:dbghelp:elf_load_debug_info_from_map Bad CRC for module (got aa34a405 while expecting ef5281d2) 4 0xb7df10bd start_thread+0x6d() in libpthread.so.0 (0x7b8cf4c8) err:dbghelp:elf_load_debug_info_from_map Bad CRC for module (got 61a1649a while expecting f01d3064) 5 0xb7d859ee __clone+0x5e() in libc.so.6 (0x00000000) 0x7c3a4270: -- no code accessible -- Modules: Module Address Debug info Name (83 modules) PE 400000-152e000 Deferred flatout2 PE 1740000-19a0000 Deferred d3dx9_30 ELF 7bf00000-7bf03000 Deferred <wine-loader> ELF 7c663000-7c6ac000 Deferred dsound<elf> \-PE 7c670000-7c6ac000 \ dsound ELF 7c781000-7c7b3000 Deferred uxtheme<elf> \-PE 7c790000-7c7b3000 \ uxtheme ELF 7c7b3000-7c874000 Deferred libasound.so.2 ELF 7c87e000-7c893000 Deferred midimap<elf> \-PE 7c880000-7c893000 \ midimap ELF 7c893000-7c8be000 Deferred winealsa<elf> \-PE 7c8a0000-7c8be000 \ winealsa ELF 7cb5a000-7cb5f000 Deferred libxfixes.so.3 ELF 7cb5f000-7cb68000 Deferred libxcursor.so.1 PE 7cb70000-7cb85000 --none-- msacm32 ELF 7cb87000-7cb8a000 Deferred libxrandr.so.2 ELF 7cb8a000-7cb92000 Deferred libxrender.so.1 ELF 7cb92000-7cb95000 Deferred libxinerama.so.1 ELF 7cb98000-7cbb4000 Deferred imm32<elf> \-PE 7cba0000-7cbb4000 \ imm32 ELF 7d55e000-7d5ec000 Deferred winex11<elf> \-PE 7d570000-7d5ec000 \ winex11 ELF 7d650000-7d670000 Deferred libexpat.so.1 ELF 7d670000-7d69b000 Deferred libfontconfig.so.1 ELF 7d6ba000-7d724000 Deferred libfreetype.so.6 ELF 7d743000-7d769000 Deferred msacm32<elf> ELF 7d769000-7d7cd000 Deferred msvcrt<elf> \-PE 7d780000-7d7cd000 \ msvcrt ELF 7d835000-7d840000 Deferred libgcc_s.so.1 ELF 7d925000-7d927000 Deferred libnvidia-tls.so.1 ELF 7d927000-7e298000 Deferred libglcore.so.1 ELF 7e298000-7e29d000 Deferred libxdmcp.so.6 ELF 7e29d000-7e32d000 Deferred libglu.so.1 ELF 7e32d000-7e3c1000 Deferred libgl.so.1 ELF 7e3c1000-7e4ad000 Deferred libx11.so.6 ELF 7e4ad000-7e4bb000 Deferred libxext.so.6 ELF 7e4bb000-7e4d3000 Deferred libice.so.6 ELF 7e4d3000-7e4dc000 Deferred libsm.so.6 ELF 7e4dc000-7e596000 Deferred wined3d<elf> \-PE 7e4f0000-7e596000 \ wined3d ELF 7e596000-7e5c1000 Deferred d3d9<elf> \-PE 7e5a0000-7e5c1000 \ d3d9 ELF 7e5c1000-7e5ed000 Deferred ws2_32<elf> \-PE 7e5d0000-7e5ed000 \ ws2_32 ELF 7e5ed000-7e6aa000 Deferred comctl32<elf> \-PE 7e600000-7e6aa000 \ comctl32 ELF 7e6aa000-7e6bd000 Deferred libresolv.so.2 ELF 7e6c6000-7e6da000 Deferred libz.so.1 ELF 7e6dc000-7e6fa000 Deferred iphlpapi<elf> \-PE 7e6e0000-7e6fa000 \ iphlpapi ELF 7e6fa000-7e74f000 Deferred rpcrt4<elf> \-PE 7e710000-7e74f000 \ rpcrt4 ELF 7e74f000-7e7e8000 Deferred ole32<elf> \-PE 7e760000-7e7e8000 \ ole32 ELF 7e7e8000-7e840000 Deferred shlwapi<elf> \-PE 7e800000-7e840000 \ shlwapi ELF 7e840000-7e935000 Deferred shell32<elf> \-PE 7e850000-7e935000 \ shell32 ELF 7e935000-7e97b000 Deferred advapi32<elf> \-PE 7e940000-7e97b000 \ advapi32 ELF 7e97b000-7ea0e000 Deferred gdi32<elf> \-PE 7e990000-7ea0e000 \ gdi32 ELF 7ea0e000-7eb48000 Deferred user32<elf> \-PE 7ea30000-7eb48000 \ user32 ELF 7eb48000-7ebd6000 Deferred winmm<elf> \-PE 7eb50000-7ebd6000 \ winmm ELF 7edd6000-7eefc000 Deferred kernel32<elf> \-PE 7edf0000-7eefc000 \ kernel32 ELF 7eefc000-7ef07000 Deferred libnss_files.so.2 ELF 7ef07000-7ef11000 Deferred libnss_nis.so.2 ELF 7ef11000-7ef27000 Deferred libnsl.so.1 ELF 7ef27000-7ef4c000 Deferred libm.so.6 ELF 7ef4c000-7ef4f000 Deferred libxau.so.6 ELF 7ef6b000-7f000000 Dwarf ntdll<elf> \-PE 7ef80000-7f000000 \ ntdll ELF b7cb0000-b7cb5000 Deferred libxxf86vm.so.1 ELF b7cb6000-b7cba000 Deferred libdl.so.2 ELF b7cba000-b7dec000 Export libc.so.6 ELF b7dec000-b7dfe000 Export libpthread.so.0 ELF b7e11000-b7e15000 Deferred iso8859-2.so ELF b7e15000-b7e1e000 Deferred libnss_compat.so.2 ELF b7e1e000-b7f2f000 Deferred libwine.so.1 ELF b7f31000-b7f48000 Deferred ld-linux.so.2 Threads: process tid prio (all id:s are in hex) 0000000a 0000000c 0 0000000b 0 00000008 (D) G:\usr\games\flatout2\FlatOut2.exe 00000012 15 00000011 0 <== 00000010 0 0000000f 2 0000000e 15 0000000d 15 00000009 0 Stefan Dösinger napsal(a): > The ddraw index buffer handling needs a proper fix somewhen, either by an VB + > up Indices drawing method(but there are already too many of them) or my a > SetMem method in index buffers > > This patch should(hopefully) fix the regressions introduced with my former > index buffer patch > > > ------------------------------------------------------------------------ > > From fadece932e1ff556a4434545d7bf6753aaabdaf1 Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Tue, 20 Feb 2007 16:15:04 +0100 > Subject: [PATCH] D3D: Index buffer fixes > > Some things that missed in my former patch. Do not unset the index buffer in _Release, that > is not needed. Dirtify the index buffer state in unlock because the bound buffer is changed. > GL vbos are GLuints. The index buffer used by ddraw should have dynamic usage, and preferably > be locked only on the size that has to be locked > --- > dlls/ddraw/device.c | 2 +- > dlls/ddraw/direct3d.c | 2 +- > dlls/wined3d/device.c | 2 +- > dlls/wined3d/indexbuffer.c | 9 +++++++-- > 4 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c > index c201df7..0814921 100644 > --- a/dlls/ddraw/device.c > +++ b/dlls/ddraw/device.c > @@ -3691,7 +3691,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, > */ > hr = IWineD3DIndexBuffer_Lock(This->indexbuffer, > 0 /* OffSetToLock */, > - 0 /* SizeToLock - doesn't matter */, > + IndexCount * sizeof(WORD), > (BYTE **) &LockedIndices, > 0 /* Flags */); > assert(IndexCount < 0x100000); > diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c > index 4896ba7..b716a60 100644 > --- a/dlls/ddraw/direct3d.c > +++ b/dlls/ddraw/direct3d.c > @@ -804,7 +804,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, > */ > hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, > 0x40000, /* Length. Don't know how long it should be */ > - 0, /* Usage */ > + WINED3DUSAGE_DYNAMIC, /* Usage */ > WINED3DFMT_INDEX16, /* Format. D3D7 uses WORDS */ > WINED3DPOOL_DEFAULT, > &object->indexbuffer, > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index c039798..2ac8797 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -4294,7 +4294,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * > UINT idxStride = 2; > IWineD3DIndexBuffer *pIB; > WINED3DINDEXBUFFER_DESC IdxBufDsc; > - GLint vbo; > + GLuint vbo; > > pIB = This->stateBlock->pIndexData; > This->stateBlock->streamIsUP = FALSE; > diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c > index b16ddd0..ae2294a 100644 > --- a/dlls/wined3d/indexbuffer.c > +++ b/dlls/wined3d/indexbuffer.c > @@ -60,8 +60,11 @@ static ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) > if (ref == 0) { > if(This->vbo) { > ENTER_GL(); > - GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > - checkGLcall("glBindBufferARB"); > + /* No need to manually unset the buffer. glDeleteBuffers unsets it for the current context, > + * but not for other contexts. However, because the d3d buffer is destroyed the app has to > + * unset it before doing the next draw, thus dirtifying the index buffer state and forcing > + * binding a new buffer > + */ > GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); > checkGLcall("glDeleteBuffersARB"); > LEAVE_GL(); > @@ -159,6 +162,8 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) > LEAVE_GL(); > This->dirtystart = 0; > This->dirtyend = 0; > + /* TODO: Move loading into preload when the buffer is used, that avoids dirtifying the state */ > + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_INDEXBUFFER); > } > return WINED3D_OK; > } > > > ------------------------------------------------------------------------ > >

3 6

Update on msi JScript/VBScript support functions
by Misha Koshelev 24 Feb '07

24 Feb '07

Hi, just wanted to update everybody on my work with this, sorry I have not been good at replying to personal emails lately. I am not currently attaching any code but will clean things up and then submit my patches to wine-patches soon. So, the good news is that, as a proof of concept, I have gotten the Vector NTI installer to work successfully, which requires the JScript functionality. Specifically, this tests custom actions 5/6 and 37/38, there are two other sets that would be nice to test (but it is all the same script handler so it should work). Also, to make this work, I had to implement the OLE automation interface. Now, I have not implemented the entire interface yet, but I have made the entire .tlb file for this and made a framework which makes implementing everything fairly straightforward (and everything is a wrapper around the existing MSI database functions, so there is no actual functionality, it is just adding new cases to the switch statements that call the MSI database functions appropriately). Basically, because of the MSI design where everything that is an object has an MSIHANDLE, I have made one Automation Object that each specific object "inherits" from by implementing its invoke function (minus basic parameter checking, etc. which is all done by the automation object) and passing it to create_automation_object with its CLSID. It is pretty easy to implement more functions, and I will try to keep on adding more, probably as patches that I will periodically send to wine-patches. Anyhow, look for my first patches in the next couple of days. Misha

1 3

Re: [1/2] comctl32: add WM_PAINT message sequence tests
by James Hawkins 24 Feb '07

24 Feb '07

On 2/23/07, Felix Nawothnig <flexo(a)holycrap.org> wrote: > Passed on XP SP2. > --- > dlls/comctl32/tests/listview.c | 209 > +++++++++++++++++++++++++++++++++++++++- > dlls/comctl32/tests/msg.c | 3 + > dlls/comctl32/tests/msg.h | 3 +- > 3 files changed, 211 insertions(+), 4 deletions(-) > This is wrong: +static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct subclass_info *info = (struct subclass_info *)GetWindowLongA(hwnd, GWL_USERDATA); + static long defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + trace("header: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam|hdr; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, LISTVIEW_SEQ_INDEX, &msg); + + defwndproc_counter++; + ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + return ret; +} If you're subclassing the header control and checking messages from the header control, then you need to add another message sequence, HEADER_SEQ_INDEX. --- a/dlls/comctl32/tests/msg.c +++ b/dlls/comctl32/tests/msg.c @@ -158,6 +158,9 @@ void ok_sequence_(struct msg_sequence ** ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), "%s: the msg 0x%04x should have been sent by a winevent hook\n", context, expected->message); + ok_(file, line) ((expected->flags & hdr) == (actual->flags & hdr), + "%s: the msg 0x%04x should have been sent by the header control\n", + context, expected->message); expected++; actual++; } msg.c is the message sequence testing code abstracted...keyword is abstraction. Nothing in msg.c should know anything about specific types of controls. -- James Hawkins

2 2

Message spy log viewer
by Felix Nawothnig 23 Feb '07

23 Feb '07

Hi. I just figured I never told anyone (did I?) - a while ago I wrote a Ruby/GTK2 tool to parse +message logs (along with other channels mixed in) and display them in a treeview - makes debugging message related problems much easier. I suppose others wrote similar scripts for their own use - but maybe someone will find it useful nevertheless: http://users.holycrap.org/flexo/spy.rb Use like: $ WINEDEBUG="+message" wine foo.exe 2>log $ ruby spy.rb log Felix

1 0

Sound problems with Alice
by gslink 23 Feb '07

23 Feb '07

In the past I have always used the demo version of the game Alice to test Wine. Recently I loaded a Wine installation and found the game had no sound. After considerable testing it appears that about a year ago a change was made in Wine that killed the sound. Has anyone else had this problem and does it affect anything else? On my loads most other things seem to have sound.

2 1

Re: msi: Free the data for type msidbCustomActionTypeContinue custom actions after DllThread executes
by James Hawkins 23 Feb '07

23 Feb '07

On 2/23/07, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > This fixes bug 7461. http://bugs.winehq.org/show_bug.cgi?id=7461 > > Changelog: > * Free the data for type msidbCustomActionTypeContinue custom actions > after DllThread executes. > > dlls/msi/custom.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > Please ignore this patch. It's not exactly correct. -- James Hawkins

1 0

RE: unicoding xcopy - question on wcschr
by Ann & Jason Edmeades 23 Feb '07

23 Feb '07

For reference: 'obviously'... adding this line to the makefile solves it MODCFLAGS = -fno-builtin (Copied from msvcrt\tests) Jason

1 0

unicoding xcopy - question on wcschr
by Ann & Jason Edmeades 23 Feb '07

23 Feb '07

Hi, Trying to convert my xcopy to Unicode proved simple on windows, but when putting into wine has proved more interesting. Most of the wide string calls are like lstrcmpW and they all work fine, but I really need the Unicode equivalent to strchr and strrchr. As far as I can tell my only option is wcschr. If I build as-is, I get errors saying wcschr is implicitly defined but the link etc is all ok (from a url http://fgouget.free.fr/wine/PrgApps/Chap7.shtml#filerev it implies this is because I am using the GNU C headers, and they don't define it in string.h). Grepping the source, I can only find a hit inside the msvcrt/string.h or wchar.h. If I add to the makefile EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt, to ensure I pick up the wine headers, I now get warnings like: ./../include/msvcrt/ctype.h:72: warning: conflicting types for built-in function 'iswalnum' How do I #include / link a program using this function? It all just worked under windows :-) Jason

1 0

Progress in implementation of Direct3D
by Mirek 23 Feb '07

23 Feb '07

Hi, i would like to say "Thanks for your work!" to all wine developers. In past months there was realy big progress in implementation of Direct3D in wine (that part is most important for me) and other parts such Dinput, so I would like to introduce you some more sreenshots from latest Direct3D applications. I will try to post them on official wine website. To run third benchmark in 3DMark 2005 I used wined3d_3dmark05.diff.txt patch (from H. Verbeet) To run Call of Dutty 2 I used cod2.diff patch (my latest modification of patch against current CVS) All screenshots are from today CVS 20.02.2007 without patch "[9/10] WineD3D: Use VBOs for index buffers" which caused some regressions. http://headline.czela.net/Mirek/wine/ or via IP: http://62.240.181.87/Mirek/wine/ --- dlls/wined3d/directx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 841e16f..ca3eaaf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -585,7 +585,7 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); TRACE_(d3d_caps)(" FOUND: ARB Multitexture support - GL_MAX_TEXTURE_UNITS_ARB=%u\n", gl_max); gl_info->supported[ARB_MULTITEXTURE] = TRUE; - gl_info->max_textures = min(MAX_TEXTURES, gl_max); + gl_info->max_textures = 8; gl_info->max_texture_stages = min(MAX_TEXTURES, gl_max); gl_info->max_samplers = max(gl_info->max_samplers, gl_max); } else if (strcmp(ThisExtn, "GL_ARB_texture_cube_map") == 0) { @@ -2196,7 +2196,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->MaxVertexBlendMatrixIndex = 1; *pCaps->MaxAnisotropy = GL_LIMITS(anisotropy); - *pCaps->MaxPointSize = GL_LIMITS(pointsize); + *pCaps->MaxPointSize = 64.0f; *pCaps->VertexProcessingCaps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS | @@ -2294,7 +2294,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->NumSimultaneousRTs = GL_LIMITS(buffers); - *pCaps->StretchRectFilterCaps = 0; + *pCaps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFLINEAR | + WINED3DPTFILTERCAPS_MAGFLINEAR; *pCaps->VertexTextureFilterCaps = 0; if(*pCaps->VertexShaderVersion == WINED3DVS_VERSION(3,0)) {

3 2

0.9.31 not suitable for gaming
by Pavel Troller 23 Feb '07

23 Feb '07

Hi! I've tried 0.9.31 and it seems that there is a regression in at least two games: - Fallout Tactics (BOS.exe): Shows a dialog stating "C:\dev\phoenix\display\win32\win32_window.cpp(873): **fatal error**: Could not create display buffers" and then another one about abnormal termination of the program and quits. - Steam based games, mainly HL2: During game load, the screen goes black. Moving the cursor causes sound effects as it hovers across the menus and buttons, so the program runs, but nothing can be seen. Both those games are known to work with wine at about a half between .29 and .30. I tried it with basic .31 as well as with today's git update. Are those regressions known and is it a work in progress, or should I make a bisecting session to find the problem ? With regards, Pavel Troller

5 19

Re: How complete will Wine ever be for older apps?
by Juan Lang 23 Feb '07

23 Feb '07

> I'm just trying to build up a picture in my head of whether there > will come a day when Wine users can pick an app designed for a > previous generation of Windows and expect it to work flawlessly > (ignoring things that try to manipulate the hardware directly, I > suppose)? Or will there always be incompatibilities? There will (likely) always be incompatibilities. Wine development has always been driven by app compatibility - someone picks an app and tries to run it, and tries to fix problems they come across. We don't aim for feature completeness - Windows is far, far too big to replicate with the resources we have. So, some apps (the ones developers have worked on, and likely others) will work quite well, while others (those that haven't been worked on) may not work as well. --Juan ____________________________________________________________________________________ TV dinner still cooling? Check out "Tonight's Picks" on Yahoo! TV. http://tv.yahoo.com/

2 1

RE: a big fan (now with bad news)
by Jeffrey Sabarese 23 Feb '07

23 Feb '07

hello there! thanks to all of you who replied to my inquiry about "ies4linux" vs compatibility w/ such "Windows-native" apps as Bradbury "TopStyle", HomeSite, etc... As Joris stated, IE6 sp1 is available at the MS site. I downloaded my own copy, but i haven't tried it yet because i think i "ruined" my WinE this evening. HOW? as my UserID (NOT as root), i "re installed" the [.reg] files in the ies4linux "faux directories" (as in a command such as :: [ wine '../win.reg' ]) . I tried [ yum remove wine ], and then [yum install wine] which went without a hitch, but there's no change in my Primary User (the broken one) HOWEVER, WinE continues to run perfectly under other user accounts, and ROOT. My QUESTION: How do i "restore" my WinE to a working state for my UserID? (because only UserID is affected) I wish to not destroy my Program Files while "repairing" WinE around it--- if possible. >From the primary UserID only, i can NOT launch [ winecfg.exe ] for example in terminal, or anything WinE that i can tell. ([while root, and other users were apparently not affected]) please help me to restore my "existing" Program files setup, if possible. it is no "tragedy" if i can not, but i'd like to try. in any event-- i do need to know how to "restore" it, maintaining program files or not. thank you!! best regards, -JS. On 2/21/07, SorinN <nemes.sorin(a)gmail.com> wrote: > Indeed - ies4linux - don't use Wine folders - on other words - it use > winelib but is on other place, where TopStyle and other windows > programs don't know to look. I will try to talk with it's developer to > suggest him to use an existing Wine installation ( is Wine exist > already ). > > > > 2007/2/19, Jeffrey Sabarese <core5fedora(a)gmail.com>: > > hi there! I have to wonder if i don't use WinE more than the "average" > > Fedora Core 5 user. I am forever trying to figure out how to run my > > old Windows apps here in the linux environment, using your incredible > > software. > > -- /* ************************************************ */ Quanta+ Web Development IDE: http://quanta.kdewebdev.org/ Quanta+ Wiki: http://tinyurl.com/3dzqxk Other Quanta Tips: http://invisiblepixels.org/progs/quanta.html /* ************************************************ */

2 1

Re: winex11.drv: Set the refresh rate for the virtual desktop to 60
by H. Verbeet 23 Feb '07

23 Feb '07

On 23/02/07, Jan Zerebecki <jan.wine(a)zerebecki.de> wrote: > From: Jan Zerebecki <jan.wine(a)zerebecki.de> > Changelog: > winex11.drv: Set the refresh rate for the virtual desktop to 60 > instead of 0. If HKCU\Software\Wine\X11 Driver\FakeRefreshRate is > set, it is interpreted as a comma delimited list of refresh rates > to use instead. > --- Perhaps there should be a winecfg option for this, together with the one that already exists for the resolution.

4 5

Re: xcopy support try 1...
by Detlef Riekenberg 23 Feb '07

23 Feb '07

On Do, 2007-02-22 at 21:52 +0000, Ann & Jason Edmeades wrote: > Firstly, I am not sure I have included everything correctly to define a new > directory in the build tree, With git, you only need to add all the new files to the Index ("git-update-index --add programs/xcopy/Makefile.in" as Example) and only that changes should be send. tools/make_makefiles does the rest, so you compile and test your new app. > I have only implemented the basics, Converting to unicode later is much harder. I suggest to use UNICODE from the begining. An example UNICODE console app is "programs/msiexec/*" When you really want to have also an ansi-version (for DOS or win9x as example), you can use TCHAR and test your app with and without "#define UNICODE". UNICODE is prefered and you avoid converting a lot of data, when the app is running. > which is file and subdirectory > copying plus the simple reporting information. The Patch would be even smaller, when you do no copy at all or just do a Filecopy without recursion / Parameter-Parsing (wildcards ) > + * According to http://www.microsoft.com/technet/archive/msdos/comm8.mspx?mfr=true Please remove that ref. Many URLs are a dead link really fast. -- By by ... Detlef

2 1

Re: ntdll: implement NtAllocateLocallyUniqueId with server call
by Robert Shearman 22 Feb '07

22 Feb '07

Juan Lang wrote: > This introduces a warning in trace.c about dump_luid being undeclared. > trace.c seems to be at least partially generated, so I wasn't sure about > sending a patch for it. Let me know how I should handle that and I'll fix > it up. > Hi Juan, dump_luid needs to be in trace.c. As you say, it is partially generated: > /* Everything below this line is generated automatically by > tools/make_requests > */ > /* ### make_requests begin ### */ So just put dump_luid above that line and it'll be fine. -- Rob Shearman

1 0

Re: wine.inf: Update the timezone information.
by Uwe Bonnes 22 Feb '07

22 Feb '07

>>>>> "Francois" == Francois Gouget <fgouget(a)codeweavers.com> writes: Francois> --- I have used two sources to update Wine's timezone data: ... Francois> The display name was set to the Olson database ids and I have Francois> kept it that way as it seems to match what is displayed on Francois> Linux. Wherever we used old names I switched to the new names Francois> as specified in the Olson database. Francois> We still have a few differences with the Windows data and in a Francois> few instances I diverged from the CLDR mapping to tzids. I Francois> will now summarize all these differences in bug 7295. How do internaltional version of Windows get the localized names of the pletora of timezones? -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 1

WineConf 2007 Fundraiser proposal
by Tom Wickline 22 Feb '07

22 Feb '07

Hello Everyone, On February 14th I made a suggestion on the wine-conf mailing list that we should have a annual Fund Raiser to help raise funds for our annual Conference. http://www.winehq.org/pipermail/wineconf/2007-February/000397.html Jeremy replied with his thoughts/suggestions and some back ground info on how the WPF funds have helped in the past. http://www.winehq.org/pipermail/wineconf/2007-February/000403.html >From this, I cobbled together a extremely rough Donations page.. Keep in mind this is still very much a work in progress and the language within it needs major revisions. http://www.winehq.org/pipermail/wineconf/2007-February/000425.html The current discussion is now on whether or not a $1,000 donation is sufficient for a front page listing for one year since our search rank in so high. Dan suggested that we join adsence, and I replied that I had already suggested this in the past. http://www.winehq.org/pipermail/wineconf/2007-February/000437.html At this point there are many undecided questions about the original suggestion of us having a fund raiser, as well as if we should join adsence. If you have a opinion on this subject we would like (even suggest) that you to air them at this time before decisions are made. http://www.winehq.org/pipermail/wineconf/2007-February/000440.html Questions: Should we have a annual fundraiser to help with conference expenses? Thus far the consciences is Yes. What is a realistic goal? I believe $10,000 is very doable. What amount should we receive for a front page listing 'gold sponsor'? Is $10,000 to much or to small of a amount? If we decide on $10,000 the goal should be revised to about $25,000 Should the Wine project join the adsence network? With our high google page rank we are practically guaranteed to rake in a mint :D Comments and suggestions are at this time highly suggested! Tom

2 2

How complete will Wine ever be for older apps?
by Jules Richardson 22 Feb '07

22 Feb '07

Sort of an open-ended question to developers :) It's obvious that Wine functionality will always lag behind Windows releases somewhat. But how accurate / complete do people think it will eventually be against older Windows releases? Is much development work even still being done on things that don't quite work as expected within apps that were current at the time of say NT4? I'm just trying to build up a picture in my head of whether there will come a day when Wine users can pick an app designed for a previous generation of Windows and expect it to work flawlessly (ignoring things that try to manipulate the hardware directly, I suppose)? Or will there always be incompatibilities? cheers Jules

1 0

Re: [DSOUND] Implement a locking mechanism
by M.B. Lankhorst 22 Feb '07

22 Feb '07

Robert Reif wrote: > You shouldn't need to make any changes to direct sound. You just need > to remove the flag DSDDESC_DONTNEEDPRIMARYLOCK from alsa and make the > necessary changes in alsa. The direct sound hardware primary buffer > locking support is already in primary.c. You are right, partially, primary.c already has support for it, but that is only used when the application chooses to write to the primary buffer directly, in most cases the primary buffer is only used directly by the directsound mixer, and that's the case this patch is trying to handle. However the problem I have right now is that I miss some magic values so sound is a bit cumbersome, maybe someone with knowledge of dsound knows what I should put in there and be able to help me out a little. Maarten PS: CC to people you address in your emails, not everyone receives messages from wine-devel mailing lists.

1 0

message sequence testing - message flags
by Lei Zhang 22 Feb '07

22 Feb '07

Hi, In dlls/user32/tests/msg.c, there's the following enum: typedef enum { sent=0x1, posted=0x2, parent=0x4, wparam=0x8, lparam=0x10, defwinproc=0x20, beginpaint=0x40, optional=0x80, hook=0x100, winevent_hook=0x200 } msg_flags_t; Can someone explain what these flags mean? parent defwinproc beginpaint hook winevent_hook - Lei

2 1

Re: [DSOUND] Implement a locking mechanism
by Robert Reif 22 Feb '07

22 Feb '07

Maarten Lankhorst wrote: >[DSOUND] Implement a locking mechanism > >Attempt to implement locking in dsounds mixer. > >Sadly horribly broken, I'm posting this in the hope someone knows what >magic values to fill in at the first "if (lock)" .. I really have no clue. > >As stated before it is required to be used with previous winealsa patch. > >Right now it also calls Unlock with lockamount as argument, this should >probably be changed to how much is actually written to (frag), but that >part doesn't really matter much I think, it's more important to get the >first Lock() right. > > You shouldn't need to make any changes to direct sound. You just need to remove the flag DSDDESC_DONTNEEDPRIMARYLOCK from alsa and make the necessary changes in alsa. The direct sound hardware primary buffer locking support is already in primary.c.

1 0

Re: [PATCH 2/3] server: Fix get_handle for global handles. It doesn't need process for them.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Vitaliy Margolen <wine-patches(a)kievinfo.com> writes: > Resend as-is. I need this function to work on global handles when > process is NULL. If you need this you are doing something wrong. Callers are not supposed to know that a handle is global. -- Alexandre Julliard julliard(a)winehq.org

2 6

Re: resend : gdi32:WidenPath partial implementation
by Alexandre Julliard 21 Feb '07

21 Feb '07

Laurent Vromman <laurent(a)vromman.org> writes: > + > + dc = DC_GetDCPtr( hdc ); You shouldn't need that, the caller has done it already. Simply pass a DC* to this function. > + if(pPath->state != PATH_Closed) { > + ERR("Path Closed\n"); > + return FALSE; > + } > + > + hPen = SelectObject(hdc, GetStockObject(DC_PEN)); You shouldn't select a new pen into the DC, just use the current one. > + case PT_BEZIERTO: > + // should never happen because of the FlattenPath call Please avoid C++ comments. > + default: > + ERR("Got path flag %d\n", (INT)pPath->pFlags[i]); Please avoid casts like this, use the correct printf format instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [10/13] D3D9: Fix the circular converted vertex declaration reference
by H. Verbeet 21 Feb '07

21 Feb '07

On 20/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > If anyone knows a nicer way to release the converted declaration from > SetVertexDeclaration feel free to comment. > > Not applying this patch won't affect patches 11-13 > Wouldn't it be better to directly compare This against convertedDecl from the device in IDirect3DVertexDeclaration9Impl_Release, rather than adding a convertedDecl flag to IDirect3DVertexDeclaration9Impl and setting / unsetting it? I think it makes things harder than it has to be. Also, afaik Ivan has some tests for the exact behaviour.

2 1

Working on JScript/VBScript support for MSI
by Misha Koshelev 20 Feb '07

20 Feb '07

Hi, since MSDN states that any installer that requires JScript/VBScript must make sure to install it, and since some applications require these for install (bug #7353 and another one is there for VBScript for a different installer), I figure there is no reason why builtin MSI cannot use Microsoft Script if it is there (and plus when we have our own JScript/VBScript we will be able to use it off the bat with MSI). I have posted my initial work on this on the bugzilla for bug #7353. The first file (a patch, will attach also) is my patch which updates custom.c to have the appropriate handlers for the custom action types, extracts the script from the appropriate place, writes it to a file, and uses a framework very similar to the current thread framework for DLLs to call my helper call_script function. This first patch, in theory, should not have to change much (if at all), although I have not thoroughly tested it yet so it probably will. The second file (and attached here too) is dlls/msi/script.c, which is where the meat and potatoes of the actual call_script function is/will be. Right now it is pretty barebones, but it does load the script from the file and calls it appropriately. Now I am working on implementing the Session object, although it looks like a wrapper around MSI functions we already have so I think it should be doable. Anyways, any comments on my work so far will be appreciated. Misha

2 3

Re: [9/10] WineD3D: Use VBOs for index buffers
by Mirek 20 Feb '07

20 Feb '07

Hi, this patch caused regression in many Direct3D games. TES IV: Oblivion can't start game (menu works), Flatout II is completly broken, Alpine Sky Racing 2007 can't run, HalfLife 2 EO can't run. I tried rewrite GLint vbo; to GLuint vbo; but it doesn't help. Mirek Stefan Dösinger napsal(a): > > ------------------------------------------------------------------------ > > From 4d52be700666b6b1e853bad296c502b5b0d76189 Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Mon, 19 Feb 2007 15:12:39 +0100 > Subject: [PATCH] WineD3D: Use VBOs for index buffers > > This patch uses (if available) gl vertex buffer objects for static d3d index buffers > to store indices in video memory. Therefore a new index buffer state is added which > binds the vbo to GL_ELEMENT_ARRAY_BUFFER. DrawStrided* use the index buffer stride to > tell if indices are used for drawing because a NULL index data pointer is valid now. > DrawStridedSlow has to read the indices from the index buffer if it is used, because > it can't use the data from the vbo(or only very inefficiently). > --- > dlls/wined3d/device.c | 68 ++++++++++++++++++++++++++++++++++++--- > dlls/wined3d/drawprim.c | 14 ++++++-- > dlls/wined3d/indexbuffer.c | 49 +++++++++++++++++++++++++++- > dlls/wined3d/state.c | 12 +++++++ > dlls/wined3d/wined3d_private.h | 8 ++++- > 5 files changed, 139 insertions(+), 12 deletions(-) > > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index 18f3e75..af0e96a 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -443,21 +443,67 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac > return WINED3D_OK; > } > > +static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferImpl *object) { > + GLenum error, glUsage; > + TRACE("Creating VBO for Index Buffer %p\n", object); > + > + ENTER_GL(); > + while(glGetError()); > + > + GL_EXTCALL(glGenBuffersARB(1, &object->vbo)); > + error = glGetError(); > + if(error != GL_NO_ERROR || object->vbo == 0) { > + ERR("Creating a vbo failed, continueing without vbo for this buffer\n"); > + object->vbo = 0; > + return; > + } > + > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->vbo)); > + error = glGetError(); > + if(error != GL_NO_ERROR) { > + ERR("Failed to bind index buffer, continueing without vbo for this buffer\n"); > + goto out; > + } > + > + /* Use static write only usage for now. Dynamic index buffers stay in sysmem, and due to the sysmem > + * copy no readback will be needed > + */ > + glUsage = GL_STATIC_DRAW; > + GL_EXTCALL(glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->resource.size, NULL, glUsage)); > + error = glGetError(); > + if(error != GL_NO_ERROR) { > + ERR("Failed to initialize the index buffer\n"); > + goto out; > + } > + LEAVE_GL(); > + TRACE("Successfully created vbo %d for index buffer %p\n", object->vbo, object); > + return; > + > +out: > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > + GL_EXTCALL(glDeleteBuffersARB(1, &object->vbo)); > + LEAVE_GL(); > + object->vbo = 0; > +} > + > static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface, UINT Length, DWORD Usage, > WINED3DFORMAT Format, WINED3DPOOL Pool, IWineD3DIndexBuffer** ppIndexBuffer, > HANDLE *sharedHandle, IUnknown *parent) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > IWineD3DIndexBufferImpl *object; > TRACE("(%p) Creating index buffer\n", This); > - > + > /* Allocate the storage for the device */ > D3DCREATERESOURCEOBJECTINSTANCE(object,IndexBuffer,WINED3DRTYPE_INDEXBUFFER, Length) > - > - /*TODO: use VBO's */ > - if (Pool == WINED3DPOOL_DEFAULT ) { /* Allocate some system memory for now */ > + > + if (Pool == WINED3DPOOL_DEFAULT ) { /* We need a local copy for drawStridedSlow */ > object->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,object->resource.size); > } > > + if(Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { > + CreateIndexBufferVBO(This, object); > + } > + > TRACE("(%p) : Len=%d, Use=%x, Format=(%u,%s), Pool=%d - Memory@%p, Iface@%p\n", This, Length, Usage, Format, > debug_d3dformat(Format), Pool, object, object->resource.allocatedMemory); > *ppIndexBuffer = (IWineD3DIndexBuffer *) object; > @@ -2557,10 +2603,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetIndices(IWineD3DDevice *iface, IWine > return WINED3D_OK; > } > > - /* So far only the base vertex index is tracked */ > + /* The base vertex index affects the stream sources, while > + * The index buffer is a seperate index buffer state > + */ > if(BaseVertexIndex != oldBaseIndex) { > IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); > } > + if(oldIdxs != pIndexData) { > + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); > + } > return WINED3D_OK; > } > > @@ -4224,9 +4275,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * > UINT idxStride = 2; > IWineD3DIndexBuffer *pIB; > WINED3DINDEXBUFFER_DESC IdxBufDsc; > + GLint vbo; > > pIB = This->stateBlock->pIndexData; > This->stateBlock->streamIsUP = FALSE; > + vbo = ((IWineD3DIndexBufferImpl *) pIB)->vbo; > > TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d\n", This, > PrimitiveType, debug_d3dprimitivetype(PrimitiveType), > @@ -4245,7 +4298,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * > } > > drawPrimitive(iface, PrimitiveType, primCount, 0, NumVertices, startIndex, > - idxStride, ((IWineD3DIndexBufferImpl *) pIB)->resource.allocatedMemory, minIndex); > + idxStride, vbo ? NULL : ((IWineD3DIndexBufferImpl *) pIB)->resource.allocatedMemory, minIndex); > > return WINED3D_OK; > } > @@ -4310,6 +4363,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * > This->stateBlock->loadBaseVertexIndex = 0; > /* Mark the state dirty until we have nicer tracking of the stream source pointers */ > IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); > + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); > > drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* vertexStart */, NumVertices, 0 /* indxStart */, idxStride, pIndexData, MinVertexIndex); > > @@ -4332,8 +4386,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveStrided (IWineD3DDevice *i > * that value. > */ > IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); > + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); > This->stateBlock->baseVertexIndex = 0; > This->up_strided = DrawPrimStrideData; > + This->stateBlock->streamIsUP = TRUE; > drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0, 0, 0, 0, NULL, 0); > This->up_strided = NULL; > return WINED3D_OK; > diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c > index 2cc3a15..7cf6877 100644 > --- a/dlls/wined3d/drawprim.c > +++ b/dlls/wined3d/drawprim.c > @@ -571,7 +571,7 @@ static void drawStridedFast(IWineD3DDevice *iface,UINT numberOfVertices, GLenum > const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > > - if (idxData != NULL /* This crashes sometimes!*/) { > + if (idxSize != 0 /* This crashes sometimes!*/) { > TRACE("(%p) : glElements(%x, %d, %d, ...)\n", This, glPrimitiveType, numberOfVertices, minIndex); > idxData = idxData == (void *)-1 ? NULL : idxData; > #if 1 > @@ -629,7 +629,15 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData > TRACE("Using slow vertex array code\n"); > > /* Variable Initialization */ > - if (idxData != NULL) { > + if (idxSize != 0) { > + /* Immediate mode drawing can't make use of indices in a vbo - get the data from the index buffer. > + * If the index buffer has no vbo(not supported or other reason), or with user pointer drawing > + * idxData will be != NULL > + */ > + if(idxData == NULL) { > + idxData = ((IWineD3DIndexBufferImpl *) This->stateBlock->pIndexData)->resource.allocatedMemory; > + } > + > if (idxSize == 2) pIdxBufS = (const short *) idxData; > else pIdxBufL = (const long *) idxData; > } > @@ -1165,7 +1173,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; > IWineD3DStateBlockImpl *stateblock = This->stateBlock; > > - if (idxData == NULL) { > + if (idxSize == 0) { > /* This is a nasty thing. MSDN says no hardware supports that and apps have to use software vertex processing. > * We don't support this for now > * > diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c > index 39a270d..0f768ac 100644 > --- a/dlls/wined3d/indexbuffer.c > +++ b/dlls/wined3d/indexbuffer.c > @@ -58,6 +58,15 @@ static ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) > ULONG ref = InterlockedDecrement(&This->resource.ref); > TRACE("(%p) : Releasing from %d\n", This, ref + 1); > if (ref == 0) { > + if(This->vbo) { > + ENTER_GL(); > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > + checkGLcall("glBindBufferARB"); > + GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); > + checkGLcall("glDeleteBuffersARB"); > + LEAVE_GL(); > + } > + > IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); > HeapFree(GetProcessHeap(), 0, This); > } > @@ -108,13 +117,49 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_GetParent(IWineD3DIndexBuffer *ifa > ****************************************************** */ > static HRESULT WINAPI IWineD3DIndexBufferImpl_Lock(IWineD3DIndexBuffer *iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) { > IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; > - TRACE("(%p) : no real locking yet, offset %d, size %d, Flags=%x\n", This, OffsetToLock, SizeToLock, Flags); > + TRACE("(%p) : offset %d, size %d, Flags=%x\n", This, OffsetToLock, SizeToLock, Flags); > + > + InterlockedIncrement(&This->lockcount); > *ppbData = (BYTE *)This->resource.allocatedMemory + OffsetToLock; > + > + if(Flags & (WINED3DLOCK_READONLY | WINED3DLOCK_NO_DIRTY_UPDATE) || This->vbo == 0) { > + return WINED3D_OK; > + } > + > + if(This->dirtystart != This->dirtyend) { > + if(This->dirtystart > OffsetToLock) This->dirtystart = OffsetToLock; > + if(SizeToLock) { > + if(This->dirtyend < OffsetToLock + SizeToLock) This->dirtyend = OffsetToLock + SizeToLock; > + } else { > + This->dirtyend = This->resource.size; > + } > + } else { > + This->dirtystart = OffsetToLock; > + if(SizeToLock) > + This->dirtyend = OffsetToLock + SizeToLock; > + else > + This->dirtyend = This->resource.size; > + } > + > return WINED3D_OK; > } > static HRESULT WINAPI IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) { > IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; > - TRACE("(%p) : stub\n", This); > + unsigned long locks = InterlockedDecrement(&This->lockcount);; > + TRACE("(%p)\n", This); > + > + /* For now load in unlock */ > + if(locks == 0 && This->vbo) { > + ENTER_GL(); > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, This->vbo)); > + checkGLcall("glBindBufferARB"); > + GL_EXTCALL(glBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, > + This->dirtystart, This->dirtyend - This->dirtystart, This->resource.allocatedMemory + This->dirtystart)); > + checkGLcall("glBufferSubDataARB"); > + LEAVE_GL(); > + This->dirtystart = 0; > + This->dirtyend = 0; > + } > return WINED3D_OK; > } > static HRESULT WINAPI IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, WINED3DINDEXBUFFER_DESC *pDesc) { > diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c > index 0b96e54..f78720a 100644 > --- a/dlls/wined3d/state.c > +++ b/dlls/wined3d/state.c > @@ -3062,6 +3062,17 @@ static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D > checkGLcall("glScissor"); > } > > +static void indexbuffer(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { > + if(GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { > + if(stateblock->streamIsUP || stateblock->pIndexData == NULL ) { > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > + } else { > + IWineD3DIndexBufferImpl *ib = (IWineD3DIndexBufferImpl *) stateblock->pIndexData; > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, ib->vbo)); > + } > + } > +} > + > const struct StateEntry StateTable[] = > { > /* State name representative, apply function */ > @@ -4077,6 +4088,7 @@ const struct StateEntry StateTable[] = > { /*511, WINED3DTS_WORLDMATRIX(255) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), transform_worldex }, > /* Various Vertex states follow */ > { /* , STATE_STREAMSRC */ STATE_VDECL, vertexdeclaration }, > + { /* , STATE_INDEXBUFFER */ STATE_INDEXBUFFER, indexbuffer }, > { /* , STATE_VDECL */ STATE_VDECL, vertexdeclaration }, > { /* , STATE_VSHADER */ STATE_VDECL, vertexdeclaration }, > { /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport }, > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 3bf0c8e..be8cd6e 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -426,8 +426,10 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, > > #define STATE_STREAMSRC (STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)) + 1) > #define STATE_IS_STREAMSRC(a) ((a) == STATE_STREAMSRC) > +#define STATE_INDEXBUFFER (STATE_STREAMSRC + 1) > +#define STATE_IS_INDEXBUFFER(a) ((a) == STATE_INDEXBUFFER) > > -#define STATE_VDECL (STATE_STREAMSRC + 1) > +#define STATE_VDECL (STATE_INDEXBUFFER + 1) > #define STATE_IS_VDECL(a) ((a) == STATE_VDECL) > > #define STATE_VSHADER (STATE_VDECL + 1) > @@ -793,6 +795,10 @@ typedef struct IWineD3DIndexBufferImpl > const IWineD3DIndexBufferVtbl *lpVtbl; > IWineD3DResourceClass resource; > > + GLuint vbo; > + UINT dirtystart, dirtyend; > + LONG lockcount; > + > /* WineD3DVertexBuffer specifics */ > } IWineD3DIndexBufferImpl; > > > > ------------------------------------------------------------------------ > >

2 3

Re: Rediffed patch from Rein Klazes:winex11.drv:Add pointer check in X11DRV_SetDIBits
by Felix Nawothnig 20 Feb '07

20 Feb '07

Louis. Lenders wrote: > + if( IsBadReadPtr( bits, nrsrcbytes)) return 0; AFAIK you should never use that function since it introduces a race con. Try using an exception handler around the memory access itself. Felix

1 0

wine-0.9.31 version is absent from bugzilla
by Vitaliy Margolen 20 Feb '07

20 Feb '07

Please whoever has powers to add new versions to bugzilla, can they please do that? Thanks. Vitaliy.

3 2

a big fan of your work
by Jeffrey Sabarese 20 Feb '07

20 Feb '07

hi there! I have to wonder if i don't use WinE more than the "average" Fedora Core 5 user. I am forever trying to figure out how to run my old Windows apps here in the linux environment, using your incredible software. If ever you seek a "test subject", or feedback of any kind, please don't hesitate to include me as a candidate for some "volunteer work". If i may be so bold, i wish to address an issue related to WinE and some Web Development software: I have been able to successfully install, and use the Web Dev IDE, HomeSite+ (as in "the homesite which comes w/ dreamweaver nowadays"). previous to this, i was unable to get Bradbury's TopStyle Lite to operate under WinE due to the inability to "find Internet Exlorer", yet it seems as though HomeSite opens TopStyle w/out it's dependecy on IE keeping it from opening (bypassing the "warning" you might say). [can i just say it's sooo cool to finally have TopStyle here in Linux!!! thank you!). I guess you could say then that my question for you is: "How might i go about trying to get IE6 to be "recognized" by such WinE-apps as TopStyle?" I have installed, and use the "ies4linux" ( here for more info if you're unfamiliar with it: http://novicenotes.com/install-internet-explorer-on-linux-under-wine-run-ie… ), but though it works VERY well launching from the Fedora Terminal, i can't seem to get it to be recognized by "Windows" (WinE) as an available Browser. The apps i've tried which seem unable to integrate it are i. EditPlus 2.x (current) ii. TSW WebCoder 5 (as TSW Webcoder 2005 ( Delphi ) will NOT run on WinE, though i wish i did as i have a purchased licence) iii. TopStyle Lite iv. HomeSite Dreamweaver 8 will both run on WinE, and execute "normally", the ies4linux IE6-- yet, obviously there is a primary difference in that IE is NOT integrated into DreamWeaver as "part of the app", as it is in WebCoder and TopStyle. My best guess is that those apps have some security measure preventing a "non-standard" IE to become part of its processes. who knows. anyway-- i thought there was something else, but i suppose that's more than enough b.s. from me from one sitting. good luck in your work! if you have any ideas for my situation, i'd appriciate your input. again, please don't hesitate to inquire if you'd like for me to "test" anything for you and report my findings. i realize you probably have a whole lot of people already out there, but feel free to add me to the list. thanks, --Jeff Sabarese

3 2

Re: [7/10] WineD3D: No bounds checking is done on sampler / texture numbers
by H. Verbeet 20 Feb '07

20 Feb '07

On 19/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: >- if(Sampler > GL_LIMITS(sampler_stages) || Sampler < 0 || Type > WINED3D_HIGHEST_SAMPLER_STATE || Type < 0) { This also checked the sampler state, not just the sampler.

4 5

Re: [PATCH 3/3] server: Check object's security when creating handles.
by Robert Shearman 20 Feb '07

20 Feb '07

Vitaliy Margolen wrote: > After > checking object's SD against token we fail some tests. > What it seems to me is that some one tried to "optimize" this part in > windows and instead created a security problem. If you already have a valid handle to the object, then it isn't really a security problem to have another one with the same access rights. > @@ -450,25 +453,34 @@ obj_handle_t duplicate_handle( struct pr > unsigned int access, unsigned int attr, unsigned int options ) > { > obj_handle_t res; > + struct handle_entry *entry; > + unsigned int src_access, dst_access; > struct object *obj = get_handle_obj( src, src_handle, 0, NULL ); > > if (!obj) return 0; > - if (options & DUP_HANDLE_SAME_ACCESS) > + if ((entry = get_handle( src, src_handle ))) > + src_access = entry->access; > + else /* pseudo-handle, give it full access */ > { > - struct handle_entry *entry = get_handle( src, src_handle ); > - if (entry) > - access = entry->access; > - else /* pseudo-handle, give it full access */ > - { > - access = obj->ops->map_access( obj, GENERIC_ALL ); > - clear_error(); > - } > + src_access = obj->ops->map_access( obj, GENERIC_ALL ); > + clear_error(); > } > - access &= ~RESERVED_ALL; > + src_access &= ~RESERVED_ALL; > + > + if (options & DUP_HANDLE_SAME_ACCESS) > + dst_access = src_access; > + else > + dst_access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; > + > + /* asking for more or the same/less access rights */ > + access = ~src_access & dst_access ? dst_access : 0; > + > if (options & DUP_HANDLE_MAKE_GLOBAL) > res = alloc_global_handle( obj, access ); > else > res = alloc_handle( dst, obj, access, attr ); > + if (res) get_handle( dst, res )->access = dst_access; > + > It would seem better to add an extra parameter to alloc_handle and alloc_global_handle to tell them to not check access rather than adding this hack. It should use less processor time and it should make patch 2 not necessary. -- Rob Shearman

2 1

Re: [00/16] CMD.exe patches
by Stefan Dösinger 20 Feb '07

20 Feb '07

Am Dienstag 20 Februar 2007 01:32 schrieb Ann & Jason Edmeades: > After being away from active development in wine for a while I wanted to > start somewhere easy, and picked some bugs from the bug database in the > wcmd (cmd.exe) shell. > > I think I got carried away, but the following patches fix some reported > bugs and lots of other issues I found while doing some playing within the > shell. > > All feedback welcome, although I think I need to lean to use git a bit > better! Did patches 1-5 get lost?

1 0

Re: [10/10] WineD3D: With FVFs only one stream is used
by H. Verbeet 20 Feb '07

20 Feb '07

Eventually, the FVF path should be removed from wined3d completely. We should convert the FVF in d3d8 to a vertex declaration, just like in d3d9.

2 2

Re: Comctl32 Status Bar Test
by Felix Nawothnig 20 Feb '07

20 Feb '07

Alex Arazi wrote: > - ok(rc.top == 2, "Expected 2, got %d\n", rc.top); > - ok(rc.bottom == 21, "Expected 21, got %d\n", rc.bottom); > - ok(rc.left == 0, "Expected 0, got %d\n", rc.left); > - ok(rc.right == 50, "Expected 50, got %d\n", rc.right); I didn't really look at your new tests but the second of those tests you removed failed ("got 1" IIRC) on Windows (XP) because we don't create a parent window (and because the 21 is wrong. Should be 22 IIRC) - native comctl32 sometimes does some strange stuff when a control doesn't have one - so the test should create it. Felix

2 1

Re: [PATCH 3/3] ntdll: fix up instruction pointer in context insideraise_exception
by Dmitry Timoshkov 20 Feb '07

20 Feb '07

"Peter Oberndorfer" <kumbayo84(a)arcor.de> wrote: > I'm not fully sure if the fixup also happens for other architectures > (i guess not) > so this patch is more a RFC > @@ -336,6 +336,10 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f > if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) > return STATUS_SUCCESS; > > + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ > + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) > + GET_IP(context) = (DWORD_PTR)GET_IP(context) - 1; Gary Nebbett's book "Windows Nt/2000 Native API Reference" in the section C "Exceptions and Debugging" provides a pseudocode for KiDispatchException (page 439, Example C.1), and it does exactly the same thing as the patch above. *But* it does it as a very first thing after getting the context and before sending the debugger event. -- Dmitry.

2 2

AppDB e-mail notifications.
by Vitaliy Margolen 20 Feb '07

20 Feb '07

Can some one fix e-mail notifications sent err. NOT sent from appdb? I have not received a single notification from the apps I am a super maintainer for! Except my own messages! On a side not, thanks to whomever that was who edited steam's howto and erased all the formatting! And they haven't even added themselves to the "laste changed by" entry. Vitaliy

1 0

Re: [8/10] WineD3D: Move the scissor rectangle to the state table,Stefan Dösinger
by Vitaliy Margolen 20 Feb '07

20 Feb '07

Stefan Dösinger wrote: > + if(memcmp(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)) == 0) { > + TRACE("App is setting the old scissor rectangle over, nothing to do\n"); > + return WINED3D_OK; > + } > memcpy(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)); You should use EqualRect() and CopyRect() instead of memcmp and memcpy for RECTs. Vitaliy

1 0

Re: [start][start] Output with console encoding
by Vitaliy Margolen 20 Feb '07

20 Feb '07

Anatoly Lyutin wrote: > Vitaliy Margolen wrote: >>> Changelog: >>> Fix output console to output with console encoding. >>> static void output(const char *message) >> >> This is not correct. This function and everything else, using it should >> be rewritten as unicode, not ansi. Also you should use >> HeapAlloc/HeapFree. >> > This program works with 8-bits strings and rewritten all "start" to > unicode is precocious because wineconsole now not yet support unicode in > curses mode (I`m working on it) :) > All you need to do is to convert output() function and all callers into WCHAR. Then you can do whatever magic you need inside of output(). Then you can properly load resources and deal with them properly until the step you need to display them. Vitaliy

1 0

re: XCOPY support
by Dan Kegel 20 Feb '07

20 Feb '07

Jason, >Hi, Looking at the cmd.exe bugs in the database, one is caused by a lack of >XCOPY support. I've been wishing for this for other reasons lately. Glad you're looking at it! >Does anyone have anything like this in their tree, or should >I try to knock something up? I'm not aware of anything like it in the wine tree. (It's tempting to borrow code from freedos, but they're GPL... still, you could peek at e.g. http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/xcopy/rxcopy/ and maybe ask the author to relicense if you like it.) >I also assume it needs to be a separate program, not part of cmd.exe, to >mimic how windows does it? Yes. BTW, it would be nice if you could include a conformace test of some sort. Maybe a batch file that reports problems by using echo FAIL ...reason... ? - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: generic.ppd does not appear in the build dir - cannot print
by Michael [Plouj] Ploujnikov 20 Feb '07

20 Feb '07

I have just finished confirming that this problem was indeed caused by some mess up in Gentoo's 32bit filesystem layout (as we discussed on IRC). A solution has been posted: http://wiki.winehq.org/WineOn64bit I am now able to print in Wine using CUPS, not Wine's generic.ppd, again. Thanks for the input. -- Libre Software: http://www.gnu.org/philosophy/free-sw.html

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