February 2012 - Wine-Devel - list.winehq.org

Re: shlwapi: Implemented StrToInt64ExA/W
by Jacek Caban Feb. 26, 2012

Feb. 26, 2012

Hi Carlo, On 2/26/12 12:56 PM, carlo.bramix(a)libero.it wrote: > I improved the patch according to the suggestions that I received: > 1) Removed the C++ style comment > 2) Removed the WARN message > 3) Added the tests for the new functions. The test has been run successfully > on Ubuntu 11.10. > > Sincerely Thanks for fixing those. This version looks better, but still could use some improvements (mostly for failing tests on win2k). BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LARGE_INTEGER li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); + + if (!lpiRet) + return FALSE; In previous patch you mentioned that Windows crashes in this situation. Thus there is no point in having this check on Wine. int str_to_int; int str_to_int_ex; int str_to_int_hex; + LONGLONG str_to_int64_ex; + LONGLONG str_to_int64_hex; AFAICS int str_to_int* always matches str_to_int64* values except for overflows. It means that you could simply change str_to_int_* to be LONGLONG and simply cast it to int before using it in existing tests. + { "0x44ff", 0, 0, 0x44ff, 0, 0x44ff }, + { "0x2bdc546291f4b1", 0, 0, 0x6291f4b1, 0, 0x2bdc546291f4b1 }, 64-bit literals are not portable. Something like ((ULONGLONG)0x2bdc54<<32) | (ULONGLONG)0x6291f4b1 would do the trick. + while (result->string) + { + return_val = -1; + bRet = StrToInt64ExA(result->string,0,&return_val); This function is not available on win2k (http://testbot.winehq.org/JobDetails.pl?Key=17105&scrshot_202=1#k202) so it needs to be loaded dynamically via GetProcAddress. See how other functions are handled. Cheers, Jacek

1 0

Re: msvcrt/file.c: file mode T (temporary file) (try 2)
by Vitaliy Margolen Feb. 26, 2012

Feb. 26, 2012

On 02/25/2012 05:30 AM, Robert van Herk wrote: > Try 2 fixes some blatant memory bug in the conformance test > --------------------------------------------------------------------------- > > Windows fopen has some fancy file modes 'T' and 'D'. > Currently, wine wrongly interprets 'T' as 't'. They should be interpreted > differently though: 't' is text file, and 'T' is temporary file. > > I've fixed this, and added a conformance test. > + case 'T': > + FIXME("Implement T flag (temporary file, i.e. delete on close, don't flush to disk if possible)"); > + break; So what actually prevents you from properly implementing this? Especially that Wine already supports temporary files. Search for MSVCRT__O_TEMPORARY Vitaliy.

2 1

Spaces in the Korean translation.
by Francois Gouget Feb. 26, 2012

Feb. 26, 2012

I noticed some leading and trailing space issues in the Korean translation. I think these are probably safe to change. However I then noticed that there was a lot of sentences mixed single and double spaces. So I wonder if that's normal, maybe tied to a Korean typography rule related to half vs. full width characters; or if only single or double spaces should be present. Here are a few examples: "주의: 이 파일 형식은 아마도 하나 이상의 인증서,인증서 파기 목록,인증서 신뢰 " ^^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ "목록을 가지고 있을 수 있음:" ^ ^ ^ ^ msgstr "'여기로부터'엔트리는 여기까지'엔트리에 도달 할 수 없습니다." ^^ ^ ^ ^ ^ msgstr "대기열에는 %d의 문서가 존재합니다" ^^ ^ ^ -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Before you criticize someone, walk a mile in his shoes. That way, if he gets angry, he'll be a mile away - and barefoot.

1 0

Re: sk.po
by Francois Gouget Feb. 26, 2012

Feb. 26, 2012

Thanks for the translation updates. I noticed some potential issues while proofreading it: "to modify its installed components, select it from the list and click Change/" "Remove." msgstr "" +"Nasledujúci program môže byť automaticky odinštalovaný. K odstráneniu programu " +"alebo k modifukácii jeho inštalovaných súčastí, zvoľte možnosť zo zoznamu a kliknite " +"Zmeniť/Odstrániť" There should probably be a trailing full stop. msgid "Publisher:" -msgstr "" +msgstr "Vydavateľ" msgid "Version:" -msgstr "" +msgstr "Verzia" These are missing the trailing colon (these are likely field labels in a dialog). msgid "&Settings..." -msgstr "" +msgstr "&Nastavenia" #, fuzzy msgid "&Modify..." -msgstr "Modifikovaný" +msgstr "&Zmeniť" #, fuzzy msgid "&Install" -msgstr "&Skomentovať..." +msgstr "&Inštalovať..." These are either missing the trailing ellipsis or have one that should not be there. Ellipses are very important because, for instance, they make all the difference between a 'Print' button that will send the page to the default printer right away, and a 'Print...' button that will first display a dialog that will let you choose the destination printer or cancel before anything happens. Note that I did not list all ellipsis issues here. Also this is one of the points that my script checks so you'll see any ellipsis issue in Wine's PO file there: http://fgouget.free.fr/wine-po/sk-errors.html #, fuzzy msgid "Unexpected network error.\n" -msgstr "Nedefinovaná externá chyba." +msgstr "Nedefinovaná sieťová chyba." This translation should have a trailing linefeed. Also I notice that you did not remove the 'fuzzy' flag, not only here but also for quite a few other translations, including two others above. The fuzzy flag indicates that the translation is potentially incomplete or incorrect and thus requires more work or a review. So as long as it is present the translation will not be used. Keep up the good work. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Any sufficiently advanced bug is indistinguishable from a feature. -- from some indian guy

1 0

Re: shlwapi: Implemented StrToInt64ExA/W
by Marvin Feb. 26, 2012

Feb. 26, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17105 Your paranoid android. === W2KPROSP4 (32 bit string) === Timeout

1 0

Re: shlwapi: Implemented StrToInt64ExA/W
by Nikolay Sivov Feb. 25, 2012

Feb. 25, 2012

On 2/25/2012 17:49, carlo.bramix(a)libero.it wrote: > I tried to implement StrToInt64ExA/W as a reply to bug #27633 > I also corrected the comment in functions FormatInt() and FormatDouble() > because, according to MSDN, GetNumberFormat() returns the number of characters > written (or required) and not the number of bytes emitted: > http://msdn.microsoft.com/en-us/library/windows/desktop/dd318110%28v=vs.85%…. > aspx > I hope my first patch to WINE is correct and it could be useful. > Sincerely, > > Carlo Bramini. > > > > BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) > { > + LARGE_INTEGER li; > + BOOL bRes; > + > + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); > + > + // Test on lpszStr is done into StrToInt64ExA No cpp comments please. Also this comment is a bit redundant for a function that small. > + if (!lpiRet) > + { > + WARN("Invalid lpiRet would crash under Win32!\n"); > + return FALSE; > + } You don't need to WARN on that, especially with such message. > + > + bRes = StrToInt64ExA(lpszStr, dwFlags,&li.QuadPart); > + if (bRes) > + *lpiRet = li.u.LowPart; > + > + return bRes; > +} This needs tests, take a look at shlwapi/tests for some examples.

1 0

Re: msvcrt/file.c: file mode T (temporary file)
by Nikolay Sivov Feb. 25, 2012

Feb. 25, 2012

On 2/25/2012 00:19, Robert van Herk wrote: > Windows fopen has some fancy file modes 'T' and 'D'. > Currently, wine wrongly interprets 'T' as 't'. They should be > interpreted differently though: 't' is text file, and 'T' is temporary > file. > > I've fixed this, and added a conformance test. > > Test ran on Windows 7 Home Premium. > > Kind regards, > Robert > > dlls/msvcrt/file.c | 8 +++++- > dlls/msvcrt/tests/Makefile.in | 1 + > dlls/msvcrt/tests/filemodeT.c | 61 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 69 insertions(+), 1 deletions(-) > create mode 100644 dlls/msvcrt/tests/filemodeT.c You clearly don't need a new file for that, please place it into existing file.c.

1 0

Re: msvcrt/file.c: file mode T (temporary file)
by Marvin Feb. 25, 2012

Feb. 25, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17097 Your paranoid android. === WNT4WSSP6 (32 bit filemodeT) === filemodeT: unhandled exception c0000005 at 780109BF === WXPPROSP3 (32 bit filemodeT) === filemodeT: unhandled exception c0000005 at 77C41165

1 0

Re: po: Update Chinese (Taiwan) translation.
by Francois Gouget Feb. 24, 2012

Feb. 24, 2012

Thanks for the translation update. It's a big one. There are pretty few issues given the size: msgid "&Modify..." -msgstr "" +msgstr "�޸�(&M)" The translation is missing the ellipsis here. msgid "" "This value does not lie within the page range.\n" "Please enter a value between %1!d! and %2!d!." msgstr "" -"�@��ֵ��퓔��\n" -"Ոݔ��һ�� %d �� %d ֮�g�Ĕ��" +"ݔ��ֵ��퓔��ȡ�\n" +"Ոݔ��һ�� %d �� %d ֮�g��ֵ��" The formatting directives should match. There's been quite a few changes of that type that had the goal of making it possible to reorder them so there may be other places with the same issue. #, fuzzy msgid "Write fault.\n" -msgstr "Ĭ�J��\n" +msgstr "�A�O��\n" #, fuzzy msgid "Read fault.\n" -msgstr "Ĭ�J��\n" +msgstr "�A�O��\n" ... Is it normal that you did not remove the fuzzy on this series of messages? (Maybe they need further review?) -#, fuzzy msgid "By &Type" msgstr "��" #: shell32.rc:52 -#, fuzzy msgid "By &Size" msgstr "��С" Should preserve the keyboard shortcut? -#, fuzzy msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) ʧ�� ($%x)" The format directives also need an update on this one. msgid "&New override for library:" -msgstr "��ʽ��(&N)��" +msgstr "��ʽ�츲�d(&N):" msgid "Existing &overrides:" -msgstr "��еĺ�ʽ��(&o)��" +msgstr "��еĺ�ʽ�츲�d(&O)��" I see that you replaced some full width colons with their half-width equivalent but not everywhere. What is the common practice there? As far as I know for full stops it's the full-width character that is used. However for characters like colons, question marks and exclamation points I don't know (looking at Windows 7 dialogs did not help there). msgid "Full &Path:" -msgstr "" +msgstr "��·��(P):" This one is missing the ampersand. That's the only such case as far as I can tell. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Dieu dit: "M-x Lumi��re". Et la lumi��re fut.

2 1

Removing 'all' platform/os from bugzilla
by Austin English Feb. 23, 2012

Feb. 23, 2012

Howdy, We seem to discourage use of the use of 'all' platform/os on bugzilla. While I personally am not opposed to it, in cases where it's obviously true (e.g., http://bugs.winehq.org/show_bug.cgi?id=29901) changing these fields causes unnecessary spam. It would be easier, imho to remove them. Does anyone have any opposition to this? I'm intending to leave 'other', of course. -- -Austin

2 2

Obscure texts and invalid translations
by Lauri Kenttä Feb. 23, 2012

Feb. 23, 2012

Hi, Wine has many texts, especially error messages, that are almost impossible to translate without knowing what they're really about. Some are also easy to misunderstand. An example from dlls/kernel32/winerror.mc: msgid "Notify change request in progress.\n" Some interpretations: de, nb: "A request for notifications about changes is in progress." fr, sv: "A request to change a notification is in progress." it, pt: Both have their own versions, I think. There are many more such cases, although the difference is usually in only one or two languages. (Unfortunately it didn't occur to me to put them down from the beginning, so I can't give you a list. I'll just mention "Challenge Password" before I forget that, too.) 1) What should I do if I wanted to clarify a msgid? Just change the original .rc file? 2) Is there a way to add helpful comments to all language files at once without changing the msgid? 3) What should I do if I spot a suspicious translation? Spam the Bugzilla, contact the Last-Translator personally, or send patches to add #fuzzy comments and hope I'm right? And if it's wrong in many of the languages I can read, it's probably wrong in some others as well; who would check them all? 4) There has been discussions about some translation websites. Is there a chance that such a website would allow easy tagging of potential errors? -- Lauri Kenttä

