August 2008 - Wine-devel - list.winehq.org

[TRY4]user32/tests: add tests for creating subclassed builtin-class windows
by Hongbo Ni 19 Aug '08

19 Aug '08

Hello All, I am adding tests to test the unicodeness of builtin class window created after the class is globally subclassed. http://www.winehq.org/pipermail/wine-patches/2008-August/059354.html It tests the following builtin classes: Edit, Button, Static, ComboBox, ComboLBox, ListBox, #32770 (dialog), ScrollBar, Message, #32768 (menu), #32769 (desktop), #32772 (icon title), DDEMLEvent, #32771 (task switch) For classes that have text, wine behave different when the class is subclassed using a Unicode procudure. Todo_wine has been added. Thanks to Dmitry Timoshkov, I also added some tests before the builin class is subclassed. It turns out CreateWindowExW can not create window for class DDEMLEvent and #32771. Marked with todo_wine. The test passed for me on Windows XP, Vista and one Wine. Dmitry Timoshkov also confirmed pass on Windows XP and Vista. How can I improve those tests ? Hongbo Ni _________________________________________________________________ It's simple! Sell your car for just $40 at CarPoint.com.au http://a.ninemsn.com.au/b.aspx?URL=http%3A%2F%2Fsecure%2Dau%2Eimrworldwide%…

1 0

Re: [TRY3]user32/tests: add tests for creating subclassedbuiltin-class windows
by Dmitry Timoshkov 19 Aug '08

19 Aug '08

"Hongbo Ni" <hongbo(a)njstar.com> wrote: > Changes since TRY2 - thanks to Dmitry Timoshkov for advice. > > 1. adds extra bulitin classes: ScrollBar,Message,DDEMLEvent & all #327xx; > 2. make sure created hwnd is valid; > 3. more tests for unicodeness of built-in-class window before subclassing; > 4. add more todo_wine for those extra classes without subclassing. > > Tested on Windows Vista SP1, XP SP3. > +#include "windows.h" Please avoid windows.h (include everything) inclusion, find an appropriate set of smaller include files instead, winnls.h in this case. The test looks good to me. it passes for me under XP SP3 (32 bit), and Vista SP1 x64 (native 64-bit and emulated 32-bit modes), although in order to pass in 64-bit mode I had to apply the following patch -#define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~((ULONG_PTR)0) >> 16)) +#define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == ((~(ULONG)0) >> 16)) but that's not your fault. -- Dmitry.

2 1

Re: shlwapi: add some more tests for UrlUnEscape
by Michael Karcher 18 Aug '08

18 Aug '08

Am Montag, den 18.08.2008, 08:46 +0000 schrieb Louis. Lenders: > hi, tests show that UrlUnEscape still converts the url-string if the > bufferpointer is set to NULL, and the > URL_UNESCAPE_INPLACE is set. Test passes fine with native shlwapi, and > in wine after applying the previous sent patch : > http://www.winehq.org/pipermail/wine-patches/attachments/20080814/d5feb31b/… Please resend the patch including the testcase, instead of sending a testcase alone. This puts test & fix into the same entry in git history, so that a later review of the changes is eased by having the appropriate testcase directly at hand. Patches including testcases also have a higher chance of getting committed. Regards, Michael Karcher

1 1

Re: Add TRACEs to NtCreateFile returns
by Michael Karcher 18 Aug '08

18 Aug '08

Another review. Am Sonntag, den 20.07.2008, 22:42 +0200 schrieb Markus Hitter: > Similar to NtReadFile and NtWriteFile, NtCreateFile should trace > return values on request. Providing the file handle allows to map > read/write requests to the corresponding file name. Seems very sensible. Your implementation looks OK, except for me not being sure whether status codes are usually printed decimal or hexadecimal. Please check. > Additionally, wrap a overly long line. Please don't put a style change and a functionality change that are independent into the same patch. Usual convention is to leave style of code parts one does not touch alone. If you really feel like that line should be changed, submit it as seperate patch. Regards, Michael Karcher

2 1

Re: Better reflect the current state of DrawIconEx
by Michael Karcher 18 Aug '08

