June 2008 - Wine-Devel - list.winehq.org

Re: inetmib1(1/5): Make table searching function into a generic helper, and use it to search all tables for instances (resend)
by Alexandre Julliard June 27, 2008

June 27, 2008

"Juan Lang" <juan.lang(a)gmail.com> writes: > Hi, these remaining five patches ended up on the cutting room floor. > Did this cause a test failure, or is there something else I missed? Yes, the tests fail: ../../../tools/runtest -q -P wine -M inetmib1.dll -T ../../.. -p inetmib1_test.exe.so main.c && touch main.ok main.c:190: Test failed: expected 7, got 1 main.c:196: Test failed: expected 7, got 1 main.c:202: Test failed: expected 7, got 1 main.c:190: Test failed: expected 8, got 2 main.c:196: Test failed: expected 8, got 2 main.c:202: Test failed: expected 8, got 2 main.c:190: Test failed: expected 9, got 3 main.c:196: Test failed: expected 9, got 3 main.c:202: Test failed: expected 9, got 3 main.c:190: Test failed: expected 10, got 4 main.c:196: Test failed: expected 10, got 4 main.c:202: Test failed: expected 10, got 4 main.c:190: Test failed: expected 11, got 5 main.c:196: Test failed: expected 11, got 5 main.c:202: Test failed: expected 11, got 5 etc... -- Alexandre Julliard julliard(a)winehq.org

1 0

in response to Alistair
by Christopher J. Ahrendt June 27, 2008

June 27, 2008

is the path getting passed in? OR is it in an ini file that is read... Either way you could parse the first few characters for the usual windows / dos format and branch that way....

3 2

re: Ok guys...
by Dan Kegel June 27, 2008

June 27, 2008

Your subject line was confusing; what's this about? Your patches seem malformed, they come across with question marks for tabs, e.g. --- context.c??? 2008-06-26 13:52:57.000000000 -0400 +++ context.c.patch1??? 2008-06-26 15:19:15.000000000 -0400 @@ -145,9 +145,7 @@ static int WineD3D_ChoosePixelFormat(IWi ? ???? DepthStencilFormat = WINED3DFMT_D24S8; ? -??? if(DepthStencilFormat) { -??????? getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); -??? } +??? getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); Perhaps you should resend, using a proper subject line, attaching one patch per message, and providing a good description of what each patch does. If you expect the patches to be applied, they need to go to wine-patches, not wine-devel.

3 3

gdiplus/graphicspath test crashes
by Paul Vriens June 27, 2008

June 27, 2008

Hi, I've noticed that the mentioned tests crashes when run via Paul Millar's winetest executable. Compiling myself and running the test works fine. Any one else seeing this? -- Cheers, Paul.

3 5

Re: README: Add Russian translation (2nd try)
by Nikolay Sivov June 26, 2008

June 26, 2008