3 5

Re: Alexandre Julliard : gdi32: Avoid overflows for invalid coordinates in line clipping.
by Charles Davis Feb. 22, 2012

Feb. 22, 2012

On Feb 22, 2012, at 1:27 PM, Alexandre Julliard wrote: > --- a/dlls/gdi32/dibdrv/objects.c > +++ b/dlls/gdi32/dibdrv/objects.c > @@ -372,7 +372,8 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) > int clip_line(const POINT *start, const POINT *end, const RECT *clip, > const bres_params *params, POINT *pt1, POINT *pt2) > { > - int m, n; > + > + INT64 m, n; /* 64-bit to avoid overflows (FIXME: find a more efficient way) */ What about MulDiv()? As I recall, this is the sort of situation for which it was designed. Or is that not efficient? Chip

2 1

Re: po: Spanish translation update for appwiz.rc and comdlg32.rc
by Francois Gouget Feb. 22, 2012

Feb. 22, 2012

On Wed, 22 Feb 2012, Eduardo Garcia wrote: > This is the first patch of a series of patches aiming to update and complete > the Spanish interface in current Wine. This patch covers appwiz.rc and > comdlg32.rc. Cool. Thanks! I noticed some issues though: msgid "Publisher:" -msgstr "Editor:" +msgstr "Fabricante" You should not remove the colon here. msgctxt "Saturation" msgid "&Sat:" -msgstr "&Sat.:" +msgstr "&Saturaci??n:" msgctxt "Luminance" msgid "&Lum:" -msgstr "&Lum.:" +msgstr "&Luminancia:" These two are likely to be too long, hence why it's truncated. -#, fuzzy msgid "Files of type:" -msgstr "Archivos de &tipo:" +msgstr "&Tipo de archivo:" Apparently that one is not meant to have a key shortcut. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The greatest programming project of all took six days; on the seventh day the programmer rested. We've been trying to debug the *&^%$#@ thing ever since. Moral: design before you implement.

1 0

Re: po: fixed remaining Slovenian true positives in the winepo error report
by Francois Gouget Feb. 22, 2012

Feb. 22, 2012

On Wed, 22 Feb 2012, Jaka Kranjc wrote: [...] > > Also in my previous email I forgot to mention that the /Unix line is > > missing from both start.exe usage strings, not just the one I mentionned > > before. Hopefully you will have noticed that already. > Too bad, I missed it. The two usage strings are identical though, so why not > split the formalities away after the strings are thawed? Translators that > don't use tools with translation memory will just have more work this way. That's what should happen eventually. In fact start's messages need a thorough rework because it's a pain to work with right now. Also there's probably improvements to be made for all command line tools with regards to line wrapping. But it's going to take some work and that will all have to wait after the 1.4 release as we are in a string freeze right now. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ If it stinks, it's chemistry. If it moves, it's biology. If it does not work, it's computer science.

2 1

winealsa.drv patch to enum all software devices from .asoundrc
by Joerg-Cyril.Hoehle＠t-systems.com Feb. 22, 2012

Feb. 22, 2012

Hi, There's no $HOME/.asoundrc on any of my systems, yet I'd like to use "plug:dmix" with Wine, e.g. on systems with PulseAudio installed. I can use speaker-test -Dplug:dmix with no trouble. Will your patch make that appear in the list? Нискородов Серёжа wrote: >To check whether the device is a hardware, I can call a function >snd_pcm_type. But first I need to get handle of pcm device using the >snd_pcm_open. Okay, but then I have to cancel calling the function >alsa_try_open and rewrite checking availability of the device to not >to opening it twice. Avoiding snd_pcm_open is important. Right now, we already have tests that fail randomly because unfriendly devices like PulseAudio cling to the underlying resource ("hw:0") for a couple of seconds, preventing Wine from inspecting it (bug #28048), causing Wine IIRC to eliminate "hw:0" from the list of available devices. :-( That is not satisfying at all. Perhaps one easy shoot at it would be to access "default" last? That's still much like crossing fingers. Thank you, Jörg Höhle

5 27

Re: gdi32: pOS2->xAvgCharWidth can be negative however tmAvgCharWidth needs a positive value
by Dmitry Timoshkov Feb. 21, 2012

Feb. 21, 2012

Aric Stewart <aric(a)codeweavers.com> wrote: > - TM.tmAveCharWidth = (pFT_MulFix(pOS2->xAvgCharWidth, x_scale) + 32) >> 6; > + TM.tmAveCharWidth = (pFT_MulFix(abs(pOS2->xAvgCharWidth), x_scale) + 32) >> 6; Did you test what Windows does in that case? -- Dmitry.

2 8

Re: kernel32/tests: DeviceIoControl: verify IOCTL_DVD_READ_STRUCTURE outputs same buffer as IOCTL_SCSI_PASS_THROUGH_DIRECT f
by Marvin Feb. 21, 2012

Feb. 21, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17047 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: kernel32/tests: DeviceIoControl.IOCTL_DVD_READ_STRUCTURE.DvdPhysicalDescriptor: check output buffer byte order (try 6)
by Marvin Feb. 21, 2012

Feb. 21, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17046 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

[PATCH] mmdevapi: Fix exclusive test.
by Joerg-Cyril.Hoehle＠t-systems.com Feb. 21, 2012

Feb. 21, 2012

Maarten, what does the patch fix? I did leave nChannels equal to what GetMixFormat returns based on the following reasoning: - It'll probably suggest a mono format on an old machine that handles mono only, so leave as is. - It may suggest 6 channels on a 5:1 card (we had a few such reports on test.winehq.org) so presumably, exclusive mode on such machines would accept 6 channels too, so keep it. Why do you force 2 channels? There's one fix that I envision: the old WAVE_FORMAT_PCM should only be used with mono or stereo, says MSDN. I used it to avoid having to deal with a channel mask. So for 5:1, it would be preferable to keep WAVE_FORMAT_EXTENSIBLE and simply switch pwfx to linear 16bit PCM instead of FLOAT. IIRC, MSDN advises to try out exclusive mode with both WAVE_FORMAT_PCM and FORMAT_EX, arguing that some devices recognize one but not the other format... (what a mess!) Thank you, Jörg Höhle

1 0

Re: [2/2] winefile: Get rid of _wsplitpath duplication
by Alexandre Julliard Feb. 21, 2012

Feb. 21, 2012

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -1,10 +1,9 @@ > EXTRADEFS = -D__WINE__ > MODULE = winefile.exe > -APPMODE = -mwindows -municode > +APPMODE = -mwindows -municode -mno-cygwin You can't do that, winefile wants Unix filesystem calls. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] Minimal fix for IOCTL_DVD_READ_STRUCTURE output format
by Dan Kegel Feb. 20, 2012

Feb. 20, 2012

On Fri, Feb 17, 2012 at 12:32 AM, Dan Kegel <dank(a)kegel.com> wrote: > This is a minimal patch that should fix Dragon Age disc detection, > http://bugs.winehq.org/show_bug.cgi?id=29669 > > The remaining problems can be dealt with after release. > > Test passes on Linux and Windows with the Dragon Age disc in the drive. This is missing a level of indirection on mac. I'll send a corrected patch.

1 0

Re: kernel32: CreateMemoryResourceNotification stub should return a waitable handle
by Dan Kegel Feb. 20, 2012

Feb. 20, 2012

On Mon, Feb 20, 2012 at 6:38 AM, Vitaliy Margolen <wine-devel(a)kievinfo.com> wrote: >>>>> + return CreateEventA(NULL, FALSE, FALSE, "Fake >>>>> MemoryResourceNotification"); >>>> >>>> I don't think you want a named event here. Anonymous would be better, in >>>> case the program will ask for another event. >>> >>> Oh, right. Anonymous it is, then. >> >> Hang on - those events will never fire, so what does it matter if >> the same event gets two handles? > > My bad. Was just trying to make sure it won't conflict with anything. > > Re-read description of this function on MSDN which indicates it's a system > wide event. So you should be good with the named event. Good, the patch stands then. - Dan

1 0

know more about Win API's
by prateek papriwal Feb. 20, 2012

Feb. 20, 2012

hello, can anyone suggest me how to get knowledge of windows API's and Wine Internals. I am reading the documentation provided on the site but i am finding it hard to grasp the things .. if u can suggest me some good readings or moreover a structured way of reading things it would be helpful for me ...

3 2

Re: windowscodecs: Make MetadataReader_Create() static.
by Vincent Povirk Feb. 20, 2012

Feb. 20, 2012

This function will be used from other files in the future. On Sun, Feb 19, 2012 at 4:32 PM, Francois Gouget <fgouget(a)free.fr> wrote: > --- > dlls/windowscodecs/metadatahandler.c | 2 +- > dlls/windowscodecs/wincodecs_private.h | 1 - > 2 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c > index afcff21..53aa22a 100644 > --- a/dlls/windowscodecs/metadatahandler.c > +++ b/dlls/windowscodecs/metadatahandler.c > @@ -317,7 +317,7 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { > MetadataHandler_SaveEx > }; > > -HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) > +static HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) > { > MetadataHandler *This; > HRESULT hr; > diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h > index 691b1ec..9cbeaa1 100644 > --- a/dlls/windowscodecs/wincodecs_private.h > +++ b/dlls/windowscodecs/wincodecs_private.h > @@ -83,7 +83,6 @@ typedef struct _MetadataHandlerVtbl > ULARGE_INTEGER *size); > } MetadataHandlerVtbl; > > -extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; > > extern HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; > > -- > 1.7.9 > > >

