wine-devel

wine-devel@winehq.org

10 participants
84459 discussions

Re: [dcom 4] More header file stuff
by Alexandre Julliard 23 Sep '03

23 Sep '03

Mike Hearn <mike(a)theoretic.com> writes: > Ensure the header files work with upcoming DCOM patches We finally have correct header dependencies now, please don't start breaking them again. -- Alexandre Julliard julliard(a)winehq.com

4 3

Re: [winegcc10] Search standard libraries last
by Dimitrie O. Paun 23 Sep '03

23 Sep '03

On September 18, 2003 07:13 am, Richard Cohen wrote: > This is needed for winegcc to build wine itself > > + Remove . from default library search path This may break Winelib apps. Did you check that MinGW does not search . for libs? > + -lwine needs passed in -L paths What do you mean by this? > - strarray_add(lib_files, strmake("-l%s", library)); > + /* Probably one of: > + * .def - which winebuild won't find > + * .so - which winebuild doesn't support > + * .a - which gcc won't find > + */ > + fprintf(stderr, "Ignoring library %s\n", library); We need to pass .a files to gcc, otherwise Winelib apps break. A lot of them (see wxWindows) compile as a big .a lib, and link with that. What do you mean "won't find"? And we should pass .so libs to gcc as well. -- Dimi.

3 4

Re: CreateBitmap fails
by jerry jenkins 23 Sep '03

23 Sep '03

