February 2009 - Wine-devel - list.winehq.org

Re: user32: implement support for HBMENU_POPUP_* magic menu bitmaps and use them to decorate the system menu
by Peter Oberndorfer 20 Feb '09

20 Feb '09

On Freitag 20 Februar 2009, Rein Klazes wrote: > Hi, > > See subject. > > Rein. > Hi, mostly minor code style comments. > if( hMenu ) { > + MENUINFO minfo; > + MENUITEMINFOW miteminfo; > POPUPMENU* menu = MENU_GetMenu(hMenu); > menu->wFlags |= MF_SYSMENU | MF_POPUP; > SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE); > + > + minfo.cbSize = sizeof( MENUINFO); > + minfo.dwStyle = MNS_CHECKORBMP; > + minfo.fMask = MIM_STYLE; > + SetMenuInfo( hMenu, &minfo); > + > + miteminfo.cbSize = sizeof( MENUITEMINFOW); > + miteminfo.fMask = MIIM_BITMAP; > + miteminfo.hbmpItem = HBMMENU_POPUP_CLOSE; > + SetMenuItemInfoW( hMenu, SC_CLOSE, FALSE, &miteminfo); > + miteminfo.hbmpItem = HBMMENU_POPUP_RESTORE; > + SetMenuItemInfoW( hMenu, SC_RESTORE, FALSE, &miteminfo); > + miteminfo.hbmpItem = HBMMENU_POPUP_MAXIMIZE; > + SetMenuItemInfoW( hMenu, SC_MAXIMIZE, FALSE, &miteminfo); > + miteminfo.hbmpItem = HBMMENU_POPUP_MINIMIZE; > + SetMenuItemInfoW( hMenu, SC_MINIMIZE, FALSE, &miteminfo); > } I think this part deserves a bit more spacing to be readable. Something like the above looks better IMO. Also there is some inconsistent spacing around the beginning and end ()/{} which does not match the rest of the file. > + logfont.lfHeight = min( h, w) - 2 ; > + TextOutW( hdc, rect->left, rect->top, bmchr, 1); double space after '=' and ',' > case (INT_PTR)HBMMENU_POPUP_CLOSE: > + bmchr[0] = 0x72; > + break; > case (INT_PTR)HBMMENU_POPUP_RESTORE: > + bmchr[0] = 0x32; > + break; > case (INT_PTR)HBMMENU_POPUP_MAXIMIZE: > + bmchr[0] = 0x31; > + break; > case (INT_PTR)HBMMENU_POPUP_MINIMIZE: > + bmchr[0] = 0x30; > + break; The constants seem to be equal to DFCS_CAPTION... I just tried to use DrawFrameControl but it seems to always draw a border around the images. And i did not find the right parameters for not drawing a border. It could save some code for font setup but i guess it is not usable for this :-( > + TRACE(" height %d rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); leftover from debugging or is it still needed? Greetings Peter

1 0

Re: msi: begin support for finding network last sources in find_published_source
by James Hawkins 20 Feb '09

20 Feb '09

On Thu, Feb 19, 2009 at 12:28 PM, Aric Stewart <aric(a)codeweavers.com> wrote: > > Fix for office 2007 sp 1 install. > --- > dlls/msi/media.c | 33 +++++++++++++++++++++++++++++++++ > 1 files changed, 33 insertions(+), 0 deletions(-) > I believe you're going down the wrong road with respect to the Office 2007 SP1 installer. None of the files installed/patched by SP1 need access to the original media, or stored local copies of the cab archives. With the fullfile install (which I'm not sure there's another version), you should be able to remove the original media, erase the stored cab files, and successfully install SP1. The fact that our implementation tries to access those cabs or the original media is the bug. There are many conditions and variables that factor in to whether a file should be reinstalled or not, and most of them have been fixed, but this patch is hiding all of the rest of the bugs. I'm not sure if you got the email I sent Jer about this problem, but the real bug is that we aren't handling the REINSTALL variable correctly (or REINSTALLMODE for that matter.) Can you please describe the exact case for why this patch is needed? -- James Hawkins

2 4

Re: Wine download page usability problem
by James Mckenzie 20 Feb '09

20 Feb '09

Austin English <austinenglish(a)gmail.com> wrote: >Sent: Feb 20, 2009 10:32 AM >To: Dan Kegel <dank(a)kegel.com> >Cc: "wine-devel(a)winehq.org" <wine-devel(a)winehq.org> >Subject: Re: Wine download page usability problem > >On Fri, Feb 20, 2009 at 11:24 AM, Dan Kegel <dank(a)kegel.com> wrote: >> >> Can we add in a line at the top saying >> "Stable version 1.0.1 of Wine can usually be installed >> just like any other Linux application using your >> package manager (e.g. in Ubuntu, do Applications / Add/Remove, >> select Wine, and click Apply Changes). > >Nitpick, but instead of 'Linux', use 'native'. FreeBSD's ports >contains wine, as well as NetBSD's. Please exclude MacOSX which does not include Wine and I doubt it ever will. > >> I think we should also move the text >> "This endorsement is the primary recognition that CodeWeavers has >> requested in exchange for hosting the Wine web site." >> to the bottom of the page, and change it to read >> "Thanks to CodeWeavers for hosting WineHQ.org". > >+1 > ++1 James McKenzie

2 1

Re: msadp32.acm, winemp3.acm: Removed compiler warning
by Ricardo Filipe 20 Feb '09

20 Feb '09

you should send one patch per email, dan should have told you that :P good to see you guys on the project :) 2009/2/20 Adam Stoelting <astoelting(a)ucla.edu> > Hello, > > These are my first patches. I am graduate student at UCLA and am trying to > help with porting Wine to 64 bit. I haven't seen any Microsoft source code > or done any dll dissasembly on my own. > > Change Log: > Removed the compiler pointer cast warning for dlls/msadp32.acm/msadp32.c > and > dlls/winemp3.acm/mpegl3.c. > > Thanks, > Adam > > > >

1 0

Re: [12/13] fusion: Sort the list of assemblies built during enumeration.
by James Hawkins 20 Feb '09

20 Feb '09

On Thu, Feb 19, 2009 at 5:06 AM, Hans Leidekker <hans(a)codeweavers.com> wrote: > > This hopefully fixes the test failures on Alexandre's machine. > This isn't how it's done on Windows. On Windows, the order is based solely on directory enumeration, which we don't try to match in Wine. The fix is to check for all N results N times, where N is the number of assemblies enumerated. -- James Hawkins

3 6

Re: revert of a6c07ffba4b2b37d01affb4c39f032bb5f8d34bf
by Francois Gouget 20 Feb '09

20 Feb '09

A little bit of explanation would be nice... -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ La terre est une bêta...

2 3

Re: fusion/tests: Do not use a fixed path to the assembly
by Nicolas Le Cam 20 Feb '09

20 Feb '09

2009/2/20 Detlef Riekenberg <wine.dev(a)web.de>: > James: A fixed path is broken by design. > > This fix the remaining failure on w2k. > > The asmcache has more failures on win9x, but a fix for that > failures conflict with the patchset from Hans. > > > -- > > By by ... Detlef > > > > Hi Detlef, I've already sent a similar patch, see http://www.winehq.org/pipermail/wine-patches/2009-February/069647.html

1 0

Re: [13/13] fusion: Add tests for the IAssemblyEnum interface.
by Paul Vriens 19 Feb '09

19 Feb '09

Hans Leidekker wrote: > -Hans > > > ------------------------------------------------------------------------ > > Hi Hans, These tests crash on Vista with .NET 3.5 (not sure about other platforms/.NET versions yet). The enum_gac_assemblies function relies on the fact that ffd.cFileName contains 2 underscores. On Vista however I see some assemblies with a different format for the cFileName like: 6.0.0.0_en_31bf3856ad364e35 This explains the (first) crash as we dereference a pointer. So doing something like this fixes that piece: else if (depth == 1) { - ptr = strstr(ffd.cFileName, "__"); + CHAR version[MAX_PATH]; + + lstrcpyA(version, ffd.cFileName); + ptr = strstr(version, "_"); *ptr = '\0'; - ptr += 2; + ptr = strrchr(ffd.cFileName, '_'); + ptr += 1; sprintf(buf, "Version=%s, Culture=neutral, PublicKeyToken=%s", - ffd.cFileName, ptr); + version, ptr); This seems to work fine but than it crashes again while trying to free the memory "HeapFree(GetProcessHeap(), 0, asmname->data);" in test_enumerate. Just ignoring those HeapFree's doesn't fix it as we crash again later on. -- Cheers, Paul.

2 3

Re: [4/5] dxgi: Convert DXGI_FORMAT values to WINED3DFORMAT values.
by Stefan Dösinger 19 Feb '09

19 Feb '09

Am Donnerstag, 19. Februar 2009 17:03:37 schrieb Henri Verbeet: I haven't looked at all the different formats yet, just a general question: Why did you choose to keep the WINED3D formats and not use the DXGI formats in wined3d? I'm not saying that there's anything wrong with that, I'm just curious what lead to that decision. I was inclined to do it the other way around, mostly because of the generic and specific(ie SINT, UINT, SRGB) formats in DXGI.

2 1

Re: msctf/tests: Don't import uuid library cause it could break crosstest
by Austin English 19 Feb '09

19 Feb '09

On Thu, Feb 19, 2009 at 9:21 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Don't import uuid library cause it could break crosstest > > >From 26890998dc20bd31c2d23b8b59dfaf664ca98dc0 Mon Sep 17 00:00:00 2001 > From: Nikolay Sivov <bunglehead(a)gmail.com> > Date: Thu, 19 Feb 2009 10:20:32 -0500 > Subject: Don't import uuid library cause it could break crosstest > > --- > dlls/msctf/tests/Makefile.in | 2 +- > dlls/msctf/tests/inputprocessor.c | 1 + > 2 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in > index 669f5a1..0d7aba8 100644 > --- a/dlls/msctf/tests/Makefile.in > +++ b/dlls/msctf/tests/Makefile.in > @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. > SRCDIR = @srcdir@ > VPATH = @srcdir@ > TESTDLL = msctf.dll > -IMPORTS = uuid ole32 user32 kernel32 > +IMPORTS = ole32 user32 kernel32 > > CTESTS = \ > inputprocessor.c > diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c > index 200a0d4..2e71eec 100644 > --- a/dlls/msctf/tests/inputprocessor.c > +++ b/dlls/msctf/tests/inputprocessor.c > @@ -33,6 +33,7 @@ static ITfInputProcessorProfiles* g_ipp; > static LANGID gLangid; > > DEFINE_GUID(CLSID_FakeService, 0xEDE1A7AD,0x66DE,0x47E0,0xB6,0x20,0x3E,0x92,0xF8,0x24,0x6B,0xF3); > +DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); > > static HRESULT initialize(void) > { > -- > 1.5.6.5 > > > > > AJ beat you to it: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd656fa7f68bc86f78be2… -- -Austin

2 1