1 0

Re: kernel32: CreateMemoryResourceNotification stub should return a waitable handle
by Vitaliy Margolen Feb. 19, 2012

Feb. 19, 2012

On 02/19/2012 09:26 AM, Dan Kegel wrote: > Otherwise jqs spins. > Fixes http://bugs.winehq.org/show_bug.cgi?id=29936 > > + return CreateEventA(NULL, FALSE, FALSE, "Fake MemoryResourceNotification"); I don't think you want a named event here. Anonymous would be better, in case the program will ask for another event. Vitaliy.

2 1

Re: [user32] quiet two noisy fixmes
by Dan Kegel Feb. 19, 2012

Feb. 19, 2012

On Sun, Feb 19, 2012 at 1:47 AM, Dan Kegel <dank(a)kegel.com> wrote: > Since Java 6 SE 10, Java installs a "Java Quick Start" service which calls > these two functions multiple times per second. Please ignore this patch. Even with the messages suppressed, JQS burns CPU. The console spew is a useful reminder of http://bugs.winehq.org/show_bug.cgi?id=29936

1 0

Re: [1/3] comdlg32: Adjust the size of CHOOSE_COLOR dialog.
by Dmitry Timoshkov Feb. 19, 2012

Feb. 19, 2012

Gustavo Henrique Milaré <gugamilare(a)gmail.com> wrote: > Adjusting size for the translation to fit. You can't do that, read the comment in that file slightly before all common dialog templates. -- Dmitry.

