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

Re: [PATCH 1/2] Implement GdipGetLogFontA (try3)
by Adam Petaccia Nov. 18, 2008

Nov. 18, 2008

Was there something wrong with this patch series? On Tue, 2008-11-11 at 11:24 -0500, Adam Petaccia wrote: > Changelog: > try3: > Only copy the bytes we'll use > Toss out bytesWritten > try2: > Fix memcpy() use > Add documentation > Add testcase > --- > dlls/gdiplus/font.c | 27 +++++++++++++++++++++++++++ > dlls/gdiplus/gdiplus.spec | 2 +- > include/gdiplusflat.h | 1 + > 3 files changed, 29 insertions(+), 1 deletions(-) > > diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c > index 32713c7..7f815b6 100644 > --- a/dlls/gdiplus/font.c > +++ b/dlls/gdiplus/font.c > @@ -368,6 +368,33 @@ GpStatus WINGDIPAPI GdipGetFontUnit(GpFont *font, Unit *unit) > } > > /******************************************************************************* > + * GdipGetLogFontA [GDIPLUS.@] > + * > + * Converts a font into a LOGFONTA > + * > + * PARAMS > + * font [I] GpFont to create LOGFONTA object > + * graphics [I] Current graphics context > + * lfa [O] Resulting LOGFONTA object > + * RETURNS > + * InvalidParameter: font, graphics, or lfa was NULL. > + * Ok: otherwise > + */ > +GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, > + LOGFONTA *lfa) > +{ > + /* FIXME: use graphics */ > + if(!(font && graphics && lfa)) > + return InvalidParameter; > + > + memcpy(lfa, &font->lfw, FIELD_OFFSET(LOGFONTA, lfFaceName)); > + WideCharToMultiByte(CP_ACP, 0, font->lfw.lfFaceName, -1, > + lfa->lfFaceName, LF_FACESIZE, NULL, NULL); > + > + return Ok; > +} > + > +/******************************************************************************* > * GdipGetLogFontW [GDIPLUS.@] > */ > GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, > diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec > index c25d4b7..dce558c 100644 > --- a/dlls/gdiplus/gdiplus.spec > +++ b/dlls/gdiplus/gdiplus.spec > @@ -311,7 +311,7 @@ > @ stdcall GdipGetLineSpacing(ptr long ptr) > @ stub GdipGetLineTransform > @ stdcall GdipGetLineWrapMode(ptr ptr) > -@ stub GdipGetLogFontA > +@ stdcall GdipGetLogFontA(ptr ptr ptr) > @ stdcall GdipGetLogFontW(ptr ptr ptr) > @ stdcall GdipGetMatrixElements(ptr ptr) > @ stub GdipGetMetafileDownLevelRasterizationLimit > diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h > index ea4bec5..a2c6fc9 100644 > --- a/include/gdiplusflat.h > +++ b/include/gdiplusflat.h > @@ -81,6 +81,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**); > GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); > GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); > GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); > +GpStatus WINGDIPAPI GdipGetLogFontA(GpFont*,GpGraphics*,LOGFONTA*); > GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); > GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**); > GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*);

2 1

Re: implement OleLoadPictureFile
by Austin English Nov. 18, 2008

Nov. 18, 2008

