March 2005 - Wine-Devel - list.winehq.org

[advpack] Implement RegisterOCX and stub out DelNodeRunDLL32
by Matthew Mastracci March 14, 2005

March 14, 2005

This patch helps the IE6 installer get past the DLL registration stage. The DelNodeRunDLL32 function is stubbed out, but RegisterOCX will correctly register a COM DLL by calling its DllRegisterServer function. ChangeLog: * dlls/advpack/advpack.c Matthew Mastracci <mmastrac(a)canada.com> Implement RegisterOCX Stub for DelNodeRunDLL32 Index: dlls/advpack/advpack.c =================================================================== RCS file: /home/wine/wine/dlls/advpack/advpack.c,v retrieving revision 1.7 diff -u -r1.7 advpack.c --- dlls/advpack/advpack.c 20 Jan 2005 20:03:13 -0000 1.7 +++ dlls/advpack/advpack.c 14 Mar 2005 07:35:54 -0000 @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); +typedef HRESULT (*DLLREGISTER) (void); + /*********************************************************************** * DllMain (ADVPACK.@) @@ -172,3 +174,60 @@ return S_OK; } + +/*********************************************************************** + * RegisterOCX (ADVPACK.@) + */ +void WINAPI RegisterOCX( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) +{ + WCHAR wszBuff[MAX_PATH]; + WCHAR* pwcComma = &wszBuff[0]; + HMODULE hm; + DLLREGISTER pfnRegister; + HRESULT hr; + + TRACE("(%s)\n", cmdline); + + MultiByteToWideChar(CP_ACP, 0, cmdline, strlen(cmdline), wszBuff, MAX_PATH); + while (!(*pwcComma == ',' ) && *pwcComma) + { + pwcComma++; + } + *pwcComma = '\0'; + + TRACE("Parsed DLL name (%s)\n", debugstr_w(wszBuff)); + + hm = LoadLibraryExW(wszBuff, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + if (!hm) + { + ERR("Couldn't load DLL: %s\n", debugstr_w(wszBuff)); + return; + } + + pfnRegister = (DLLREGISTER)GetProcAddress(hm, "DllRegisterServer"); + if (pfnRegister == NULL) + { + ERR("DllRegisterServer entry point not found\n"); + } + else + { + hr = pfnRegister(); + if (hr != S_OK) + { + ERR("DllRegisterServer entry point returned %08lx\n", hr); + } + } + + TRACE("Successfully registered OCX\n"); + + FreeLibrary(hm); +} + +/*********************************************************************** + * DelNodeRunDLL32 (ADVPACK.@) + */ +void WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) +{ + FIXME("(%s) FIXME: stub\n", cmdline); +} + Index: dlls/advpack/advpack.spec =================================================================== RCS file: /home/wine/wine/dlls/advpack/advpack.spec,v retrieving revision 1.5 diff -u -r1.5 advpack.spec --- dlls/advpack/advpack.spec 20 Jan 2005 20:03:13 -0000 1.5 +++ dlls/advpack/advpack.spec 14 Mar 2005 07:35:54 -0000 @@ -2,7 +2,7 @@ @ stub AdvInstallFile @ stub CloseINFEngine @ stub DelNode -@ stub DelNodeRunDLL32 +@ stdcall DelNodeRunDLL32(ptr ptr str long) @ stdcall DllMain(long long ptr) @ stdcall DoInfInstall(ptr) @ stub ExecuteCab @@ -23,10 +23,11 @@ @ stub RegRestoreAll @ stub RegSaveRestore @ stub RegSaveRestoreOnINF -@ stub RegisterOCX +@ stdcall RegisterOCX(ptr ptr str long) @ stub RunSetupCommand @ stub SetPerUserSecValues @ stub TranslateInfString @ stub TranslateInfStringEx @ stub UserInstStubWrapper @ stub UserUnInstStubWrapper

2 3

Window style problem with Steam
by Stefan Dösinger March 14, 2005

March 14, 2005

Hello! I had a look at the "no keyboard problem" with Steam. A little reseach showed that Steam creates its main Window with WS_SYSMENU set but WS_CAPTION not set. MSDN says that WS_CAPTION must be set if WS_SYSMENU is used: WS_SYSMENU Creates a window that has a window menu on its title bar. The WS_CAPTION style must also be specified. (from http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu…) If I check for this case in WIN_CreateWindowEx and set WS_CAPTION, the Window is controlled by KWM and I can type in the Steam window. But KWM draws the normal Window boarder and it overlaps the rest of the Window and confuses the mouse. Furthermore the menu of the systray applet has a Caption. The solution I've found is to set the WS_EX_APPWINDOW flag in cs->dwExStyle. In this case Steam behaves as I'd expect it. But is this a correct solution? Any suggestions? Stefan

1 0

Scrollkeeper, the documentation, XML, and the way forward
by Scott Ritchie March 14, 2005

March 14, 2005

I wanted the Wine documentation to appear on the nice help menus, like other standard apps. I learned that the way to do this is to write an OMF file for each document, which scrollkeeper can then look at to find the metadata about where the document is and how to index it and such. The trouble is, Scrollkeeper and the Gnome help menus no longer support SGML, as XML is the current new and hip thing. The Wine documentation is in SGML. There are quite a few reasons to move forward. The Wine documentation is also a bit separate (requiring its own compiling, for example) from the main code, and this should change. This link: http://scrollkeeper.sourceforge.net/documentation/scrollkeeper_example2_man… has some good information about how Wine should look to play well with Scrollkeeper and modern distros. I propose we attack this in phases, and create the following plan of attack: 1) Create a new directory for all XML documentation at wine/doc. This will also bring us to be more standard. 2) When we convert old SGML documents to XML and move them there, we write an OMF file for them then and there (I'll do it if you like). We also make sure the build process is aware of this stuff and is installing the xml and omf files in the right place so scrollkeeper can find them when it runs after build time. 3) We follow the steps at the above link to add scrollkeeper into the configure scripts after we convert the first document to XML. I vote for the Wine User Guide, since I'm working on it. 4) We inform the packagers once scrollkeeper is working in a release, as there are sometimes little tricks for it (one for rpms is on the page) So, beyond that, the first step seems pretty simple: convert the sgml stuff into xml format and put it into the new doc folder. Can someone point me to some good tools to do this? Thanks, Scott Ritchie

6 8

Re: shlapi: Fixes for UrlIsW and UrlIsA
by Andreas Mohr March 14, 2005

March 14, 2005

Hi, On Mon, Mar 14, 2005 at 09:07:57PM +1100, Troy Rollo wrote: > Testing under Windows shows that UrlIsW and UrlIsA should: Since you already did testing under Windows, adding proper tests would make sense, I guess... Or in other words: I'm not sure whether your current patch would get applied. Andreas Mohr

1 0

Re: wine/ misc/registry.c documentation/samples/config
by Steven Edwards March 14, 2005

March 14, 2005

Hi, --- Mike McCormack <mike(a)codeweavers.com> wrote: > People would moan and complain, but in the end Wine and Wine users would > be better off, as they would no longer depend on anything but Wine to > run their Windows software. I have to agree. Short term being able to load the Windows registry and Windows system dlls helped Wine but long term it has led to stagnation. Most of the recent growth in Wine in past few years has been because we are being forced to not be dependant on a existing Windows install or Windows componates such as DCOM IE, MSI, etc which is a good thing. Thanks Steven __________________________________ Do you Yahoo!? Make Yahoo! your home page http://www.yahoo.com/r/hs

8 13

[ARTWORK] icon: "My Computer"
by egore March 14, 2005

March 14, 2005

Hi list, I drew a simple icon that COULD be used as a replacement for the current one. I don't know if anyone of you likes it, so please tell me what you think. Tell me if you like it, if you hate if, what could be done better, etc. The icon can be found in different sizes (and in a scalable format) at http://www.egore911.de/vype/wine/ Regards, Christoph Brill aka egore911

6 6

Re: Wine Start Menu in the Desktop Applications Menu
by Dan Kegel March 13, 2005

March 13, 2005

Jeff Waugh (jeff.waugh_at_ubuntu.com) wrote: >> The PowerPC version of the packages, however, is another issue. >> Obviously, we can't make Wine work with i386-compiled apps on PPC, > > (There's an awesome opportunity for qemu integration there...) Yeah, that's something the folks at http://darwine.opendarwin.org have been thinking about for some time, and to some extent trying. You might give them a shout... - Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

1 0

Re: [X11DRV] Fix X11 Device list leak
by rob March 13, 2005

March 13, 2005

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Raphael fenix-at-club-internet.fr |Wine Mailing Lists| wrote: |Hi, | |Changelog: | - XListInputDevices spec say that device list should be freed using |XFreeDeviceList | - better robustness on X11DRV_AttachEventQueueToTablet | |I hope it helps to fix bug 2017 (http://bugs.winehq.org/show_bug.cgi?id=2017) | |Regards, |Raphael Thanks for submitting this patch. These are exactly the fixes I was about to submit! Your patch should should have a major impact on users of applications which use the wintab library: They should all start to function to some degree. Apologies for not commenting on patch/ submitting a fix earlier.... A major knee operation has put me out of action for the last few weeks. P.S. Please don't expect timely responses to mails for at least another week. I'll try my best to respond, but can't promise anything. Cheers ~ -Rob. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCNPgCKeDvIR8zB68RAgQ3AJ9BA00ZgtZd/HXWy0nOPa3xpWaO3QCfcvVJ RC2lSu6lgqZocJkohkYi/WE= =fFJD -----END PGP SIGNATURE-----

1 0

Re: Borland C++ Buildeer under Wine
by Oliver Stieber March 13, 2005

March 13, 2005

--- Andrew Neil Ramage <nrsc16850(a)blueyonder.co.uk> wrote: > It's an old version - 3 IIRC. It starts, but the > Borland window (menu > bar across top) flickers and no other windows open. > I'll see if I've got a copy on a cover disk. CBuilder defiantly used to work. > Andrew > > > > Oliver Stieber wrote: > > --- Andrew Neil Ramage > <nrsc16850(a)blueyonder.co.uk> > > wrote: > > > >>Below is the last three lines of error messages > >>printed when I tried to > >>run Borland C++ Builder under wine. (There were > >>pages and pages of > >>error messages after I hit Ctrl-C in the terminal > I > >>had started BCB.EXE > >>from.) > >> > >>Is this a known bug in Wine ? > >> > >>err:syslevel:_EnterSysLevel (0x40797840, level 2): > >>Holding 0x4083ccc0, > >>level 3. Expect deadlock! > >>err:syslevel:_CheckNotSysLevel Holding lock > >>0x4083ccc0 level 3 > >>err:seh:setup_exception stack overflow 176 bytes > in > >>thread 0009 eip > >>004078d5 esp 405b0f50 stack 0x405b0000-0x406b0000 > >>[andrew(a)zeus BIN]$ > >> > > > > The stack overflow looks like somethings got stuck > in > > a loop, which is problably why there were pages > and > > pages of messages. > > > > What version of CBuilder are you using, CBuilder > <=5 > > used to work. > > > > > http://www.borland.com/products/downloads/download_cbuilderx.html > > CBuilder X claims to run on linux OOTB. > > > > > > I've got standard on the shelf, > > > >>-- > >> > >>Andrew > >> > >>[hackcoughsniffle] > >>Internal Virus Database corrupt > >> > >> > > > > > > Send instant messages to your online friends > http://uk.messenger.yahoo.com > > > > > Send instant messages to your online friends http://uk.messenger.yahoo.com

1 0

Re: Borland C++ Buildeer under Wine
by Oliver Stieber March 13, 2005

March 13, 2005

--- Andrew Neil Ramage <nrsc16850(a)blueyonder.co.uk> wrote: > It's an old version - 3 IIRC. It starts, but the > Borland window (menu > bar across top) flickers and no other windows open. > I'll see if I've got a copy on a cover disk. CBuilder defiantly used to work. > Andrew > > > > Oliver Stieber wrote: > > --- Andrew Neil Ramage > <nrsc16850(a)blueyonder.co.uk> > > wrote: > > > >>Below is the last three lines of error messages > >>printed when I tried to > >>run Borland C++ Builder under wine. (There were > >>pages and pages of > >>error messages after I hit Ctrl-C in the terminal > I > >>had started BCB.EXE > >>from.) > >> > >>Is this a known bug in Wine ? > >> > >>err:syslevel:_EnterSysLevel (0x40797840, level 2): > >>Holding 0x4083ccc0, > >>level 3. Expect deadlock! > >>err:syslevel:_CheckNotSysLevel Holding lock > >>0x4083ccc0 level 3 > >>err:seh:setup_exception stack overflow 176 bytes > in > >>thread 0009 eip > >>004078d5 esp 405b0f50 stack 0x405b0000-0x406b0000 > >>[andrew(a)zeus BIN]$ > >> > > > > The stack overflow looks like somethings got stuck > in > > a loop, which is problably why there were pages > and > > pages of messages. > > > > What version of CBuilder are you using, CBuilder > <=5 > > used to work. > > > > > http://www.borland.com/products/downloads/download_cbuilderx.html > > CBuilder X claims to run on linux OOTB. > > > > > > I've got standard on the shelf, > > > >>-- > >> > >>Andrew > >> > >>[hackcoughsniffle] > >>Internal Virus Database corrupt > >> > >> > > > > > > Send instant messages to your online friends > http://uk.messenger.yahoo.com > > > > > Send instant messages to your online friends http://uk.messenger.yahoo.com

1 0