4 11

Re: [PATCH] quartz: fixed sizeof()s to IsBadReadPtr (Coverity)
by Marvin Feb. 18, 2012

Feb. 18, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17015 Your paranoid android. === WNT4WSSP6 (32 bit filtermapper) === filtermapper.c:96: Test failed: CoCreateInstance failed with 80040154 filtermapper.c:233: Test failed: CoCreateInstance failed with 80040154 filtermapper.c:347: Test failed: CoCreateInstance failed with 80040154 filtermapper.c:405: Test failed: CoCreateInstance failed with 80040154

1 0

kernel32/tests: initial tests for cdrom.c
by Joerg-Cyril.Hoehle＠t-systems.com Feb. 18, 2012

Feb. 18, 2012

Dan Kegel wrote: >These require a DVD in the drive, so they are skipped without >WINETEST_INTERACTIVE=1. I don't see the causality. Presumably the tests require no human intervention. winmm/tests/mcicda also skips tests if no CD-ROM is in the bay. However, even a regular winetest.exe run *will* run as many tests as it can should it find a CD-ROM. Users are invited to submit test results to test.winehq with audio and/or mixed data CD-ROMs in the drive. There's no need for winetest_interactive here. Regards, Jörg Höhle

3 3

Re: OpenGL child windows (SketchUp)
by Roderick Colenbrander Feb. 17, 2012

Feb. 17, 2012

Re-adding wine-devel. On Wed, Feb 8, 2012 at 2:42 PM, Brian Bloniarz <brian.bloniarz(a)gmail.com> wrote: > On Wed, Feb 8, 2012 at 12:33 PM, Roderick Colenbrander > <thunderbird2k(a)gmail.com> wrote: >> >> On Wed, Feb 8, 2012 at 6:31 PM, Matteo Bruni <matteo.mystral(a)gmail.com> >> wrote: >> > I'm not really such an expert in the area, but I think both (1) and >> > (2) make sense. I'm not sure in (1) case about the glXWaitGL call, as >> > technically glXSwapBuffers is not a GL call, but given that it works >> > for you (while XSync doesn't) on Nvidia, I guess it's fine... Make >> > sure it works correctly on all the drivers you mentioned, or even that >> > e.g. it doesn't cause excessive slowdowns. >> > >> > > > ... >> >> glXWaitGL and friends were intended for syncing GLX and X, so this may >> >> be the most reliable way. As you pointed out there may be bugs in DRI, >> but this needs a careful read of the specs (will try to look at it). >> As you said the damage extension can be used as well, but I think I >> would lean to using the classic glX/X synchronization features first. > > > Thanks for looking, both of you! > > I'm looking at the GLX1.3 spec at: > http://www.lri.fr/~mbl/ENS/IG2/docs/glx1.3.pdf > > "Sequentiality" has: > "glXSwapBuffers is in the OpenGL stream if and only if > the display and drawable are those belonging to the calling thread's > current context; otherwise it is in the X stream." > > That would put our glXSwapBuffers in the OpenGL stream, > and hence something that should be serialized by a call > to glXWaitGL(). I wouldn't test it in court though :) > > Whatever the approach, I'd be happy to test and/or benchmark > on the 4 renderers I have access to. > > Thanks, > -Brian A patch like this is what should do the job. I'm not sure what the penalty will be. Remember glXSwapBuffers already performs a glFlush, so a glXWaitGL on top of that may not be too bad. I can't quickly think of a good test application. You would like a game or some benchmark, but I can't think of anything stressful now which uses a child window (an application which has a menu bar, doesn't use a child window). Google Earth always was a good test. We need to figure out if the DRI drivers are indeed buggy. I will see if I have time to look at it, but my time is very limited these days :( Roderick

2 2

"Known" DLLs
by Adam Kłobukowski Feb. 17, 2012

Feb. 17, 2012

Hello I've been a Wine user for a long time alreadey, since all Wine could do was running winesweper very slowly ;) I'd like to propose a feature that could be implemented in Wine. Wine does not implement all Windows APIs (yet ;)) and big parts of existing implementations are only stubs. Therefore, it could be usefull if Wine would be able to detect when a program tries to use a DLL that is not implememnted, but is easily available for download. .NET, MSXML, VCRUN* comes in mind. Instead of just failing, Wine could offer advice to the user how to deal with that. This could also help with APIs that are mostly stubbed, work for some use cases, but are expected to fail in other - they could detect if an app is trying to use unsuported case and take action. Adam Klobukowski