Patch for loading bitmaps. ChangeLog: * dlls/comctl32/toolar.c - Create a compatible bitmap of the display, which can be selected into a device context. * windows/cursoricon.c - Loading bitmaps with specified size works now. Index: dlls/comctl32/toolbar.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v retrieving revision 1.139 diff -u -r1.139 toolbar.c --- dlls/comctl32/toolbar.c 17 Sep 2003 20:15:21 -0000 1.139 +++ dlls/comctl32/toolbar.c 20 Sep 2003 10:40:03 -0000 @@ -2215,7 +2215,7 @@ /* create new default image list */ TRACE ("creating default image list!\n"); - himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, + himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, ILC_COLOR | ILC_MASK, nButtons, 2); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0); infoPtr->himlInt = himlDef; @@ -2236,7 +2236,7 @@ { BITMAP bmp; HBITMAP hOldBitmapBitmap, hOldBitmapLoad; - HDC hdcImage, hdcBitmap; + HDC hdcImage, hdcBitmap, hdcScreen; /* copy the bitmap before adding it so that the user's bitmap * doesn't get modified. @@ -2245,11 +2245,12 @@ hdcImage = CreateCompatibleDC(0); hdcBitmap = CreateCompatibleDC(0); + hdcScreen = GetDC(NULL); /* create new bitmap */ - hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); - hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)lpAddBmp->nID); - hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + hbmLoad = CreateCompatibleBitmap (hdcScreen, bmp.bmWidth, bmp.bmHeight); + hOldBitmapBitmap = SelectObject (hdcBitmap, (HBITMAP)lpAddBmp->nID); + hOldBitmapLoad = SelectObject (hdcImage, hbmLoad); /* Copy the user's image */ BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, @@ -2259,6 +2260,7 @@ SelectObject (hdcBitmap, hOldBitmapBitmap); DeleteDC (hdcImage); DeleteDC (hdcBitmap); + ReleaseDC (NULL, hdcScreen); nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT); DeleteObject (hbmLoad); @@ -3845,7 +3847,7 @@ { BITMAP bmp; HBITMAP hOldBitmapBitmap, hOldBitmapLoad, hbmLoad; - HDC hdcImage, hdcBitmap; + HDC hdcImage, hdcBitmap, hdcScreen; /* copy the bitmap before adding it so that the user's bitmap * doesn't get modified. @@ -3854,11 +3856,12 @@ hdcImage = CreateCompatibleDC(0); hdcBitmap = CreateCompatibleDC(0); + hdcScreen = GetDC(NULL); /* create new bitmap */ - hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); - hOldBitmapBitmap = SelectObject(hdcBitmap, hBitmap); - hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + hbmLoad = CreateCompatibleBitmap (hdcScreen, bmp.bmWidth, bmp.bmHeight); + hOldBitmapBitmap = SelectObject (hdcBitmap, hBitmap); + hOldBitmapLoad = SelectObject (hdcImage, hbmLoad); /* Copy the user's image */ BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, @@ -3868,6 +3871,7 @@ SelectObject (hdcBitmap, hOldBitmapBitmap); DeleteDC (hdcImage); DeleteDC (hdcBitmap); + ReleaseDC (NULL, hdcScreen); ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT); DeleteObject (hbmLoad); Index: windows/cursoricon.c =================================================================== RCS file: /home/wine/wine/windows/cursoricon.c,v retrieving revision 1.68 diff -u -r1.68 cursoricon.c --- windows/cursoricon.c 10 Sep 2003 03:56:47 -0000 1.68 +++ windows/cursoricon.c 20 Sep 2003 10:40:32 -0000 @@ -1925,7 +1925,8 @@ /********************************************************************** * BITMAP_Load */ -static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, UINT loadflags ) +static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, + INT width, INT height, UINT loadflags ) { HBITMAP hbitmap = 0; HRSRC hRsrc; @@ -1934,6 +1935,8 @@ BITMAPINFO *info, *fix_info=NULL; HGLOBAL hFix; int size; + BOOL fStretch = FALSE; + HDC hdcMem =NULL; if (!(loadflags & LR_LOADFROMFILE)) { @@ -1953,6 +1956,12 @@ if (!(ptr = map_fileW( name ))) return 0; info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER)); } + + if (!width) width = info->bmiHeader.biWidth; + if (!height) height = info->bmiHeader.biHeight; + fStretch = (info->bmiHeader.biHeight != height) || + (info->bmiHeader.biWidth != width); + size = DIB_BitmapInfoSize(info, DIB_RGB_COLORS); if ((hFix = GlobalAlloc(0, size))) fix_info=GlobalLock(hFix); if (fix_info) { @@ -1965,7 +1974,42 @@ if (screen_dc) { char *bits = (char *)info + size; - if (loadflags & LR_CREATEDIBSECTION) { + if (fStretch) { + if (loadflags & LR_CREATEDIBSECTION) { + /* avoid GlobalAlloc & memcpy, but we have to save and then restore the value */ + BITMAPINFOHEADER tSave = fix_info->bmiHeader; + fix_info->bmiHeader.biWidth = width; + fix_info->bmiHeader.biHeight = height; + fix_info->bmiHeader.biCompression = BI_RGB; + fix_info->bmiHeader.biSizeImage = 0; + + hbitmap = CreateDIBSection(screen_dc, fix_info, DIB_RGB_COLORS, NULL, 0, 0); + + fix_info->bmiHeader = tSave; + } + else { + if (fix_info->bmiHeader.biBitCount != 1 ) { + hbitmap = CreateCompatibleBitmap(screen_dc, width, height); + } + else hbitmap = CreateBitmap(width, height, 1, 1, NULL); + } + if(hbitmap) { + HBITMAP hOld; + BOOL res = FALSE; + hdcMem = CreateCompatibleDC(screen_dc); + if (hdcMem) { + hOld = SelectObject(hdcMem, hbitmap); + res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, + fix_info->bmiHeader.biWidth, + fix_info->bmiHeader.biHeight, + bits, fix_info, DIB_RGB_COLORS, SRCCOPY); + SelectObject(hdcMem, hOld); + DeleteDC(hdcMem), hdcMem = NULL; + } + if (!res) { DeleteObject(hbitmap); hbitmap = NULL; } + } + } + else if (loadflags & LR_CREATEDIBSECTION) { DIBSECTION dib; hbitmap = CreateDIBSection(screen_dc, fix_info, DIB_RGB_COLORS, NULL, 0, 0); GetObjectA(hbitmap, sizeof(DIBSECTION), &dib); @@ -2064,7 +2108,7 @@ if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; switch (type) { case IMAGE_BITMAP: - return BITMAP_Load( hinst, name, loadflags ); + return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); case IMAGE_ICON: if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); _________________________________________________________________ 免费下载 MSN Explorer: http://explorer.msn.com/lccn

2 1

font metrics rebuilding
by Nerijus Baliunas 23 Sep '03

23 Sep '03

Hello, I ssh to remote machine, which is not running X, and run console win32 application on it. Now 2 questions: It seems remote wine uses my local fonts when rebuilding, could it be so? DISPLAY=localhost:10.0 on remote pc. How to disable font metrics rebuilding? I don't think fonts are needed for console apps. Regards, Nerijus

1 1

Re: What todo with stubs in Winlib
by Boaz Harrosh 23 Sep '03

23 Sep '03

I will share all my source & make environment, including .diff patches to ATL/WTL/MFC so any wtl mfc activex project should compile. I intend to supply example projects for MFC GUI and ODBC, WTL apps and ATL com controls all compiled with winelib on Linux. I will show how to compile the C runtime from MSVC. I just need to have every thing linking and running here at work, then I will have time to update to the newer wine and submit the patches. I hope the wine project will be happy to host some of them. the one not accepted I will have available on the NET on my site. Patches include minor adjustments to wine headers. mainly on the #if (cplusplus) side of things for example: --- include/wine/windows/unknwn.h 2003-08-26 16:15:55.000000000 +0300 +++ src/include/unknwn.h 2003-04-12 03:09:14.000000000 +0300 @@ -15,33 +15,14 @@ DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); #if defined(__cplusplus) && !defined(CINTERFACE) - -extern "C++" { - #ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE struct __attribute__((com_interface)) IUnknown #else @@ -58,15 +39,7 @@ virtual ULONG STDMETHODCALLTYPE Release( ) = 0; - template <class Q> - HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp) - { - return QueryInterface(__uuidof(Q), (void**)pp); - } }; - -} // extern "C++" - #else typedef struct IUnknownVtbl IUnknownVtbl; struct IUnknown { the support of "uuidof" and other ms stuff like #pagma(property) and declspec(xxx) are in an additional header that either needs to be included or -include msextentions.h in the make files. I will also submit some changes to the winemaker maybe winemaker2. and I would also like to write a white paper about it all. but all in do time, let me link it all together first. Beginning of next week some of you guys will have to help me on how to organize the all patching procedure as it is my first time. If any one cannot wait for the formal patches I will be happy to tar him a private copy of the work in progress. free life Boaz Dimitrie O. Paun wrote: >On Mon, 22 Sep 2003, Boaz Harrosh wrote: > > > >>I must confess I am using a 2 month old wine but ... >> >>from wininet.dll: >> Gopher[*] >> InternetErrorDlg >> InternetSetFilePointer >> >>from rasapi32.dll >> RasSetEntryDialParamsA/W >> IsAsyncMoniker >> RasGetErrorStringA >> RasDialA >> RasGetConnectStatusA >> >> > >Well, update to the latest wine, and write stub implementations for >the ones that still need one. > > > >> CreateAsyncBindCtx - this one is actually there only it is stubbed in >>the spec file >> >> > >Fix the spec file to point to the function. > > > >>and some others - I have MFC/ATL compiled. These and others get pulled >>in and I just wondered what every one is doing. >> >> > >Can you share your experience compiling MFC/ATL? What did you need to >change to MFC/ATL? What about Wine (hopefully nothing :))? What about >the Makefile -- can you share it? > > > >>and if we are at it I am using msvcrt(.dll) from wine (-isystem >>wine/msvcrt) - what does one do with "gethostname"? is there a WINE_ >>synonym for it? that I should -D for >> >> > >I know, this is a tough one -- I have run into it myself, but I haven't >had the time t think about it yet. > > >

1 0

Compiling tests with MSVC headers
by Jakob Eriksson 23 Sep '03

23 Sep '03

Compiling with MSVC 7, using MSCV headers. For the record: to compile tests/dpa.c for comctl32.dll you need the latest commctrl.h from Microsoft. The one they settled to publish: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnapiover/… Download the SDK and copy needed files in to Visual Studio. (Or just use the SDK, I think you should be able to compile C and C++ programs with it, no GUI included though.) regards, Jakob

1 0

Re: TreeView control - set correct hwndNotify
by Alexandre Julliard 22 Sep '03

22 Sep '03

"Igor Grahek" <igorg(a)cadlink.com> writes: > Is there a reason why this is not accepted? > > ChangeLog: - TreeView control set Notify window correctly in case that > window style is WS_POPUP. I still don't think the IsWindow thing is correct. Have you checked what Windows does in that case? -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: shell32: export some already implemented functions
by Alexandre Julliard 22 Sep '03

22 Sep '03

"Rolf Kalbermatter" <rolf.kalbermatter(a)citeng.com> writes: > --- dlls/shell32/shell32.spec 21 Aug 2003 21:26:07 -0000 1.75 > +++ dlls/shell32/shell32.spec 19 Sep 2003 10:59:21 -0000 > @@ -89,9 +89,9 @@ > 95 stdcall SHLogILFromFSIL (ptr) > 96 stdcall StrRetToStrN (ptr long ptr ptr) StrRetToStrNAW > 97 stdcall SHWaitForFileToOpen (long long long) > - 98 stdcall SHGetRealIDL (long long long) > + 98 stdcall -noname SHGetRealIDL (ptr ptr ptr) > 99 stdcall SetAppStartingCursor (long long) > 100 stdcall SHRestricted(long) > 102 stdcall SHCoCreateInstance(ptr ptr long ptr ptr) > @@ -174,6 +174,8 @@ > 184 stdcall ArrangeWindows(long long long long long) > 185 stub SHHandleDiskFull > 186 stdcall ILGetDisplayNameEx(ptr ptr ptr long) > + 189 stdcall -noname ILCreateFromPathA(str) > + 190 stdcall -noname ILCreateFromPathW(wstr) I don't think that's correct, I have other functions as 189 and 190 in my shell32.dll. They should probably be '@' ordinals and imported by name. Also, are you sure SHGetRealIDL is supposed to be imported by ordinal? -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: DMUSIC: version and headers update
by Alexandre Julliard 22 Sep '03

22 Sep '03

Rok Mandeljc <rok.mandeljc(a)gimb.org> writes: > Nothing revolutionary, it just updates versions of dm*.dll files. MS > also added some fields to some structures in headers, but otherwise > there aren't any big changes; sorry for the size of file, but I've been > applying lots of cosmetic fixes to headers... ;=) The patch is big really because you changed the files to use DOS line endings. Please fix that and resubmit a patch. Also we can't simply copy the Microsoft headers, I'm not sure what "released for public use" is supposed to mean but I don't think it gives us the right to redistribute them. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: wine/dlls/comctl32 comctl32undoc.c comctl32.sp ...
by Dimitrie O. Paun 22 Sep '03

22 Sep '03

On September 17, 2003 06:42 pm, Alexandre Julliard wrote: > Renamed the COMCTL32_* functions to use the exported name. What about a search & replace? I know, it's a big change, but this COMCTL32_ prefix is kinda uglifying. They also perpetuate themselves in the code, as they provide bad example. If you want, I can do patches for each of the controls. At the very least I'd like to get the controls I work on cleaned up... -- Dimi.

3 2

Re: tools/translations_status
by Ivan Leo Murray-Smith 22 Sep '03

22 Sep '03

> It is slow because it works with CVS to figure things out. If you have a > local copy of the cvs tree (maintained through cvsup) It's not that bad, when I aren't using my dsl line to download 2 or 3 200MB+ files at the same time.

1 0

What todo with stubs in Winlib
by Boaz Harrosh 22 Sep '03

22 Sep '03

Winebuild would not recognize stubs for linking. So an app that runs under wine will not compile under winelib. ( stubbed functions are linked to but are not actually used). [Q] What should one do with all these stub functions? redefine them in a separate file? would it make any logic to tell winebuild - with a special switch - to link also to stubs? ( how hard is that hack?)

4 5

Re: tools/translations_status
by Ivan Leo Murray-Smith 22 Sep '03

22 Sep '03

Vincent, your tool has a little problem: It isn't clear where I'm meant to run it from. Fromt the wine source root, I get a message saying that ../../tools/wrc doesn't exist, putting it in a directory 2 levels down (So that ../../tools/wrc does exist) I get this [ivan@localhost wrc]$ ./01-verif-rc2__charset_ISO-8859-15 Could not open rsrc.rc grep: xx????: No such file or directory DIALOG: grep: xx????: No such file or directory Ressource type unknown: [ivan@localhost wrc]$ I'm may be missing something obvious. The translation.sh that Dimi sent is much better (For now), for a start it works, but it is so slow, something faster (Maybe something that can be compiled?) would be very nice.

3 2

Regression - game not detecting display mode
by hatky 22 Sep '03

22 Sep '03

I tryed todays cvs version and running Unreal Turnment 2003 get me an error from the game : Error setting display mode: No acceptable display modes found (D3D_OK). This has morked last week, I think the last time I checked it was 7/9/2003... Hatky. __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com

2 4

Fwd: Apps Database
by Sylvain Petreolle 22 Sep '03

22 Sep '03

Andi, I think this one is for you. I sent a test mail to this mail adress today and got the same error. ===== Sylvain Petreolle (spetreolle_at_users_dot_sourceforge_dot_net) ICQ #170597259 Say NO to software patents Dites NON aux brevets logiciels "What if tomorrow the War could be over ?" Morpheus, in "Reloaded". ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

"Unknown directory 15 ignored"
by Andrew Patrikalakis 22 Sep '03

22 Sep '03

Hello, I'm trying to run a specific program (Winny2), and it doesn't work anymore... here is the output: fixme:win32:PE_CreateModule Unknown directory 15 ignored ...and nothing more (however, wine is apparantly racing at this point but still doesn't show anything after ~10minutes.) I looked this line up, its in wine/loader/pe_image.c:250. I have no idea what it's for, or what would be involved in fixing it... Andrew Patrikalakis

2 1

WineHQ: still TODO (take 2)
by Dimitrie O. Paun 22 Sep '03

22 Sep '03

Hi folks, Half a year ago I've sent this email about the state of WineHQ: http://www.winehq.org/hypermail/wine-devel/2003/03/0804.html This is a follow up to see what was done, what's left to do, etc. NOTE: numbering follows original email. First, let's see what got DONE, and who did it: 1. Integrate Bugzilla into the site (Jeremy Newman) 2. Integrate AppDB into the site (Jeremy Newman) 3. Integrate the guides into the site (Francois Gouget) 9. Simplify the Contributing page (Dimitrie Paun) 10. Improve Sending Patches (Jeremy Newman) 11. Update TODO/FunProjects/Janitorial/Winelib (Dimitrie Paun) Second, what is IN PROGRESS, and who is working on it: 8. History page (Brian Vincent) 15. A Testing status page (Ferenc Wagner) 16. A Internationalization status page (Vincent Béron) Last, but not least, what is left TODO: 4. The Who's Who page is terribly out of date. 5. We are missing an Acknowledgements page. 6. The Download pages seem like they need a bit of work. 7. The HowTo needs improvements. 12. The Status/UI Status page still needs some work. 13. Get rid of the Miscellaneous section from Status/Core Status. 14. The Search box is too low, but can it be helped? Comments, suggestions, flames? -- Dimi.

2 1

Re: docs: wine-devel [11/16]
by Marcelo Duarte 22 Sep '03

22 Sep '03

----- Original Message ----- From: "Eric Pouech" <pouech-eric(a)wanadoo.fr> To: "Dimitrie O. Paun" <dpaun(a)rogers.com> > Dimitrie O. Paun wrote: > > Eric, a lot of stuff in here looks like it's in > > need of some TLC, if you can take a look... > TLC ? tender & loving care ???? > is that what you're looking for ? (even if everything is not filled in yet) > A+ > > > -- > Eric Pouech > In this list, some times I see acronyms that I do not understand, some I try to imagine. For the majority of the people who had not been born speaking English this also must be complicated. I am imagining where to find a description of these terms. Somebody could indicate a site? TLC, IMO, BTW...

3 2

Re: alsa/audioio driver regression patch
by Jerry Jenkins 22 Sep '03

22 Sep '03

> Volume and Pan driver requests need to return success > even though they are not implemented. IMHO, reusing the code in wineoss.diff, which is one of your patchs, would be a better choice. And make it work:-).

1 0

Re: CreateBitmap fails
by jerry jenkins 22 Sep '03

22 Sep '03

Patch for loading bitmaps. ChangeLog: * dlls/comctl32/toolar.c - Create a compatible bitmap of the display, which can be selected into a device context. * windows/cursoricon.c - Loading bitmaps with specified size works now. Index: dlls/comctl32/toolbar.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v retrieving revision 1.139 diff -u -r1.139 toolbar.c --- dlls/comctl32/toolbar.c 17 Sep 2003 20:15:21 -0000 1.139 +++ dlls/comctl32/toolbar.c 20 Sep 2003 10:40:03 -0000 @@ -2215,7 +2215,7 @@ /* create new default image list */ TRACE ("creating default image list!\n"); - himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, + himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, ILC_COLOR | ILC_MASK, nButtons, 2); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0); infoPtr->himlInt = himlDef; @@ -2236,7 +2236,7 @@ { BITMAP bmp; HBITMAP hOldBitmapBitmap, hOldBitmapLoad; - HDC hdcImage, hdcBitmap; + HDC hdcImage, hdcBitmap, hdcScreen; /* copy the bitmap before adding it so that the user's bitmap * doesn't get modified. @@ -2245,11 +2245,12 @@ hdcImage = CreateCompatibleDC(0); hdcBitmap = CreateCompatibleDC(0); + hdcScreen = GetDC(NULL); /* create new bitmap */ - hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); - hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)lpAddBmp->nID); - hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + hbmLoad = CreateCompatibleBitmap (hdcScreen, bmp.bmWidth, bmp.bmHeight); + hOldBitmapBitmap = SelectObject (hdcBitmap, (HBITMAP)lpAddBmp->nID); + hOldBitmapLoad = SelectObject (hdcImage, hbmLoad); /* Copy the user's image */ BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, @@ -2259,6 +2260,7 @@ SelectObject (hdcBitmap, hOldBitmapBitmap); DeleteDC (hdcImage); DeleteDC (hdcBitmap); + ReleaseDC (NULL, hdcScreen); nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT); DeleteObject (hbmLoad); @@ -3845,7 +3847,7 @@ { BITMAP bmp; HBITMAP hOldBitmapBitmap, hOldBitmapLoad, hbmLoad; - HDC hdcImage, hdcBitmap; + HDC hdcImage, hdcBitmap, hdcScreen; /* copy the bitmap before adding it so that the user's bitmap * doesn't get modified. @@ -3854,11 +3856,12 @@ hdcImage = CreateCompatibleDC(0); hdcBitmap = CreateCompatibleDC(0); + hdcScreen = GetDC(NULL); /* create new bitmap */ - hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); - hOldBitmapBitmap = SelectObject(hdcBitmap, hBitmap); - hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + hbmLoad = CreateCompatibleBitmap (hdcScreen, bmp.bmWidth, bmp.bmHeight); + hOldBitmapBitmap = SelectObject (hdcBitmap, hBitmap); + hOldBitmapLoad = SelectObject (hdcImage, hbmLoad); /* Copy the user's image */ BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, @@ -3868,6 +3871,7 @@ SelectObject (hdcBitmap, hOldBitmapBitmap); DeleteDC (hdcImage); DeleteDC (hdcBitmap); + ReleaseDC (NULL, hdcScreen); ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT); DeleteObject (hbmLoad); Index: windows/cursoricon.c =================================================================== RCS file: /home/wine/wine/windows/cursoricon.c,v retrieving revision 1.68 diff -u -r1.68 cursoricon.c --- windows/cursoricon.c 10 Sep 2003 03:56:47 -0000 1.68 +++ windows/cursoricon.c 20 Sep 2003 10:40:32 -0000 @@ -1925,7 +1925,8 @@ /********************************************************************** * BITMAP_Load */ -static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, UINT loadflags ) +static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, + INT width, INT height, UINT loadflags ) { HBITMAP hbitmap = 0; HRSRC hRsrc; @@ -1934,6 +1935,8 @@ BITMAPINFO *info, *fix_info=NULL; HGLOBAL hFix; int size; + BOOL fStretch = FALSE; + HDC hdcMem =NULL; if (!(loadflags & LR_LOADFROMFILE)) { @@ -1953,6 +1956,12 @@ if (!(ptr = map_fileW( name ))) return 0; info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER)); } + + if (!width) width = info->bmiHeader.biWidth; + if (!height) height = info->bmiHeader.biHeight; + fStretch = (info->bmiHeader.biHeight != height) || + (info->bmiHeader.biWidth != width); + size = DIB_BitmapInfoSize(info, DIB_RGB_COLORS); if ((hFix = GlobalAlloc(0, size))) fix_info=GlobalLock(hFix); if (fix_info) { @@ -1965,7 +1974,42 @@ if (screen_dc) { char *bits = (char *)info + size; - if (loadflags & LR_CREATEDIBSECTION) { + if (fStretch) { + if (loadflags & LR_CREATEDIBSECTION) { + /* avoid GlobalAlloc & memcpy, but we have to save and then restore the value */ + BITMAPINFOHEADER tSave = fix_info->bmiHeader; + fix_info->bmiHeader.biWidth = width; + fix_info->bmiHeader.biHeight = height; + fix_info->bmiHeader.biCompression = BI_RGB; + fix_info->bmiHeader.biSizeImage = 0; + + hbitmap = CreateDIBSection(screen_dc, fix_info, DIB_RGB_COLORS, NULL, 0, 0); + + fix_info->bmiHeader = tSave; + } + else { + if (fix_info->bmiHeader.biBitCount != 1 ) { + hbitmap = CreateCompatibleBitmap(screen_dc, width, height); + } + else hbitmap = CreateBitmap(width, height, 1, 1, NULL); + } + if(hbitmap) { + HBITMAP hOld; + BOOL res = FALSE; + hdcMem = CreateCompatibleDC(screen_dc); + if (hdcMem) { + hOld = SelectObject(hdcMem, hbitmap); + res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, + fix_info->bmiHeader.biWidth, + fix_info->bmiHeader.biHeight, + bits, fix_info, DIB_RGB_COLORS, SRCCOPY); + SelectObject(hdcMem, hOld); + DeleteDC(hdcMem), hdcMem = NULL; + } + if (!res) { DeleteObject(hbitmap); hbitmap = NULL; } + } + } + else if (loadflags & LR_CREATEDIBSECTION) { DIBSECTION dib; hbitmap = CreateDIBSection(screen_dc, fix_info, DIB_RGB_COLORS, NULL, 0, 0); GetObjectA(hbitmap, sizeof(DIBSECTION), &dib); @@ -2064,7 +2108,7 @@ if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; switch (type) { case IMAGE_BITMAP: - return BITMAP_Load( hinst, name, loadflags ); + return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); case IMAGE_ICON: if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); _________________________________________________________________ 与联机的朋友进行交流，请使用 MSN Messenger: http://messenger.msn.com/cn

1 0

WRC problems on Alpha AXP
by Steven Edwards 22 Sep '03

22 Sep '03

Hello, 99% of WINE is building fine for me on AXP other then a few warnings but I am having trouble with the embbeded bitmap and Icon resources. I have tried to change the --endianess= option but I always get the same result as seen below. [root@alpha-pws500 winefile]# make LD_LIBRARY_PATH="../../libs/unicode:$LD_LIBRARY_PATH" ../../tools/wrc/wrc --nostdinc -I. -I. -I../../include -I../../include -D__WINE__ -forsrc.res rsrc.rc resource.rc:84:2: Error: Icon resource data corrupt make: *** [rsrc.res] Error 1 [root@alpha-pws500 winefile]# cd .. [root@alpha-pws500 programs]# cd regedit/ [root@alpha-pws500 regedit]# make LD_LIBRARY_PATH="../../libs/unicode:$LD_LIBRARY_PATH" ../../tools/wrc/wrc --nostdinc -I. -I. -I../../include -I../../include -I../../include/msvcrt -D__WINE__ -forsrc.res rsrc.rc resource.rc:43:2: Error: Invalid bitmap format Any ideas? Thanks Steven __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com

2 2

Re: DOS: silence some fixme's
by Andreas Mohr 21 Sep '03

21 Sep '03

Hi, On Sun, Sep 21, 2003 at 05:15:18PM +0200, Michael Stefaniuc wrote: > Alexandre, please use following revised changelog for the patch: > Changelog: > - silence the FIXME's produced by a check for dos4gw or > compatible dos32 extender. Maybe it's actually a good idea to change the code to return "support", since we already have DPMI support (it might not be 100% perfect, but it's almost 100% working, IIRC). > - silence the FIXME produced by an install check of MVSOUND.SYS That's one FIXME less in exchange for one additional code path, which would have to be done for every utility on earth that uses int 0x2f for install checks (since they all use different values for their checks). Maybe this shouldn't be done like that, who knows... Andreas Mohr

2 1

Wine's options (ver 0.3)
by Dimitrie O. Paun 21 Sep '03

21 Sep '03

New and improved! I hope that the little comments I get reflect aproval, not lack of interest :) Mike is doing all the hard work, let's give him a hand! The fewer properties we need in winecfg, the less work for him :) Changes since last version: o registryGlobalRegistryDir: removed it for now, I've sent a patch to remove it from the tree as well. o x11drv/Managed: made it a regedit property. We should remove it altogether long term, but we're not there for now. o made the entire [ports] section regedit, it's low level stuff that shouldn't concern regular users. o split the table into two tables: WineCfg and regedit properties. Makes things simpler to follow, and should help out on tracking what needs to be done for winecfg. o changed a few bad defaults TODO: o add the winmm properties as indicated by Eric. Comments are always appreciated. -- Dimi.

3 6

Re: docs: wine-devel [11/16]
by Dimitrie O. Paun 21 Sep '03

21 Sep '03

On September 21, 2003 02:44 pm, Eric Pouech wrote: > is that what you're looking for ? (even if everything is not filled in yet) Yes, thanks! Now it's up to Alexandre to merge everything in, and then I'll review it again to see where we stand. -- Dimi.

1 0

Re: DOS: silence some fixme's
by Andreas Mohr 21 Sep '03

21 Sep '03

Hi, On Sun, Sep 21, 2003 at 03:51:32PM +0200, Michael Stefaniuc wrote: > Hello, > > The DOS32A extender checks if a dos32 extender is already installed. As > we probably don't want to implement one silence this check. > > License: LGPL, X11 > Changelog: > Michael Stefaniuc <mstefani(a)redhat.com> > - silence the FIXME's produced by a check for a dos32 extender > - silence the FIXME produced by an install check of MVSOUND.SYS Sorry, that's incorrect. Wine DOES have to implement a DOS extender. How would a DOS extender which does that check actually "extend" DOS under Wine? Answer: it wouldn't, since it can't, since it isn't able to establish protected mode, since it's already enabled. Thus it's Wine which has to do it, since it has proper access to 32bit linear address and selector mapping functionsI (and the DOS extender querying that would gracefully step back from providing DPMI). And thus we also need to announce it. If Wine didn't do it, then nobody else could establish DOS extender functionality, and we'd lose some functionality here. (that's also the reason why Windows has a DPMI extender since Windows 3.0, BTW...) -- Help prevent Information Technology Fascism! - before it's too late... http://www.againsttcpa.com

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel