September 2003 - Wine-Devel

console test / even the smallest patch can be wrong
by Jakob Eriksson Sept. 23, 2003

Sept. 23, 2003

Index: dlls/kernel/tests/console.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/console.c,v retrieving revision 1.2 diff -u -r1.2 console.c --- dlls/kernel/tests/console.c 21 Jun 2003 02:07:10 -0000 1.2 +++ dlls/kernel/tests/console.c 23 Sep 2003 02:23:36 -0000 @@ -70,7 +70,7 @@ static void testCursor(HANDLE hCon, COORD sbSize) { - COORD c; + COORD c = {0}; ok(SetConsoleCursorPosition(0, c) == 0, "No handle"); ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting %u got %lu",

2 2

interactive dsound tests fail && winealsa problem
by Sylvain Petreolle Sept. 23, 2003

Sept. 23, 2003

Using latest CVS : Enabling dsound interactive tests with WINETEST_INTERACTIVE, I get many errors like this one, always the same : dsound.c:1223: Test failed: MsgWaitForMultipleObjects failed: 0x102 dsound.c: 42774 tests executed, 0 marked as todo, 80 failures. Im using wineoss with OSS compatibility to do these tests. Kernel : 2.4.20-20.9 Using winealsa, the sound produced during the test is awful, full of noise. I get only failed tests due to E_NOTIMPL errors like dsound.c:149: Test failed: Lock: 0x80004001 ===== 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

Install regression
by Mike Hearn Sept. 23, 2003

Sept. 23, 2003

It's kind of sad nobody noticed this for so long, but it seems the new visual regedit tool caused a major regression in the ./tools/wineinstall script - of course rather than simply importing the winedefault.reg file it now pops up the regedit window. I'd submit a patch but I have no idea why this happens - the new regedit *does* support importing reg files from the command line right? thanks -mike

2 2

RE: Regression - game not detecting display mode
by hatky Sept. 23, 2003

Sept. 23, 2003

BTW if it helps I switched to 640x480 full screen in windows and run a trace in wine again (same logical error) Hatky. __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com Could not stat /mnt/fd0 (No such file or directory), ignoring drive A: Could not stat /cdrom (No such file or directory), ignoring drive D: trace:d3d:DllMain D3D8 DLLMain Reason=1 fixme:console:SetConsoleCtrlHandler (0x10149ad0,1) - no error checking or testing yet fixme:process:GetProcessWorkingSetSize (0xffffffff,0x407a1e2c,0x407a1e28): stub trace:d3d:Direct3DCreate8 SDKVersion = dc, Created Direct3D object at 0x404c9e68 trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterIdentifier (0x404c9e68}->(Adapter: 0, Flags: 2, pId=0x407a01c8) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetDeviceCaps (0x404c9e68)->(Adptr:0, DevType: 1, pCaps: 0x46ea4154) trace:d3d:IDirect3D8Impl_GetDeviceCaps GLCaps: GL_MAX_TEXTURE_UNITS_ARB=2 trace:d3d:IDirect3D8Impl_GetDeviceCaps GLCaps: GL_MAX_CLIP_PLANES=6 trace:d3d:IDirect3D8Impl_GetDeviceCaps GLCaps: GL_MAX_LIGHTS=8 fixme:d3d:IDirect3D8Impl_CheckDeviceFormat (0x404c9e68)->(Adptr:0, DevType:(1,D3DDEVTYPE_HAL), AdptFmt:(22,D3DFMT_X8R8G8B8), Use:(0,none), ResTyp:(3,D3DRTYPE_TEXTURE), CheckFmt:(827611204,D3DFMT_DXT1)) fixme:d3d:IDirect3D8Impl_CheckDeviceFormat (0x404c9e68)->(Adptr:0, DevType:(1,D3DDEVTYPE_HAL), AdptFmt:(22,D3DFMT_X8R8G8B8), Use:(0,none), ResTyp:(3,D3DRTYPE_TEXTURE), CheckFmt:(861165636,D3DFMT_DXT3)) fixme:d3d:IDirect3D8Impl_CheckDeviceFormat (0x404c9e68)->(Adptr:0, DevType:(1,D3DDEVTYPE_HAL), AdptFmt:(22,D3DFMT_X8R8G8B8), Use:(0,none), ResTyp:(3,D3DRTYPE_TEXTURE), CheckFmt:(894720068,D3DFMT_DXT5)) fixme:ole:CoCreateInstance no classfactory created for CLSID {5959df60-2911-11d1-b049-0020af30269a}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {25e609e4-b259-11cf-bfc7-444553540000}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {25e609e0-b259-11cf-bfc7-444553540000}, hres is 0x80040154 fixme:dsound:IDirectSoundImpl_SetCooperativeLevel level=DSSCL_PRIORITY not fully supported fixme:imm:ImmAssociateContext (0x10027, (nil)): semi-stub fixme:imm:ImmAssociateContext (0x10027, (nil)): semi-stub trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:0, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 1400 H 1050 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:1, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 1400 H 1050 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:2, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 1280 H 1024 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:3, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 1280 H 960 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:4, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 1152 H 864 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:5, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 1024 H 768 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:6, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 800 H 600 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:IDirect3D8Impl_EnumAdapterModes (0x404c9e68}->(Adapter:0, mode:7, pMode:0x407a0504) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_EnumAdapterModes W 640 H 480 rr 0 fmt (15,D3DFMT_A8R8G8B8) bpp 24 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) trace:d3d:IDirect3D8Impl_GetAdapterCount (0x404c9e68): Mostly stub, only returns primary display trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 0 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 1 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 2 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 3 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 4 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 5 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 6 trace:d3d:IDirect3D8Impl_GetAdapterModeCount (0x404c9e68}->(Adapter: 0) => 7 trace:d3d:DllMain D3D8 DLLMain Reason=0

1 0

Wine Development Question?
by Rick Langschultz Sept. 23, 2003

Sept. 23, 2003

Is there any movement to combine Wine and X to create a free standing operating system? That would be awesome. Maybe combining it with FreeDos to make it bootable with basic cygwin features??? Just a question. Rick Langschultz

3 2

Will wine get to 1.0 before the win32 APIs are obsolete?
by Ivan Leo Murray-Smith Sept. 23, 2003

Sept. 23, 2003

Some interesting stuff about the longhorn APIs, will the wine GDI be complete they are also obsolete? The good news is that if the windows APIs go from 76.000 to 8-10.000 then the longhorn APIs should be implemented in wine much faster. A: In the technology generations leading up to Longhorn, Microsoft has been moving to a .NET-based managed code environment, and the Longhorn generation will finally mark a clean split with the Win32 APIs of the past. That is, Win32 will be in maintenance mode, and all new development will occur with managed .NET APIs. One such API, Avalon, forms the basis for the new Desktop Compositing Engine (DCE) in Longhorn that replaces GDI and GDI+. Another, called Aero, provides APIs for the new user interface. All of the new Longhorn APIs will utilize the XML Application markup language (XAML) to make Longhorn more accessible to developers than ever before. The idea is to significantly reduce the number of APIs and make the APIs more standardized. Today, there are over 76,000 Win32 APIs, and countless wrappers. With Longhorn, Microsoft hopes to reduce the API set to 8,000 to 10,000. Complete text http://www.winsupersite.com/faq/longhorn.asp

3 3

Re: Unitialised variable
by Jon Griffiths Sept. 23, 2003

Sept. 23, 2003

Hi, + COORD c = 0; This won't compile with msvc since COORD is a struct, not a simple type. Please use the patch from my mail "Test fixes" instead. Cheers, Jon __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com

1 0

Re: [dcom 4] More header file stuff
by Alexandre Julliard Sept. 23, 2003

Sept. 23, 2003

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 Sept. 23, 2003

Sept. 23, 2003

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 Sept. 23, 2003

Sept. 23, 2003

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