5 5

[PATCH 1/2] winmm: Avoid using SuspendThread, it can hang Wine.
by Joerg-Cyril.Hoehle＠t-systems.com Feb. 17, 2012

Feb. 17, 2012

Hi, >this Fixes bug #28388 I think it is not a good idea to defer this patch until after 1.4.0. Every app using midiStreamOpen eventually calls SuspendThread which is simply a time bomb on a dual core machine. There are many more multi-core machines now, so the situation degrades. Dan Kegel wrote: >With WINEDEBUG=warn+heap, it happens a lot sooner (first run: first try; >second run: sixth try). As noted in the bug report, SuspendThread can hit Wine amid memory management, breaking havoc. Users won't know who to blame for random lock-ups and complain like I did that Wine isn't able to generate a backtrace. Patch 1/2 can be applied stand alone. It gets rid of SuspendThread. It's been a pleasure to use patch 2/2 and hear apps play midiStream music without trouble. I wouldn't mind if you defer that for 1.4.1. After all, this is a feature that has been lacking in Wine for the last 10 years, so people can wait a little more... Regards, Jörg Höhle

3 3

weirdly large filesize of winegcc generated shared object
by Pengyu CHEN Feb. 17, 2012

Feb. 17, 2012

Hello everyone, I'm new here, and if I did/said something wrong, please point out instead of throwing stones at me :-) I'm currently developing stuffs with winelibs, and when building a shared lib with winegcc, I find the generated file is weirdly large. The example below illustrates my problem. // this is a.c __attribute__((cdecl)) void *test() { return 0; } // and this is a.spec @ cdecl test() Then I compiled them using 'winegcc a.c a.spec -shared -fPIC -m32', and then found the resulting file a.out.so is about 70KB in size: [pengyu(a)pengyu-Studio-1747 tmp]$ls a.out.so -l -rwxr-xr-x 1 pengyu users 75893 Feb 17 19:16 a.out.so By analyzing the file I found in a.out.so there is an extremely large section .init with size of nearly 70KB. That's weird since a normal .init section is quite small. Though I know wine would do its initialization here, but 70KB is still too large I think. And after disassembling and also viewing the file with hexadecimal viewer, I found nearly all contents of .init section of a.out.so is filled with zero bits. Is this a bug or feature? Since .init section is read/execute only, I didn't see any benefit from these filling zeros. Can anybody make some explanations please? And, is there any methods to remove these zeros in the generated shared object and get a smaller file? Regards, Pengyu -- * [A very large, very cold, and extremely isolated planet.] [ApertureScience][Grow Old or Die Trying] [ZJU/ComputerScience][Archer/Googler/kind of geek] [C/Python/Mathematica/CommonLisp/Assembly] [CpyPrefersYou/HjrJustifiablyReturns] [AboutMe <http://about.me/cpy>] *

2 4

Re: po: Add and fix a few Finnish translations.
by Lauri Kenttä Feb. 17, 2012

Feb. 17, 2012

"Thai" is right, "Thain" is wrong. Please don't mess with Finnish if you don't know it. As I've said, I'm working on it. If you feel I'm too slow, feel free to hire me and I'll do it faster. ;) I'm currently away from my computer, but I'll send my patch this weekend. It will have almost everything except some of the more difficult winerror and crypt* texts. -- Lauri Kenttä

2 2

Re: [2/2] kernel32/tests: DeviceIoControl.IOCTL_DVD_READ_STRUCTURE.DvdPhysicalDescriptor: check output buffer byte order (try 4)
by Dan Kegel Feb. 17, 2012

Feb. 17, 2012

On Wed, Feb 15, 2012 at 4:35 PM, Dan Kegel <dank(a)kegel.com> wrote: >> Change since last try: >> - moved back to kernel32 per AJ's remark on irc >> - runs even if dvd in 2nd... drive >> - simplified >> >> Passes on Wine/Linux, Wine/Mac (according to Charles), and Win7. > > Here's the same patch with the wayward utf-8 char removed from the > standards comment. Please ignore this patch. I simplified too far; it has a structure packing problem that only shows up in crosstest on windows. I sent an updated series to Charles for testing.

1 0

Re: [PATCH] server: Add sessions directory and 0 session symlink
by Vitaliy Margolen Feb. 17, 2012

Feb. 17, 2012

On 02/16/2012 08:37 PM, Vitaliy Margolen wrote: > > Fixes bug 29905. > --- Please ignore this. Didn't read the last bug comment. Vitaliy.

1 0

Problems with translatable strings
by Gustavo Henrique Milaré Feb. 17, 2012

Feb. 17, 2012

Hello, I've encountered some issues while translating Wine to Brazilian Portuguese. The first one is in string number 24 (line 150 in wine.pot) which is related to wine control. When you open "wine control" and select the icon "Add/remove programs", the status bar shows "Allows you to install new software, or remove existing software" while the string in wine.pot file reads "Allows you to install new software, or remove existing software from your computer." Is there any reason for limiting the number of visible characters in wine control's status bar? If there is, then it would be better to use a smaller string instead. There are also problems in strings number 119 (line 547) and number 494 (line 2075). The resource file doesn't allow enough space for the appropriate translations ("Vermelho:" and "Adicionar Propósito...", respectively). Gustavo Henrique Milaré

3 5

re: "Known" DLLs
by Dan Kegel Feb. 16, 2012

Feb. 16, 2012

This has been discussed off and on over the years, e.g. http://www.winehq.org/pipermail/wine-devel/2009-September/078441.html http://www.winehq.org/pipermail/wine-devel/2010-September/086465.html http://www.winehq.org/pipermail/wine-devel/2010-September/086469.html There is a kind of notification system in place, the winediag debug channel. I think the intent of that was to make it possible for distros to show those messages to the user (maybe with a dialog), and hide all the other log messages. At the moment, the dll load failure message doesn't go to +winediag. Maybe it should (although there are probably times when it's safe to ignore them, so I'm not sure). Anyway, +winediag or not, one can imagine a wrapper outside wine that notices events like this and offers to assist the user in those few cases (mfc42? vb6run?) where there's a high likelihood of success. Here's a crude example: wine "$@" 2>&1 | tee foo.log if grep -i "Library MFC42.DLL" foo.log then zenity --warning --text "This app seems to need mfc42. Try running winetricks mfc42." fi It would take a bunch of work to get something worth deploying, but if you're interested, go for it...

1 0

Re: msxml3: Fix varargs handling in libxml2 error callback implementation
by Marcus Meissner Feb. 16, 2012

Feb. 16, 2012