18 Aug '08

You indirectly asked for review of your patches. The comments below might be reasons your patch did not get accepted. Best way to handle ignored patches is to look over the patch again, and if one does not see something that can be improved, just ask on wine-devel or (even better) the IRC channel whether anyone can see something wrong with that patch. Am Montag, den 21.07.2008, 21:17 +0200 schrieb Markus Hitter: > diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c > index a1ba570..eca9bfb 100644 > --- a/dlls/user32/cursoricon.c > +++ b/dlls/user32/cursoricon.c > @@ -1979,7 +1979,9 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT > y0, HICON hIcon, > if (istep) > FIXME_(icon)("Ignoring istep=%d\n", istep); > if (flags & DI_COMPAT) > - FIXME_(icon)("Ignoring flag DI_COMPAT\n"); > + FIXME_(icon)("DI_COMPAT flag unimplemented (before NT4.0)\n"); As this flag is ignored on newer windows versions, you might think about removing that check altogether instead of just changing the message. > + if (flags & DI_NOMIRROR) > + FIXME_(icon)("DI_NOMIRROR flag unimplemented (XP or later)\n"); As a wine user, I don't care which windows versions implement this flag. What I do care about is whether the program requested some functionality from wine it can't handle. So I would just show a message that says "DI_NOMIRROR flag unimplemented", and skip the version information. Regards, Michael Karcher

1 0

Re: [Gdiplus 8/9] Implement GdipGetFontHeight
by Nikolay Sivov 18 Aug '08

18 Aug '08

Adam Petaccia wrote: > --- > dlls/gdiplus/font.c | 18 ++++++++++++++++++ > dlls/gdiplus/gdiplus.spec | 2 +- > include/gdiplusflat.h | 2 ++ > 3 files changed, 21 insertions(+), 1 deletions(-) > > diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c > index 0c78bd5..5e1a14e 100644 > --- a/dlls/gdiplus/font.c > +++ b/dlls/gdiplus/font.c > @@ -387,6 +387,24 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) > } > > /******************************************************************************* > + * GdipGetFontHeight [GDIPLUS.@] > + */ > +GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, > + GDIPCONST GpGraphics *graphics, REAL *height) > +{ > + REAL dpi; > + GpStatus stat; > + > + TRACE("%p %p %p\n", font, graphics, height); > + > + stat = GdipGetDpiX(graphics, &dpi); > Is it normal that you use GdipGetDpiX and not GdipGetDpiY? I'm not much familiar with fonts so treat it like a question. It seems to me that height is measured using another axis. > + if (stat != Ok) > + return stat; > + > + return GdipGetFontHeightGivenDPI(font, dpi, height); > +} > + > +/******************************************************************************* > * GdipGetFontHeightGivenDPI [GDIPLUS.@] > * PARAMS > * font [I] Font to retrieve DPI from > diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec > index f1ad0d4..e37eeec 100644 > --- a/dlls/gdiplus/gdiplus.spec > +++ b/dlls/gdiplus/gdiplus.spec > @@ -267,7 +267,7 @@ > @ stdcall GdipGetFamilyName(ptr ptr long) > @ stdcall GdipGetFontCollectionFamilyCount(ptr ptr) > @ stdcall GdipGetFontCollectionFamilyList(ptr long ptr ptr) > -@ stub GdipGetFontHeight > +@ stdcall GdipGetFontHeight(ptr ptr ptr) > @ stdcall GdipGetFontHeightGivenDPI(ptr long ptr) > @ stdcall GdipGetFontSize(ptr ptr) > @ stdcall GdipGetFontStyle(ptr ptr) > diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h > index 17fae9c..f650e24 100644 > --- a/include/gdiplusflat.h > +++ b/include/gdiplusflat.h > @@ -425,6 +425,8 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**); > GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); > GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*); > GpStatus WINGDIPAPI GdipGetFontStyle(GpFont*, INT*); > +GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont*, GDIPCONST GpGraphics*, > + REAL*); > GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*); > > GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, >

1 0

Re: [Gdiplus] Implement GdipCloneImage
by Huw Davies 18 Aug '08

18 Aug '08

On Sat, Aug 16, 2008 at 11:26:42PM -0400, Adam Petaccia wrote: > This seems like the right thing to do, but OleLoadImage fails. > Comments welcome. > --- > dlls/gdiplus/image.c | 42 ++++++++++++++++++++++++++++++++++++++++-- > dlls/gdiplus/tests/image.c | 2 +- > 2 files changed, 41 insertions(+), 3 deletions(-) > > diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c > index 197665d..a74003f 100644 > --- a/dlls/gdiplus/image.c > +++ b/dlls/gdiplus/image.c > @@ -242,11 +242,49 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, > > GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) > { > + hr = OleLoadPicture(stream, size, FALSE, &IID_IPicture, > + (LPVOID*)(*cloneImage)->picture); This can't be right. You need to pass the address of the interface ptr. Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Re: [Gdiplus 1/5] Tests for PrivateFontCollection
by Nikolay Sivov 18 Aug '08

18 Aug '08

Adam Petaccia wrote: > --- > dlls/gdiplus/tests/font.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 81 insertions(+), 0 deletions(-) > > diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c > index 3d30a86..b19f0aa 100644 > --- a/dlls/gdiplus/tests/font.c > +++ b/dlls/gdiplus/tests/font.c > @@ -28,6 +28,7 @@ static const WCHAR arial[] = {'A','r','i','a','l','\0'}; > static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; > static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; > static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; > +static const WCHAR Tahoma[] = {'T','a','h','o','m','a','\0'}; > static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; > static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; > > @@ -333,6 +334,85 @@ monospace: > expect (Ok, stat); > } > > +static void test_fontcollections(void) > +{ > + const static WCHAR tahomafilename[] = {'C',':','\\','W','I','N','D','O','W','S','\\','F','o','n','t','s','\\','T','a','h','o','m','a','.','t','t','f','\0'}; > + const static WCHAR timesNRfilename[] = {'C',':','\\','W','I','N','D','O','W','S','\\','F','o','n','t','s','\\','T','i','m','e','s','.','t','t','f','\0'}; > + const static WCHAR badFileName[] = {'C',':','\\','W','I','N','D','O','W','S','\\','F','o','n','t','s','\\','S','h','o','u','l','d','n','o','t','e','x','i','s','t','.','t','t','f','\0'}; > + > + static WCHAR familyName[LF_FACESIZE]; > + GpStatus stat; > + GpFontCollection* PrivateFontCollection; > + GpFontFamily** fontFamily; > + INT expected = 0, count = 0, i; > + BOOL hastahoma, hastimesnr; > + > + stat = GdipNewPrivateFontCollection(&PrivateFontCollection); > +todo_wine > + expect(Ok, stat); > + stat = GdipPrivateAddFontFile(PrivateFontCollection, NULL); > + expect(InvalidParameter, stat); > +todo_wine{ > + stat = GdipPrivateAddFontFile(PrivateFontCollection, badFileName); > + expect(FileNotFound, stat); > + > + stat = GdipPrivateAddFontFile(PrivateFontCollection, tahomafilename); > + if (stat == Ok) > + { > + expected++; > + hastahoma = TRUE; > + } > + > + stat = GdipPrivateAddFontFile(PrivateFontCollection, timesNRfilename); > + if (stat == Ok) > + { > + expected++; > + hastimesnr = TRUE; > + } > + > + stat = GdipGetFontCollectionFamilyCount(PrivateFontCollection, &count); > + expect(Ok, stat); > + expect(expected, count); > + > + expected = count; > + > + /* Test retrieving of installed fonts */ > + fontFamily = GdipAlloc(sizeof(GpFontFamily*) * count); > + stat = GdipGetFontCollectionFamilyList(PrivateFontCollection, count, > + fontFamily, &count); > + expect(Ok, stat); > + expect(expected, count); > + if (stat == Ok) > + { > + i = 0; > + if (hastahoma) > + { > + GdipGetFamilyName(fontFamily[i], familyName, LANG_NEUTRAL); > + ok(lstrcmpiW(familyName, Tahoma) == 0, "Expected Tahoma, got %s\n", > + debugstr_w(familyName)); > + i++; > + } > + > + if (hastimesnr) > + { > + GdipGetFamilyName(fontFamily[i], familyName, LANG_NEUTRAL); > + ok(lstrcmpiW(familyName, TimesNewRoman) == 0, "Expected Times New " > + "Roman, got %s\n", debugstr_w(familyName)); > + i++; > This i++ is redundant, isn't it? > + } > + } > + > + for (i = 0; i < count; i++) > + { > + stat = GdipDeleteFontFamily(fontFamily[i]); > + expect(Ok, stat); > + } > +} > + > + stat = GdipDeletePrivateFontCollection(&PrivateFontCollection); > + expect(Ok, stat); > +} > + > START_TEST(font) > { > struct GdiplusStartupInput gdiplusStartupInput; > @@ -350,6 +430,7 @@ START_TEST(font) > test_fontfamily(); > test_fontfamily_properties(); > test_getgenerics(); > + test_fontcollections(); > > GdiplusShutdown(gdiplusToken); > } >

1 0

Re: rpcrt4: Remove unreachable code in EmbeddedComplexSize.
by James McKenzie 18 Aug '08

18 Aug '08

Rob Shearman wrote: > RPC_FC_ERROR_STATUS_T has a value of 0x10 and therefore isn't a > possible value of "flags_type & 0xf" in the switch statement. > Rob: This may be a really stupid question, but is it possible to generate this condition? James McKenzie

3 3

How to use wine to load windows dll files ?
by Gregory Hosler 18 Aug '08

18 Aug '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi All, I'm a developer of an open source project that needs to load some windows dlls for conversion routines. Specifically, I'm the lead developer of GyachI https://sourceforge.net/projects/gyachi/ a Yahoo Messenger client. In GyachI, in order to support speech in chat rooms, we make use of the window dll codec files (supplied by the end user) to do the necessary codec compression/decompression. At the present moment, we copied mplayer's method of loading the dll files. That is to say that we have some very old wine code in our source tree. It works, but as and when a user runs GyachI on a box with wine installed, then GyachI will run against the installed wine libraries instead of the inbuilt wine code (not sure how, but this seems to be the case, from several reports). Since the code that we're using is all wine code, and in fact it is in the wine libraries, I would like to purge the wine code out of our project tree, and just compile/link against the necessary wine header files / wine libraries. To that extent, I have been able to remove the wine code from a build tree, and using the wine header files, I can get my code to compile. However, when I go to link, I get a number of undefined symbols. Some of the undefined symbols (at link time) are: undefined reference to `CloseDriver' undefined reference to `CodecAlloc' undefined reference to `CodecRelease' undefined reference to `export_names' undefined reference to `GetProcAddress' undefined reference to `HeapAlloc' undefined reference to `HeapFree' undefined reference to `OpenDriverA' undefined reference to `SendDriverMessage' undefined reference to `__vprintf' Upon investigation, I've discovered that many of the routines that I'm linking against are not in libwine.so, but instead, they are in other libraries. e.g. /usr/lib/wine/user32.dll.so, /usr/lib/wine/winmm.dll.so, and a few others. I would like to know how to link to and make use of these routines in the respective wine libraries. I'm willing to write any stub code that might need to be written, but I cannot find any documentation of what needs to be done. Any suggestions, pointers, links, urls, etc., would be most appreciated. Code samples (e.g. from other projects doing what I'm trying to do) would also be much appreciated. :) Many thanks, and best rgds, - -Greg - -- +---------------------------------------------------------------------+ Please also check the log file at "/dev/null" for additional information. (from /var/log/Xorg.setup.log) | Greg Hosler ghosler(a)redhat.com | +---------------------------------------------------------------------+ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iD8DBQFIqQJ6404fl/0CV/QRAivBAJ0c66W7ePiItK8ZvNnZ/1nLErSWKwCfRRD7 PbePRptt6e8mEEefwRx2YsE= =euK4 -----END PGP SIGNATURE-----

2 1