Vladimir Pankratov wrote: > Hello. > > Changelog: > Added README.ru file. > Corrected some errors and fixed text formatting (as I think) since > last patch. > Thanks. Further suggestions: > Wine это программа которая позволяет запускать программы Microsoft > Windows (включая DOS, Windows 3.x и Win32) на Unix. Она состоит из > программы загрузки которая загружает и выполняет программы Microsoft > Windows,и библиотеки (Winelib) которая реализует вызовы Windows API > используя их Unix или X11 эквиваленты. Библиотека также может быть > использована для переноса кода Win32 в исполняемые файлы Unix. Lots of punctuation here. Such as: - "программа, которая" - "программы загрузки, которая" - "библиотеки (Winelib), которая" It's better to say: "портирования кода Win32 в среду Unix." > Каждый раз когда вы компилируете исходный код, рекомендуется использовать > Wine Installer для компоновки и установки Wine. The same: - "Каждый раз, когда" > Для того чтобы скомпилировать и запустить Wine, необходимо одно из следующих: - "Компиляция и запуск Wine поддерживается в следующих операционных системах:" > Linux версии 2.0.36 или выше > FreeBSD 7.0 или позже Choose a single. I think "или выше" is better. > Хорошо иметь текущую версию ядра You're right)..But it's better to say: - "Лучше использовать текущую версию ядра 2.4.х или 2.6.х" > Лучше всего компоновать Wine с инструментами GNU - "компоновать Wine инструментами GNU" > Внимание : установка gas *НЕ* обеспечивает что gcc будет его использовать. - "Внимание : установка gas *НЕ* гарантирует, что gcc будет его использовать." > Перекомпилируйте gcc после установки gas или слинковать cc, > as and ld to the gnu tools is said to be necessary. What's that? > NetBSD: > Будьте уверены что опции USER_LDT, SYSVSHM, SYSVSEM, и SYSVMSG > включены в вашем ядре. - "Убедитесь, что опции" - "SYSVSEM и SYSVMSG" > Мало проблем с совместимостью было получено используя файлы доступные через Samba. I think this should be paraphrased. > Конфигурационный скрипт выведет список дополнительных библиотек которые не были > найдены в вашей системе. - "дополнительных библиотек, которые" > На 64-битных платформах вы должны быть уверены что у вас установлены 32-битные > версии этих библиотек; смотрите http://wiki.winehq.org/WineOn64bit > для деталей. - "вы должны убедитсья, что"; - "за более подробной информацией обратитесь к http://wiki.winehq.org/WineOn64bit." > Затем введите "make clean", и пропачтите релиз: - "пропачьте" > Сначала не забудьте удалить любые конфликтные предыдущие установки Wine. Words missed. > Посетите Службу подержки на http://www.winehq.org/ дополнительных сведений. Something missed too. > wine notepad (using the search Path as specified in > wine notepad.exe the config file to locate the file) Untranslated part here. > Wine еще не завершен, поэтому некоторые программы могут вызывать ошибку. - "Wine находится в состоянии разработки, поэтому некоторые программы могут вызывать ошибку." > Во время ошибки вы будете направлены в отладчик для того чтобы вы могли > исследовать и решить проблему. - "в отладчик для того, чтобы вы могли" I think all main problems are here. Maybe some further revise is needed after commit so feel free to improve it please.

1 0

Re: msxml3: Added xml Input Callbacks to support loading files from aWine windows drive (try 2)
by Alistair Leslie-Hughes June 26, 2008

June 26, 2008