On Thu, Feb 16, 2012 at 01:55:44AM +0300, Nikolay Sivov wrote: > The problem is that vsnprintf() was called multiple times with same > va_list. Ti fix that it was necessary to get rid of some tracing > bits like macro-defined callback calls and a single function for all > kinds of error types. > > As far as I understand this problem it leads to a stack corruption > when va_list is used multiple time without va_start/va_end around > it, so it's critical to fix. If I remember correctly, you can even process a va_list only once on some platforms. If you need to process it multiple times, you need to create a copy with va_copy() first. Ciao, Marcus > From d75433c8ff34e125c7db1fb665bdb9271991b9f5 Mon Sep 17 00:00:00 2001 > From: Nikolay Sivov <nsivov(a)codeweavers.com> > Date: Thu, 16 Feb 2012 01:06:16 +0300 > Subject: [PATCH 1/1] Fix varargs handling in libxml2 error callback implementation > > --- > dlls/msxml3/domdoc.c | 50 +++++------------------- > dlls/msxml3/main.c | 49 +++++++++++++++++------- > dlls/msxml3/msxml_private.h | 18 ++------- > dlls/msxml3/schema.c | 90 ++++++++++++++----------------------------- > dlls/msxml3/selection.c | 4 +- > 5 files changed, 80 insertions(+), 131 deletions(-) > > diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c > index 64122ce..9bcecdd 100644 > --- a/dlls/msxml3/domdoc.c > +++ b/dlls/msxml3/domdoc.c > @@ -425,23 +425,7 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) > xmlSAX2Characters(ctxt, ch, len); > } > > -static void LIBXML2_LOG_CALLBACK sax_error(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_ERR(doparse, msg, ap); > - va_end(ap); > -} > - > -static void LIBXML2_LOG_CALLBACK sax_warning(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_WARN(doparse, msg, ap); > - va_end(ap); > -} > - > -static void sax_serror(void* ctx, xmlErrorPtr err) > +static void libxml2_sax_structerror(void* ctx, xmlErrorPtr err) > { > LIBXML2_CALLBACK_SERROR(doparse, err); > } > @@ -472,9 +456,9 @@ static xmlDocPtr doparse(domdoc* This, char const* ptr, int len, xmlCharEncoding > sax_characters, /* ignorableWhitespace */ > xmlSAX2ProcessingInstruction, /* processingInstruction */ > xmlSAX2Comment, /* comment */ > - sax_warning, /* warning */ > - sax_error, /* error */ > - sax_error, /* fatalError */ > + libxml2_warn_callback, /* warning */ > + libxml2_error_callback, /* error */ > + libxml2_error_callback, /* fatalError */ > xmlSAX2GetParameterEntity, /* getParameterEntity */ > xmlSAX2CDataBlock, /* cdataBlock */ > xmlSAX2ExternalSubset, /* externalSubset */ > @@ -482,10 +466,12 @@ static xmlDocPtr doparse(domdoc* This, char const* ptr, int len, xmlCharEncoding > NULL, /* _private */ > xmlSAX2StartElementNs, /* startElementNs */ > xmlSAX2EndElementNs, /* endElementNs */ > - sax_serror /* serror */ > + libxml2_sax_structerror /* serror */ > }; > xmlInitParser(); > > + TRACE("(%p)->(%p %d %d)\n", This, ptr, len, encoding); > + > pctx = xmlCreateMemoryParserCtxt(ptr, len); > if (!pctx) > { > @@ -2634,22 +2620,6 @@ static inline BOOL is_wellformed(xmlDocPtr doc) > #endif > } > > -static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_ERR(domdoc_validateNode, msg, ap); > - va_end(ap); > -} > - > -static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_WARN(domdoc_validateNode, msg, ap); > - va_end(ap); > -} > - > static HRESULT WINAPI domdoc_validateNode( > IXMLDOMDocument3* iface, > IXMLDOMNode* node, > @@ -2695,11 +2665,11 @@ static HRESULT WINAPI domdoc_validateNode( > if (get_doc(This)->intSubset || get_doc(This)->extSubset) > { > xmlValidCtxtPtr vctx = xmlNewValidCtxt(); > - vctx->error = validate_error; > - vctx->warning = validate_warning; > + vctx->error = libxml2_error_callback; > + vctx->warning = libxml2_warn_callback; > ++validated; > > - if (!((node == (IXMLDOMNode*)iface)? > + if (!((node == (IXMLDOMNode*)iface) ? > xmlValidateDocument(vctx, get_doc(This)) : > xmlValidateElement(vctx, get_doc(This), get_node_obj(node)->node))) > { > diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c > index 464ef90..4f9b020 100644 > --- a/dlls/msxml3/main.c > +++ b/dlls/msxml3/main.c > @@ -60,28 +60,47 @@ HINSTANCE MSXML_hInstance = NULL; > > #ifdef HAVE_LIBXML2 > > -void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) > +#define LIBXML2_LOG_CALLBACK __WINE_PRINTF_ATTR(2,3) > + > +void LIBXML2_LOG_CALLBACK libxml2_error_callback(void *ctxt, const char *msg, ...) > { > - char* buf = NULL; > int len = 32, needed; > - enum __wine_debug_class dbcl = __WINE_DBCL_ERR; > - switch (lvl) > + char* buf = NULL; > + va_list ap; > + > + do > { > - case XML_ERR_NONE: > - dbcl = __WINE_DBCL_TRACE; > - break; > - case XML_ERR_WARNING: > - dbcl = __WINE_DBCL_WARN; > - break; > - default: > - break; > + heap_free(buf); > + buf = heap_alloc(len); > + va_start(ap, msg); > + needed = vsnprintf(buf, len, msg, ap); > + va_end(ap); > + if (needed == -1) > + len *= 2; > + else if (needed >= len) > + len = needed + 1; > + else > + needed = 0; > } > + while (needed); > + > + wine_dbg_log(__WINE_DBCL_ERR, &__wine_dbch_msxml, "libxml2", "%s", buf); > + heap_free(buf); > +} > + > +void LIBXML2_LOG_CALLBACK libxml2_warn_callback(void *ctxt, const char *msg, ...) > +{ > + int len = 32, needed; > + char* buf = NULL; > + va_list ap; > > do > { > heap_free(buf); > buf = heap_alloc(len); > + va_start(ap, msg); > needed = vsnprintf(buf, len, msg, ap); > + va_end(ap); > if (needed == -1) > len *= 2; > else if (needed >= len) > @@ -91,11 +110,13 @@ void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, > } > while (needed); > > - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", buf); > + wine_dbg_log(__WINE_DBCL_WARN, &__wine_dbch_msxml, "libxml2", "%s", buf); > heap_free(buf); > } > > -void wineXmlCallbackError(char const* caller, xmlErrorPtr err) > +#undef LIBXML2_LOG_CALLBACK > + > +void libxml2_structured_error(const char* caller, xmlErrorPtr err) > { > enum __wine_debug_class dbcl; > > diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h > index e51501b..66c3b89 100644 > --- a/dlls/msxml3/msxml_private.h > +++ b/dlls/msxml3/msxml_private.h > @@ -289,21 +289,11 @@ extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) DECLSPEC_HIDDEN; > > extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ) DECLSPEC_HIDDEN; > > -extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) DECLSPEC_HIDDEN; > -extern void wineXmlCallbackError(char const* caller, xmlErrorPtr err) DECLSPEC_HIDDEN; > +extern void libxml2_structured_error(const char* caller, xmlErrorPtr err) DECLSPEC_HIDDEN; > +extern void libxml2_error_callback(void *ctxt, const char *msg, ...) DECLSPEC_HIDDEN; > +extern void libxml2_warn_callback(void *ctxt, const char *msg, ...) DECLSPEC_HIDDEN; > > -#define LIBXML2_LOG_CALLBACK __WINE_PRINTF_ATTR(2,3) > - > -#define LIBXML2_CALLBACK_TRACE(caller, msg, ap) \ > - wineXmlCallbackLog(#caller, XML_ERR_NONE, msg, ap) > - > -#define LIBXML2_CALLBACK_WARN(caller, msg, ap) \ > - wineXmlCallbackLog(#caller, XML_ERR_WARNING, msg, ap) > - > -#define LIBXML2_CALLBACK_ERR(caller, msg, ap) \ > - wineXmlCallbackLog(#caller, XML_ERR_ERROR, msg, ap) > - > -#define LIBXML2_CALLBACK_SERROR(caller, err) wineXmlCallbackError(#caller, err) > +#define LIBXML2_CALLBACK_SERROR(caller, err) libxml2_structured_error(#caller, err) > > extern BOOL is_preserving_whitespace(xmlNodePtr node) DECLSPEC_HIDDEN; > extern BOOL is_xpathmode(const xmlDocPtr doc) DECLSPEC_HIDDEN; > diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c > index 253f901..c06bb69 100644 > --- a/dlls/msxml3/schema.c > +++ b/dlls/msxml3/schema.c > @@ -230,85 +230,53 @@ static const BYTE hash_assoc_values[] = > 116, 116, 116, 116, 116, 116 > }; > > -static void LIBXML2_LOG_CALLBACK parser_error(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_ERR(Schema_parse, msg, ap); > - va_end(ap); > -} > - > -static void LIBXML2_LOG_CALLBACK parser_warning(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_WARN(Schema_parse, msg, ap); > - va_end(ap); > -} > - > #ifdef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS > -static void parser_serror(void* ctx, xmlErrorPtr err) > +static void libxml2_schema_structerror(void* ctx, xmlErrorPtr err) > { > - LIBXML2_CALLBACK_SERROR(Schema_parse, err); > + LIBXML2_CALLBACK_SERROR(schema_parse, err); > } > #endif > > -static inline xmlSchemaPtr Schema_parse(xmlSchemaParserCtxtPtr spctx) > +static inline xmlSchemaPtr schema_parse(xmlSchemaParserCtxtPtr ctxt) > { > - TRACE("(%p)\n", spctx); > + TRACE("(%p)\n", ctxt); > > - xmlSchemaSetParserErrors(spctx, parser_error, parser_warning, NULL); > + xmlSchemaSetParserErrors(ctxt, libxml2_error_callback, libxml2_warn_callback, NULL); > #ifdef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS > - xmlSchemaSetParserStructuredErrors(spctx, parser_serror, NULL); > + xmlSchemaSetParserStructuredErrors(ctxt, libxml2_schema_structerror, NULL); > #endif > > - return xmlSchemaParse(spctx); > -} > - > -static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_ERR(Schema_validate_tree, msg, ap); > - va_end(ap); > -} > - > -static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) > -{ > - va_list ap; > - va_start(ap, msg); > - LIBXML2_CALLBACK_WARN(Schema_validate_tree, msg, ap); > - va_end(ap); > + return xmlSchemaParse(ctxt); > } > > #ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS > -static void validate_serror(void* ctx, xmlErrorPtr err) > +static void libxml2_validate_structerror(void* ctx, xmlErrorPtr err) > { > - LIBXML2_CALLBACK_SERROR(Schema_validate_tree, err); > + LIBXML2_CALLBACK_SERROR(schema_validate_tree, err); > } > #endif > > -static inline HRESULT Schema_validate_tree(xmlSchemaPtr schema, xmlNodePtr tree) > +static inline HRESULT schema_validate_tree(xmlSchemaPtr schema, xmlNodePtr tree) > { > - xmlSchemaValidCtxtPtr svctx; > + xmlSchemaValidCtxtPtr ctxt; > int err; > > TRACE("(%p, %p)\n", schema, tree); > /* TODO: if validateOnLoad property is false, > * we probably need to validate the schema here. */ > - svctx = xmlSchemaNewValidCtxt(schema); > - xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); > + ctxt = xmlSchemaNewValidCtxt(schema); > + xmlSchemaSetValidErrors(ctxt, libxml2_error_callback, libxml2_warn_callback, NULL); > #ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS > - xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); > + xmlSchemaSetValidStructuredErrors(ctxt, libxml2_validate_structerror, NULL); > #endif > > if (tree->type == XML_DOCUMENT_NODE) > - err = xmlSchemaValidateDoc(svctx, (xmlDocPtr)tree); > + err = xmlSchemaValidateDoc(ctxt, (xmlDocPtr)tree); > else > - err = xmlSchemaValidateOneElement(svctx, tree); > + err = xmlSchemaValidateOneElement(ctxt, tree); > > - xmlSchemaFreeValidCtxt(svctx); > - return err? S_FALSE : S_OK; > + xmlSchemaFreeValidCtxt(ctxt); > + return err ? S_FALSE : S_OK; > } > > static DWORD dt_hash(xmlChar const* str, int len /* calculated if -1 */) > @@ -599,11 +567,11 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) > > if (!datatypes_schema) > { > - xmlSchemaParserCtxtPtr spctx; > + xmlSchemaParserCtxtPtr ctxt; > assert(datatypes_src != NULL); > - spctx = xmlSchemaNewMemParserCtxt((char const*)datatypes_src, datatypes_len); > - datatypes_schema = Schema_parse(spctx); > - xmlSchemaFreeParserCtxt(spctx); > + ctxt = xmlSchemaNewMemParserCtxt((char const*)datatypes_src, datatypes_len); > + datatypes_schema = schema_parse(ctxt); > + xmlSchemaFreeParserCtxt(ctxt); > } > > switch (dt) > @@ -656,7 +624,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) > xmlSetNs(node, ns); > xmlDocSetRootElement(tmp_doc, node); > > - hr = Schema_validate_tree(datatypes_schema, (xmlNodePtr)tmp_doc); > + hr = schema_validate_tree(datatypes_schema, (xmlNodePtr)tmp_doc); > xmlFreeDoc(tmp_doc); > } > else > @@ -844,7 +812,7 @@ static BOOL link_datatypes(xmlDocPtr schema) > static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI, MSXML_VERSION v) > { > cache_entry* entry = heap_alloc(sizeof(cache_entry)); > - xmlSchemaParserCtxtPtr spctx; > + xmlSchemaParserCtxtPtr ctxt; > xmlDocPtr new_doc = xmlCopyDoc(doc, 1); > > link_datatypes(new_doc); > @@ -853,9 +821,9 @@ static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI > * do we need to do something special here? */ > entry->type = CacheEntryType_XSD; > entry->ref = 0; > - spctx = xmlSchemaNewDocParserCtxt(new_doc); > + ctxt = xmlSchemaNewDocParserCtxt(new_doc); > > - if ((entry->schema = Schema_parse(spctx))) > + if ((entry->schema = schema_parse(ctxt))) > { > xmldoc_init(entry->schema->doc, v); > entry->doc = entry->schema->doc; > @@ -868,7 +836,7 @@ static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI > heap_free(entry); > entry = NULL; > } > - xmlSchemaFreeParserCtxt(spctx); > + xmlSchemaFreeParserCtxt(ctxt); > return entry; > } > > @@ -884,7 +852,7 @@ static cache_entry* cache_entry_from_xdr_doc(xmlDocPtr doc, xmlChar const* nsURI > entry->ref = 0; > spctx = xmlSchemaNewDocParserCtxt(xsd_doc); > > - if ((entry->schema = Schema_parse(spctx))) > + if ((entry->schema = schema_parse(spctx))) > { > entry->doc = new_doc; > xmldoc_init(entry->schema->doc, version); > @@ -1443,7 +1411,7 @@ HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tr > /* TODO: if the ns is not in the cache, and it's a URL, > * do we try to load from that? */ > if (schema) > - return Schema_validate_tree(schema, tree); > + return schema_validate_tree(schema, tree); > else > WARN("no schema found for xmlns=%s\n", get_node_nsURI(tree)); > > diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c > index ba173f9..61e7f24 100644 > --- a/dlls/msxml3/selection.c > +++ b/dlls/msxml3/selection.c > @@ -738,7 +738,7 @@ static void XSLPattern_OP_IGEq(xmlXPathParserContextPtr pctx, int nargs) > xmlFree(arg2); > } > > -static void query_serror(void* ctx, xmlErrorPtr err) > +static void libxml2_selection_structerror(void* ctx, xmlErrorPtr err) > { > LIBXML2_CALLBACK_SERROR(domselection_create, err); > } > @@ -767,7 +767,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) > init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSelection_iface, &domselection_dispex); > xmldoc_add_ref(This->node->doc); > > - ctxt->error = query_serror; > + ctxt->error = libxml2_selection_structerror; > ctxt->node = node; > registerNamespaces(ctxt); > > -- > 1.5.6.5 > >

3 3

Re: gdi32: Make output of dumping GDI objects more compact.
by Dmitry Timoshkov Feb. 16, 2012

Feb. 16, 2012

Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/gdi32/gdiobj.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) What's the reason for the 'rejected' status? -- Dmitry.

2 8

Re: [1/2] msxml3: Use static buffer when tracing libxml2 error messages
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Use static buffer when tracing libxml2 error messages I don't think it's necessary to rename all the functions. Please keep patches small, especially during code freeze. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: How program are Loaded to wine
by Dan Kegel Feb. 16, 2012

Feb. 16, 2012

Have you read the documentation, e.g. http://www.winehq.org/docs/winedev-guide/architecture ? Have you tried stepping through the source of CreateProcess by hand? http://source.winehq.org/source/dlls/kernel32/process.c#L2389 If you need more background, I hear "Windows Internals" is useful, http://www.amazon.com/windows-internals-5-rainbow-pony/dp/0735625301

1 0

Re: winmm: Allow new sounds to interrupt previous PlaySound invocations.
by Andrew Eikum Feb. 16, 2012

Feb. 16, 2012

On Thu, Feb 16, 2012 at 10:10:09AM +0100, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Hi, > > this fixes bug #28413. > Thanks Jörg, looks sane to me and I can confirm it fixes the problem. Andrew