On Wed, Nov 12, 2008 at 2:16 AM, Jeremy Drake <wine(a)jdrake.com> wrote: > I ran into a function that was not implemented when attempting to run a > program I work on under wine. > > This patch implements OleLoadPictureFile based on the MSDN docs > (http://msdn.microsoft.com/en-us/library/ms221680.aspx) and what I saw > when stepping through in windbg on XP. > > A few notes: > I'm not sure I got the spec file right. The first param is a VARIANT, not > a VARIANT *, so I'm not sure ptr is the right thing. > > I'm not sure the right way to do the TRACE call with the VARIANT param. > > I did not implement OleLoadPictureFileEx. Technically, OleLoadPictureFile > should call OleLoadPictureFileEx(varFilename, LP_DEFAULT, LP_DEFAULT, > LP_DEFAULT, ppdispPicture) and OleLoadPictureEx should pass the sizeX, > sizeY, and flags to OleLoadPictureEx. > > When stepping through the function in windbg, I saw it call a function > OLEAUT32!CreateFileStream which does not exist in wine anywhere. Instead > of using that, I used the same mechanism as was used in OleLoadPicturePath > (GlobalAlloc the size of the file, read the whole file in, and > CreateStreamOnHGlobal). > > Since this is my first wine patch, I hope you will forgive me these > shortcomings. I'm not subscribed to any wine list, so please copy me on > any replies. > > Thanks, > Jeremy > > > > -- > Personifiers Unite! You have nothing to lose but Mr. Dignity! > > > Can you add a testcase to show that this behavior is correct? -- -Austin

5 12

re: Patch for [Bug 16087] wine spews innumerable "Unable to check compatibility for Format..." errors in some games
by Dan Kegel Nov. 17, 2008

Nov. 17, 2008

Andrew wrote: >When sending a patch to wine-patches put the patch number followed by >how many patches you are sending so the automated scripts can read it. yes, please! > For example "[1/1] sending only one patch". Poor example, please don't do it on single patches. You only need to do it for series of more than one patch. Also please don't send patches that don't apply cleanly against current git. (You'd be surprised how many people do this. It's ok if Alexandre can figure it out, but poor old Patchwatcher will reject it.) - Dan

1 0

Re: [1/5] WineD3D: Get some vertex pipeline infrastructure in place
by Henri Verbeet Nov. 17, 2008

Nov. 17, 2008

2008/11/17 Stefan Dösinger <stefan(a)codeweavers.com>: > - } else if (fixup || > + } else if (device->vertex_pipe->can_convert_d3dcolor || fixup || Shouldn't this be redundant if you already handle color conversion in IWineD3DVertexBufferImpl_FindDecl()? > - } else { > + } else if(!device->vertex_pipe->can_convert_d3dcolor) { I don't think this is how we want to do this. I think it makes more sense to ask the pipeline if it can handle a particular type for a particular usage. You can handle FLOAT16 support in the same way then. Also note that EXT_vertex_array_bgra adds support for D3DCOLOR, but only for diffuse, specular and generic attributes. That should be enough for anything we come across, but with a "can_convert_d3dcolor" flag like that you can't handle that extension properly.

2 3

Re: Patch for [Bug 16087] wine spews innumerable "Unable to check compatibility for Format..." errors in some games
by Andrew Fenn Nov. 17, 2008

Nov. 17, 2008

Your patch adds extra whitespace on an empty line. You are mixing coding styles with your if statements. When sending a patch to wine-patches put the patch number followed by how many patches you are sending so the automated scripts can read it. For example "[1/1] sending only one patch". 2008/11/16 Bogdan Butnaru <bogdanb(a)gmail.com>: > Patch for http://bugs.winehq.org/show_bug.cgi?id=16087 > > -- > Bogdan Butnaru > > > >

1 0

Re: (try 5) comdlg32/tests: Windows XP+ cannot do a CreateViewWindow2 twice in rapid seccesion. handle this error.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -182,19 +182,26 @@ static UINT CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam, > > hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); > ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); > - ok(folder_settings.ViewMode == FVM_LIST, "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_LIST); > + ok(folder_settings.ViewMode == FVM_DETAILS, "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_DETAILS); > > hr = IShellView2_DestroyViewWindow(shell_view2); > ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); > > - view_params.pvid = &VID_Details; > + folder_settings.ViewMode = FVM_LIST; > + folder_settings.fFlags = 0; > + view_params.pvid = NULL; > hr = IShellView2_CreateViewWindow2(shell_view2, &view_params); > - ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr); > + /* > + * Windows XP is unable to recreate the ViewWindow2 returning > + * A Catastrophic failure error > + */ So why can't it recreate it? Do you need to clean up something else beforehand? -- Alexandre Julliard julliard(a)winehq.org

2 1

[wdm.h] AddDevice member
by Alessandro Nov. 17, 2008

Nov. 17, 2008

Hi, I've noticed that the AddDevice member of DRIVER_EXTENSION is not declared as a functio pointer. I've put up a patch to fix this. Alessandro Pignotti -- Vi Veri Veniversum Vivus Vici -Dr. Faustus - Marlowe Public GPG Key ID 0x650B3ED9 on subkeys.gpg.net Key Fingerprint 6243 AAD3 E3EC 52D8 DFAA 2A2F 9FCD 0457 650B 3ED9 Encrypted mails are welcome

1 0

Re: msxml3: Determine whether to call xsltInit() or not at run time.
by Michael Karcher Nov. 17, 2008

Nov. 17, 2008

Am Montag, den 17.11.2008, 15:09 +0100 schrieb Francois Gouget: > configure will need to be regenerated. I did not include it here since > the consensus seems to be that it should not be included. Just a nitpick: Same applies for config.h.in, then. > As a reminder, the issue is that it's not because the libxslt.so we > compile against has xlstInit() that the one we load at runtime will have > it too. And vice versa. Wait a moment. I don't know about Wine's dl* functions, but can't we use dlsym with the RTLD_DEFAULT handle to look in the libxslt msxml3.dll.so is linked with anyway? That would do away with the need to know the soname during compilation. As it is hardcoded into the executable during link, hard-coding the soname doesn't hurt that much too, but still it gets simpler Regards, Michael Karcher

2 1

Race in thread shutdown in imm32?
by Dan Kegel Nov. 17, 2008

Nov. 17, 2008

I'm seeing the following valgrind warning in three out of eight runs under heavy load: InvalidRead IMM_FreeThreadData:233 DllMain:382 __wine_spec_dll_entry:40 MODULE_InitDLL:911 LdrShutdownThread:2174 call_thread_func:403 start_thread:444 It kind of feels like a race between thread shutdown and process shutdown. Does that ring a bell with anyone? - Dan

3 3

New error: cp: X and X are the same file
by Dan Kegel Nov. 17, 2008

Nov. 17, 2008

I'm seeing a lot of errors like this lately: cp: `/home/dank/.local/share/icons/3550_shell32.0.xpm' and `/home/dank/.local/share/icons/3550_shell32.0.xpm' are the same file Did the recent rewrite of menu item creation break something?

1 0