"Alistair Leslie-Hughes" <leslie_alistair(a)hotmail.com> wrote in message news:g3t5ej$qs7$1(a)ger.gmane.org... > +/* Support for loading xml files from a Wine Windows drive */ > +static int wineXmlMatchCallback (char const * filename) > +{ > + BSTR sFilename = bstr_from_xmlChar( (xmlChar*)filename); > + BSTR sColon = bstr_from_xmlChar( (xmlChar*)":"); > + int nRet = 0; > + > + TRACE("%s\n", debugstr_w(sFilename)); > + > + /* > + * We will deal with loading XML files from the file system > + * We only care about files that linux cannot find. > + * e.g. C:,D: etc > + */ > + if(iswalpha(sFilename[0]) && sFilename[1] == sColon[0]) > + nRet = 1; > + Hi, The file detection is what is causing this patch not to be accepted. For reference http://bugs.winehq.org/show_bug.cgi?id=11325 - Summary: This script attempts to load a script from disk with a windows path (Z:\blah\rooms\room1.xml), and libxml doesnt understand how to use load this file. During startup, libxml attempts to load its DTD's from the /etc/ directory, (it uses the format file:///etc/xml/DTD.xml), and we dont want to handle these files, but we do want to handle windows paths. What method can I use to detected a windows path verses a unix path? Best Regards Alistair Leslie-Hughes

1 0

Re: gdiplus: font.c: ensure to release resources
by Huw Davies June 26, 2008

June 26, 2008

Joris Huizer wrote: > A modified patch, taking hints into account from Huw Davies > You need to select out the hfont before deleting it. So the SelectObject should look like hfont_old = SelectObject(hdc, hfont); then after the GetTextMetrics do DeleteObject(SelectObject(hdc, hfont_old)) (then you don't need the two sets of DeleteObject) Huw.

2 1

Ok guys...
by celticht32＠aol.com June 26, 2008

June 26, 2008

Thank you so much for being patient and showing me how to do this.. with much help from everyone here is what the results are : Patch 1 : File : wine-1.0/dlls/wined3d/context.c --- context.c??? 2008-06-26 13:52:57.000000000 -0400 +++ context.c.patch1??? 2008-06-26 15:19:15.000000000 -0400 @@ -145,9 +145,7 @@ static int WineD3D_ChoosePixelFormat(IWi ? ???? DepthStencilFormat = WINED3DFMT_D24S8; ? -??? if(DepthStencilFormat) { -??????? getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); -??? } +??? getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); ? ???? /* Find a pixel format which EXACTLY matches our requirements (except for depth) */ ???? for(i=0; i<nCfgs; i++) { Patch 2: File: wine-1.0/dlls/wined3d/context.c --- context.c??? 2008-06-26 13:52:57.000000000 -0400 +++ context.c.patch2??? 2008-06-26 15:37:25.000000000 -0400 @@ -120,7 +120,9 @@ static int WineD3D_ChoosePixelFormat(IWi ???? int i = 0; ???? int nCfgs = This->adapter->nCfgs; ???? WineD3D_PixelFormat *cfgs = This->adapter->cfgs; - +??? PIXELFORMATDESCRIPTOR pfd; +??? BOOL exactDepthMatch = TRUE; +??????????? ???? TRACE("ColorFormat=%s, DepthStencilFormat=%s, auxBuffers=%d, numSamples=%d, pbuffer=%d, findCompatible=%d\n", ?????????? debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat), auxBuffers, numSamples, pbuffer, findCompatible); ? @@ -151,7 +153,6 @@ static int WineD3D_ChoosePixelFormat(IWi ? ???? /* Find a pixel format which EXACTLY matches our requirements (except for depth) */ ???? for(i=0; i<nCfgs; i++) { -??????? BOOL exactDepthMatch = TRUE; ???????? cfgs = &This->adapter->cfgs[i]; ? ???????? /* For now only accept RGBA formats. Perhaps some day we will @@ -180,13 +181,7 @@ static int WineD3D_ChoosePixelFormat(IWi ???????? if(cfgs->alphaSize != alphaBits) ???????????? continue; ? -??????? /* We try to locate a format which matches our requirements exactly. In case of -???????? * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ -??????? if(cfgs->depthSize < depthBits) -??????????? continue; -??????? else if(cfgs->depthSize > depthBits) -??????????? exactDepthMatch = FALSE; - +??????? ???????? /* In all cases make sure the number of stencil bits matches our requirements ????????? * even when we don't need stencil because it could affect performance EXCEPT ????????? * on cards which don't offer depth formats without stencil like the i915 drivers @@ -198,6 +193,13 @@ static int WineD3D_ChoosePixelFormat(IWi ???????? if(cfgs->numSamples != numSamples) ???????????? continue; ? +?????? /* We try to locate a format which matches our requirements exactly. In case of +???????? * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ +??????? if(cfgs->depthSize < depthBits) +??????????? continue; +??????? else if(cfgs->depthSize > depthBits) +??????????? exactDepthMatch = FALSE; + ???????? /* When we have passed all the checks then we have found a format which matches our ????????? * requirements. Note that we only check for a limit number of capabilities right now, ????????? * so there can easily be a dozen of pixel formats which appear to be the 'same' but @@ -216,12 +218,8 @@ static int WineD3D_ChoosePixelFormat(IWi ???????? } ???? } ? -??? /* When findCompatible is set and no suitable format was found, let ChoosePixelFormat choose a pixel format in order not to crash. */ -??? if(!iPixelFormat && !findCompatible) { -??????? ERR("Can't find a suitable iPixelFormat\n"); -??????? return FALSE; -??? } else if(!iPixelFormat) { -??????? PIXELFORMATDESCRIPTOR pfd; +??? if(!iPixelFormat) { + ? ???????? TRACE("Falling back to ChoosePixelFormat as we weren't able to find an exactly matching pixel format\n"); ???????? /* PixelFormat selection */ Chris Ahrendt P.S. THANKS everyone.. so now comments please? <G>

1 0

ok lets try this yet again
by celticht32＠aol.com June 26, 2008

June 26, 2008

I am sorry everyone for the spam =) been awhile since I developed stuff, been so used to designing things? =) here in all its glorry is the diff -u context.c context.c.new > diff.txt file I couldnt get the -c option to work so here is just the -u --- context.c??? 2008-06-26 13:52:57.000000000 -0400 +++ context.c.change??? 2008-06-26 14:32:48.000000000 -0400 @@ -116,13 +116,12 @@ ???? int iPixelFormat=0; ???? short redBits, greenBits, blueBits, alphaBits, colorBits; ???? short depthBits=0, stencilBits=0; - ???? int i = 0; ???? int nCfgs = This->adapter->nCfgs; -??? WineD3D_PixelFormat *cfgs = This->adapter->cfgs; ? -??? TRACE("ColorFormat=%s, DepthStencilFormat=%s, auxBuffers=%d, numSamples=%d, pbuffer=%d, findCompatible=%d\n", -????????? debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat), auxBuffers, numSamples, pbuffer, findCompatible); +??? WineD3D_PixelFormat *cfgs = This->adapter->cfgs; +??? BOOL exactDepthMatch = FALSE;? /*Changed june 23,08 */?? +??? PIXELFORMATDESCRIPTOR pfd;???? /*Changed june 23,08 */ ? ???? if(!getColorBits(ColorFormat, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { ???????? ERR("Unable to get color bits for format %s (%#x)!\n", debug_d3dformat(ColorFormat), ColorFormat); @@ -145,84 +144,91 @@ ? ???? DepthStencilFormat = WINED3DFMT_D24S8; ? -??? if(DepthStencilFormat) { -??????? getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); -??? } +/* Changed Section June 24,08 */ + +#if 0 +??? if(DepthStencilFormat) +????? {???????????????????? +??? getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); +??? } +#endif + +/* Just call getDepthStencilBits as the above IF will always in this case be true */ + +??? getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); ? ???? /* Find a pixel format which EXACTLY matches our requirements (except for depth) */ -??? for(i=0; i<nCfgs; i++) { -??????? BOOL exactDepthMatch = TRUE; +??? for(i=0; i<nCfgs; i++) +????? { ???????? cfgs = &This->adapter->cfgs[i]; - +??????????????????? ???????? /* For now only accept RGBA formats. Perhaps some day we will ????????? * allow floating point formats for pbuffers. */ ???????? if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) -??????????? continue; +?????????? continue; ? ???????? /* In window mode (!pbuffer) we need a window drawable format and double buffering. */ ???????? if(!pbuffer && !(cfgs->windowDrawable && cfgs->doubleBuffer)) -??????????? continue; +?????????? continue; ? -??????? /* We like to have aux buffers in backbuffer mode */ +?????? /* We like to have aux buffers in backbuffer mode */ ???????? if(auxBuffers && !cfgs->auxBuffers) -??????????? continue; +?????????? continue; ? ???????? /* In pbuffer-mode we need a pbuffer-capable format but we don't want double buffering */ ???????? if(pbuffer && (!cfgs->pbufferDrawable || cfgs->doubleBuffer)) -??????????? continue; +???????????? continue; ? -??????? if(cfgs->redSize != redBits) -??????????? continue; -??????? if(cfgs->greenSize != greenBits) -??????????? continue; -??????? if(cfgs->blueSize != blueBits) -??????????? continue; -??????? if(cfgs->alphaSize != alphaBits) -??????????? continue; - -??????? /* We try to locate a format which matches our requirements exactly. In case of -???????? * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ -??????? if(cfgs->depthSize < depthBits) -??????????? continue; -??????? else if(cfgs->depthSize > depthBits) -??????????? exactDepthMatch = FALSE; +??????? if ((cfgs->redSize != redBits) || (cfgs->greenSize != greenBits) || (cfgs->blueSize != blueBits) || (cfgs->alphaSize != alphaBits)) +???????????? continue; ? ???????? /* In all cases make sure the number of stencil bits matches our requirements ????????? * even when we don't need stencil because it could affect performance EXCEPT ????????? * on cards which don't offer depth formats without stencil like the i915 drivers ????????? * on Linux. */ -??????? if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize)) -??????????? continue; +??????? if((stencilBits != cfgs->stencilSize) && !((This->adapter->brokenStencil && stencilBits) <= cfgs->stencilSize)) +???????????? continue; ? ???????? /* Check multisampling support */ ???????? if(cfgs->numSamples != numSamples) -??????????? continue; +???????????? continue; ? -??????? /* When we have passed all the checks then we have found a format which matches our -???????? * requirements. Note that we only check for a limit number of capabilities right now, -???????? * so there can easily be a dozen of pixel formats which appear to be the 'same' but -???????? * can still differ in things like multisampling, stereo, SRGB and other flags. -???????? */ +??????? /* We try to locate a format which matches our requirements exactly. In case of +???????? * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ +???????? if (cfgs->depthSize !=? depthBits) +??????????? continue; ? ???????? /* Exit the loop as we have found a format :) */ -??????? if(exactDepthMatch) { +??????? if (exactDepthMatch) +?????????? { +??????????? TRACE("Exact Depth Match\n"); ???????????? iPixelFormat = cfgs->iPixelFormat; ???????????? break; -??????? } else if(!iPixelFormat) { +?????????? } +??????? if (!iPixelFormat) +????????? { ???????????? /* In the end we might end up with a format which doesn't exactly match our depth ????????????? * requirements. Accept the first format we found because formats with higher iPixelFormat ????????????? * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ + +??????????? TRACE("Emulating %d\n",cfgs->iPixelFormat); ???????????? iPixelFormat = cfgs->iPixelFormat; -??????? } +??????????? break; /* Added June 24,08 */ +????????? } ???? } ? ???? /* When findCompatible is set and no suitable format was found, let ChoosePixelFormat choose a pixel format in order not to crash. */ -??? if(!iPixelFormat && !findCompatible) { + +#if 0??? +if (!iPixelFormat && !findCompatible) +????? { ???????? ERR("Can't find a suitable iPixelFormat\n"); ???????? return FALSE; -??? } else if(!iPixelFormat) { -??????? PIXELFORMATDESCRIPTOR pfd; - +????? } +#endif +????? +??? if (!iPixelFormat) +????? { ???????? TRACE("Falling back to ChoosePixelFormat as we weren't able to find an exactly matching pixel format\n"); ???????? /* PixelFormat selection */ ???????? ZeroMemory(&pfd, sizeof(pfd)); @@ -235,16 +241,17 @@ ???????? pfd.cDepthBits = depthBits; ???????? pfd.cStencilBits = stencilBits; ???????? pfd.iLayerType = PFD_MAIN_PLANE; - +??????? ???????? iPixelFormat = ChoosePixelFormat(hdc, &pfd); -??????? if(!iPixelFormat) { -??????????? /* If this happens something is very wrong as ChoosePixelFormat barely fails */ -??????????? ERR("Can't find a suitable iPixelFormat\n"); -??????????? return FALSE; -??????? } -??? } +??????? if (!iPixelFormat) +????????? { +?????????? /* If this happens something is very wrong as ChoosePixelFormat barely fails */ +?????????? ERR("Can't find a suitable iPixelFormat\n"); +?????????? return FALSE; +????????? } +????? } ? -??? TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s\n", iPixelFormat, debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat)); +??? TRACE("Found iPixelFormat\n"); ???? return iPixelFormat; ?} ? @@ -372,6 +379,7 @@ ? ???????? /* If we still don't have a pixel format, something is very wrong as ChoosePixelFormat barely fails */ ???????? if(!iPixelFormat) { +??????????? TRACE("Choose Pixel Format Failed\n"); ???????????? ERR("Can't find a suitable iPixelFormat\n"); ???????????? return FALSE; ???????? } Better? Chris

4 3

Re: [6/7] gdiplus: Implemented GdipGetPathData with test
by Detlef Riekenberg June 26, 2008

June 26, 2008

Hi Nikolay: > + pathData->Points = GdipAlloc(sizeof(PointF) * pathData->Count); > + if(!pathData->Points) > + return OutOfMemory; > + > + pathData->Types = GdipAlloc(pathData->Count); > + if(!pathData->Points) Greetings from Copy & Paste pathData->Points => pathData->Types > + return OutOfMemory; You are leaking the memory in pathData->Points -- By by ... Detlef

1 0