1 0

Re: advapi32/tests: Marked some tests that fail on Wine as todo_wine.
by Johan Gill Feb. 16, 2012

Feb. 16, 2012

Now I ran the tests on another Linux system with wine, and there the failing tests are skipped, so it seems I did not fully understand what's going on here and why the tests are run on my system.

1 0

Re: msxml3: Fix varargs handling in libxml2 error callback implementation
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > The problem is that vsnprintf() was called multiple times with same > va_list. Ti fix that it was necessary to get rid of some tracing bits > like macro-defined callback calls and a single function for all kinds > of error types. Actually there's no need to call vsnprintf multiple times. The debug buffer has a limited size anyway, so we might as well use a limited stack buffer here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32: Fix TB_SETEXTENDEDSTYLE to use mask passed in wParam
by Marvin Feb. 16, 2012

Feb. 16, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=16982 Your paranoid android. === WNT4WSSP6 (32 bit toolbar) === toolbar.c:1898: Test failed: 1: got style 0x00000008, expected 0x00000099 toolbar.c:1898: Test failed: 7: got style 0x00000008, expected 0x00000000 toolbar.c:1898: Test failed: 8: got style 0x00000010, expected 0x00000000 toolbar.c:1898: Test failed: 9: got style 0x00000008, expected 0x00000000

1 0

Re: po: Fix a couple of typography issues in the Finnish translation.
by Lauri Kenttä Feb. 16, 2012

Feb. 16, 2012

"Avankuvan väli:" has this colon on purpose. It's the best way to make this translation meaningful in the context (Avainkuvan väli: [BOX] kuvaa). I've already discussed this with you in private. My opinion is that the original text should be in one piece or at least have a msgctxt to allow better translations. -- Lauri Kenttä

1 0

How program are Loaded to wine
by Shanuka Wijekoon Feb. 16, 2012

Feb. 16, 2012

hello I am developing the project related to wine. so I have no idea how the programs are loaded and run by wine, what are the files initially loaded to the memory ,what are the files loaded to the memory on demand of the program.Is there any particular pattern of loading programs to memory file wise? I am new to wine so can I have good explanation about that? if there any related references and code segments it will helpful to me. Thank you

1 0

Re: advapi32: Correct tests under WOW64
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1455,9 +1455,11 @@ static void test_token_attr(void) > Size = 0; > ret = GetTokenInformation(Token, TokenGroups, Groups, Size2, &Size); > ok(Size > 1, "got %d\n", Size); > - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, > - "%d with error %d\n", ret, GetLastError()); > - ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); > + /* WoW64 return TRUE with the LastError set */ > + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%d with error %d\n", ret, GetLastError()); > + if(!ret) > + ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); Testing last error on success is in general not useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdiplus: GdipTranslateLineTransform: make stub lie and return Ok
by Dan Kegel Feb. 15, 2012

Feb. 15, 2012

On Sat, Feb 11, 2012 at 3:29 PM, Dan Kegel <dank(a)kegel.com> wrote: > This lets many .net apps run, see bug 23759. I see this patch is marked pending. Since tweaking the stub to lie and return success lets a bunch of .net apps run, it's tempting to say the benefits of the patch outweigh the risk... wine has done this kind of hack before, though maybe not during code freeze. Can someone who knows more about gdiplus comment? - Dan

2 2