June 2009 - Wine-Devel - list.winehq.org

Re: wldap32: fix a compiler warning on Mac OS X
by Stefan Leichter June 10, 2009

June 10, 2009

Am Tuesday 09 June 2009 23:46:51 schrieb Austin English: > Cast was removed by d576c2d9342e769c01fb99c0cc200a0bc4b9cded, but > causes a compiler warning on OS X. The same cast is used ~20 lines > later. You forgot the patch -- Stefan

3 2

Re: windowscodecs: add stub implementation of IWICImagingFactory
by Vincent Povirk June 10, 2009

June 10, 2009

This is wrong. Don't commit it. Vincent Povirk On Wed, Jun 10, 2009 at 3:08 PM, Vincent Povirk<vincent(a)codeweavers.com> wrote: > > > >

1 0

Re: [4/4] ddraw: Add lock/unlock test.
by Stefan Dösinger June 10, 2009

June 10, 2009

Am 10.06.2009 um 11:06 schrieb Rico Schüller: > > +/* See comment in dlls/d3d9/tests/visual.c for general guidelines */ I guess this was copied from dlls/ddraw/tests/visual.c, but doesn't make sense for tests that don't read back rendering results. Otherwise the patches look ok to me.

2 1

dlls/winedos/int10.c
by Gerald Pfeifer June 10, 2009

June 10, 2009

In dlls/winedos/int10.c we currently have the following code VGA_SetBright((BL_reg(context) & 0x10) && 1); which I am not sure I understand. Is the purpose of this to only pass one of 0 or 1 to VGA_SetBright? If so, I guess I'd find "... ? 1 : 0" more intuitive, and it's only three characters more, or "!= 0" at least. Thoughts? Gerald

1 0

Default Bugzilla search does not show resolved bugs
by Ken Sharp June 10, 2009

June 10, 2009

From http://bugs.winehq.org/show_bug.cgi?id=18790 "The default search (the search box at the top of this page) does not include closed bugs (rightly so), but it also does not include resolved bugs. This leads to duplicates that could be avoided." "This is for admin to configure in Administration->Parameters->Query Defaults->defaultquery. Add to the front of it: bug_status=RESOLVED&" Anyone with admin access that can make this change? Thanks, Ken.

3 2

Add stable Wine versions back to the AppDB
by Ken Sharp June 10, 2009

June 10, 2009

See http://bugs.winehq.org/show_bug.cgi?id=15419 The AppDB is currently set up to query Bugzilla for its six latest Wine versions. Unfortunately this does not include the latest stable version of Wine (currently 1.0.1, and in the future 1.2 will also be omitted). A change to how the AppDB works is needed to add 1.0.1 back to the list. As 1.0.1 is listed as "stable", it would make sense that distros (Ubuntu for example) will provide support for this version only. As discussed in the bug, not having this version in the AppDB does not stop users from submitting test results anyway using any version they feel like selecting, and therefore reporting, often incorrectly (due to regressions), that apps run fine on later versions of Wine. As also discussed, if an Admin catches such test results in the queue before they are accepted, they can be rejected, but maintainers can submit whatever results they wish without admin approval. Test results are rejected daily, so this is a problem. Attached is a patch that hopefully looks something like what needs to be added to the AppDB code. This was made by me, who has never used PHP before and have given myself about an hour's "training" to figure it out. It is probably wrong. Could anybody offer some help with this issue? Thanks, Ken.

2 2

Re: (resend, 2nd) kernel32: Implement QueryFullProcessImageNameA (3rd try)
by Alexandre Julliard June 10, 2009

June 10, 2009

Stefan Leichter <Stefan.Leichter(a)camline.com> writes: > Am Thursday 04 June 2009 12:49:58 schrieb Alexandre Julliard: >> >> I'd expect that error to be a side effect of WideCharToMultiByte, which >> is most likely what you want to use here. Also you have to handle buffer >> overflows correctly, with test cases. > > If you like to see more test cases for the buffer overflow, please tell me > what you like to see tested The test isn't very convincing. For instance to show that the size is not modified you should set it to something that's clearly different, not to the same length you got in the previous call. Also you should check that the length matches the contents of the buffer, with/without terminating null as the case may be. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: fix a compiler warning on Mac OS X
by Roderick Colenbrander June 10, 2009

June 10, 2009

Actually I need to fix opengl32 properly. For some reason opengl32 is opengl 1.2 while it should be 1.1. Then GL_GLEXT_PROTOTYPES is not needed at all for compiling opengl32. Roderick On Wed, Jun 10, 2009 at 12:18 AM, Austin English<austinenglish(a)bordeauxgroup.com> wrote: > GL_GLEXT_PROTOTYPES is defined in GL/gl.h on Mac. Other #ifdef methods > end up breaking compilations elsewhere. > > -- > -Austin > > > >

2 2

Re: user32/tests: Add more intensive tests for SetCursor.
by Austin English June 9, 2009

June 9, 2009

On Tue, Jun 9, 2009 at 5:13 PM, Daniel Santos<javatroubadour(a)yahoo.com> wrote: > > Hello! This is a prelude to other cursor patches to follow (both Griswold's & my work). As requested, I have replaced the __FILE_SPOT with the standard ok_(file,line) mechanism (looks much better to me). I've removed the windows version checking from tests and last error checking on success, although I have reservations about it (mostly the later). Forgot patch. -- -Austin

1 0

Re: gdiplus: Add stubs for GdipGetVisibleClipBoundsI, GdipDrawDriverString & GdipMeasureDriverString
by Nikolay Sivov June 9, 2009

June 9, 2009

Ken Sharp wrote: > These stubs stop three crashes in Photoshop CS4. > >From 4e5dd892a7a577001072fd7701467c262c483b1f Mon Sep 17 00:00:00 2001 > From: Ken Sharp <kennybobs(a)o2.co.uk> > Date: Tue, 9 Jun 2009 21:48:05 +0100 > Subject: [PATCH] gdiplus: Add stubs for GdipGetVisibleClipBoundsI, GdipDrawDriverString & GdipMeasureDriverString > > This fixes three crashes in Photoshop CS4. > --- > dlls/gdiplus/gdiplus.spec | 6 +++--- > dlls/gdiplus/graphics.c | 35 ++++++++++++++++++++++++++++++++++- > 2 files changed, 37 insertions(+), 4 deletions(-) > +GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, > + GDIPCONST GpFont *font, GDIPCONST PointF *positions, > + INT flags, GDIPCONST GpMatrix *matrix, RectF *boundingBox) > +{ > + FIXME("(%p %p %d %p %p %d %p %p): stub\n", graphics, text, length, font, positions, flags, matrix, boundingBox); > + return FALSE; > +} > + You should return NotImplemented.

1 0

How do I actually write a testcase for a 16-bit API ?
by Alex Villacís Lasso June 9, 2009

June 9, 2009

I recently filed http://bugs.winehq.org/show_bug.cgi?id=18734 in which I showed that DlgDirList is behaving incorrectly for 16-bit apps. I also included a test program compiled with the Watcom C compiler, as well as a patch. Then a comment appeared saying that it should be possible to create a testcase for this API. So I tried. At first, I thought that since this was a 16-bit API, I should be adding -Wb,--subsystem,win16 to the Makefile. However, this results in the linker complaining that it cannot find WinMain16. So I removed it. Also, I had undefined link-time references to SendMessage16 and similar (because I want everything to go through the 16-bit APIs, else the whole point of the test is lost), so I had to manually add them to the spec files for kernel32 and user32. But after doing this and getting a test program, an attempt to create the window out of the registered class fails and triggers an assertion. I have no examples of previous 16-bit tests (as opposed to 16-bit Wine dlls) to draw upon, so I don't know how to proceed correctly to test a 16-bit API in a way that convinces everyone that the patch is correct. What do you think of this? -- perl -e '$x=2.3;printf("%.0f + %.0f = %.0f\n",$x,$x,$x+$x);'

5 6

How is 0.0.0.0 handled in Wine?
by Austin English June 9, 2009

June 9, 2009

Howdy all, Doing some testing with PuTTY, I've noticed some strange behavior. I've got windows XP in a VM, and when comparing behavior to Wine, I noticed some inconsistencies with respect to the '0.0.0.0' invalid address. Windows: Putty -> 0.0.0.0: throws an error "Network error: Cannot assign requested address" ping (in cmd.exe): D:\appinstall>ping 0.0.0.0 Pinging 0.0.0.0 with 32 bytes of data: Destination specified is invalid. Destination specified is invalid. Destination specified is invalid. Destination specified is invalid. Ping statistics for 0.0.0.0: Packets: Sent = 4, Received = 0, Lost = 4 (100% loss), Wine: Putty -> 0.0.0.0 route to localhost, login succeeds (Not sure if it's routing to localhost or 127.0.0.1) FWIW, Ubuntu: ssh -> 0.0.0.0: routes to localhost, where I've got sshd running, connects fine. ping -> 0.0.0.0 routes to 127.0.0.1, succeeds Seems to me to be a bug, i.e., Wine shouldn't be able to use 0.0.0.0. It seems that we're simply passing this on to the host os, which is then routing it back to localhost. Perhaps we need to catch 0.0.0.0 as a special case and refuse? Grepping in the source code for 0.0.0.0 only shows a few hits: comctl32 (unrelated), rpcrt4 (appears unrelated) and ws2_32 (but only in the tests, not in the implementation). -- -Austin

5 13

Latest git fails compiling
by Uwe Bonnes June 9, 2009

June 9, 2009

Hello, on a fresh tree check out and compiled successfully yesterday (090608) and updated today(090609), compile fails with: make[1]: Entering directory `/media/sda8/sdb8/spare/bon/Wine/wine-git/include' ../tools/widl/widl -I. -I. -I../include -I../include \ -h -H activaut.h activaut.idl ../tools/widl/widl -I. -I. -I../include -I../include \ -h -H activdbg.h activdbg.idl ../tools/widl/widl -I. -I. -I../include -I../include \ -h -H activscp.h activscp.idl oaidl.idl:121: error: parameter 'pvData' of (null) 'tagSAFEARRAY' \ cannot derive from void * make[1]: *** [activscp.h] Fehler 1 make[1]: Leaving directory `/media/sda8/sdb8/spare/bon/Wine/wine-git/include' This is on Suse 11.1, x86-64. I have not seens this reported before. Any hints for fixing (perhaps my setup)? -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 5

Add-stub-for-IoOpenDeviceRegistryKey-needed-for-l.patch
by Uwe Bonnes June 9, 2009

June 9, 2009

Appended stup is needed for libusb-win32-0.1x -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- >From 7216b1e26b9cbd3d4bb7eaa096757ad11d0b77b5 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes <bon(a)hertz.ikp.physik.tu-darmstadt.de> Date: Tue, 9 Jun 2009 16:41:09 +0200 Subject: Add stub for IoOpenDeviceRegistryKey(), needed for libusb-win32-0.1.2 --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5a043e5..99c2847 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2493,6 +2493,17 @@ NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE No /*********************************************************************** + * IoOpenDeviceRegistryKey (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoOpenDeviceRegistryKey( PDEVICE_OBJECT DeviceObject, +ULONG DevInstKeyType, ACCESS_MASK DesiredAccess, PHANDLE DevInstRegKey) +{ + FIXME( "stub:\n"); + return STATUS_SUCCESS; +} + + +/*********************************************************************** * MmGetSystemRoutineAddress (NTOSKRNL.EXE.@) */ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 52efd92..cda9230 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -409,7 +409,7 @@ @ stdcall IoIsWdmVersionAvailable(long long) @ stub IoMakeAssociatedIrp @ stub IoOpenDeviceInterfaceRegistryKey -@ stub IoOpenDeviceRegistryKey +@ stdcall IoOpenDeviceRegistryKey (long long long long) @ stub IoPageRead @ stub IoPnPDeliverServicePowerNotification @ stub IoQueryDeviceDescription -- 1.6.0.2

1 0

Re: wine-patches Digest, Vol 47, Issue 40
by Piotr Caban June 9, 2009

June 9, 2009

> Message: 2 > Date: Thu, 04 Jun 2009 22:37:48 +0200 > From: Piotr Caban <piotr.caban(a)gmail.com> > Subject: jscript: Added Date_getFullYear and Date_getUTCFullYear > implementation (3/7) > To: wine-patches(a)winehq.org > Message-ID: <4A28309C.9000401(a)gmail.com> > Content-Type: text/plain; charset="utf-8" > > --- > dlls/jscript/date.c | 73 > ++++++++++++++++++++++++++++++++++++++++++-- > dlls/jscript/tests/api.js | 9 +++++ > 2 files changed, 78 insertions(+), 4 deletions(-) Whats wrong with this patch? All the date expressions (e.g. day_from_year) are copied from ECMA-262 standard specification. Because of the date range it can be keep in double without error. Piotr Caban

2 1

Re: mlang/tests: [Patch 2] Skip some tests on systems, that do not support CP_UTF8
by Alexandre Julliard June 9, 2009

June 9, 2009

Detlef Riekenberg <wine.dev(a)web.de> writes: > @@ -1164,6 +1165,14 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) > ok(!lstrcmpA(rfc1766A, info_table[i].rfc1766), > "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); > > + if (!localenameA[0]) { > + /* old win95 systems do not support CP_UTF8 */ > + if (!i) > + win_skip("CP_UTF8 not supported on this system\n"); > + > + continue; > + } You should store the table in Unicode instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: Prevent second loading of a library with specified path.
by Alexandre Julliard June 9, 2009

June 9, 2009

Alexander Morozov <amorozov(a)etersoft.ru> writes: > Changelog > Prevent second loading of a library with specified path > > This patch fixes bug #18775. I tested WinXP and Win2003. > > When a library have long name (> 8 symbols before extension) an application > can run LoadLibrary(long name) and later LoadLibrary(8.3 name). > In some cases Windows will load image second time, in other it will return > pointer to already loaded image. > I found that Windows does not load library second time in these cases: > 1) c:\dir\libliblib.dll and c:\dir\LIBLIB~1.DLL > 2) \dir\libliblib.dll and \dir\LIBLIB~1.DLL > 3) .\libliblib.dll and .\LIBLIB~1.DLL > 4) dir\libliblib.dll and dir\LIBLIB~1.DLL > and load it in cases: > 5) libliblib.dll and LIBLIB~1.DLL > 6) c:libliblib.dll and c:LIBLIB~1.DLL This should most likely be done in ntdll. Also please add tests for these different cases. -- Alexandre Julliard julliard(a)winehq.org

3 3

re: How do I actually write a testcase for a 16-bit API ?
by Dan Kegel June 9, 2009

June 9, 2009

See also http://lists.debian.org/debian-legal/2006/07/msg00007.html I kind of doubt it will ever make it in to ubuntu. When I tried building win16 binaries with the Linux version, there were lots of path problems. That was two years ago, but I wouldn't be surprised if they're still there. These two things together make me suspect that installing the windows version in Wine is the way to go. We could make a script that does that in an alternate prefix and provides wrapper scripts that hide the wine-ness of it to some extent, maybe. That could be done as a stopgap while the test suite is refreshed and gotten ready to add into the wine tree. Once that's far enough along, it might then be worth looking at getting the linux version working and into a PPA. Or vice versa. Wish I had time to play with this stuff. I would really be happy if somebody got the win16 test suite into the wine tree! - Dan

1 0

Re: wine-devel Digest, Vol 47, Issue 32
by chris ahrendt June 8, 2009

June 8, 2009

Did we find out what the regression is for 1.1.23 that caused the ATI and other non NVIDIA cards to start failing? Chris

1 0

Re: riched20/tests: fix test for vista
by Paul Vriens June 8, 2009

June 8, 2009

André Hentschel wrote: > Vista turns the "(WCHAR)1234" into a "(unsigned char)1234". > This causes error on vista machines<SP2: > http://test.winehq.org/data/7aeffc442cc1b9a454f1ff7d7b3175b4bba88b05/vista_… > > editor.c:3249: Test failed: EM_GETPASSWORDCHAR returned Ò (210) when set > to 'x', instead of x (120) > --- > dlls/riched20/tests/editor.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > ------------------------------------------------------------------------ > > Hi André, Is there anything special about this box? Could it be that the locale plays a role in this. I'm asking as my Vista box (and several others seen on test.winehq.org) doesn't have this issue. -- Cheers, Paul.

1 0

Re: d3d9: Add DF16 support
by Henri Verbeet June 8, 2009

June 8, 2009

2009/6/7 Frank Richter <frank.richter(a)gmail.com>: > As far as I could gather DF16 is the "ATI way" of getting a renderable > 16 bit depth texture. Without knowing much about the actual format, DF16 implies this should be a floating point format, similar to the ones provided by ARB_depth_buffer_float. Also, could you please add this at the same location as the other depth formats?

5 9

Re: Try2: Website: Remove GIMP Fun Project
by Paul Vriens June 8, 2009

June 8, 2009

Ken Sharp wrote: > Disregard first patch.. this one makes a little more sense. > > Ken Sharp wrote: >> See Bug 7976. Apparently this has already been done. >> >> >> ------------------------------------------------------------------------ >> >> > > > ------------------------------------------------------------------------ > > We have that same (or actually newer) page on the wiki: http://wiki.winehq.org/Fun_Projects Doesn't it make more sense to link this entire page to the wiki? -- Cheers, Paul.

2 1

Re: [3/3] windowscodecs: add stub implementation of IWICImagingFactory
by Alexandre Julliard June 8, 2009

June 8, 2009

"Vincent Povirk" <vincent(a)codeweavers.com> writes: > --- a/tools/wine.inf.in > +++ b/tools/wine.inf.in > @@ -123,6 +123,8 @@ HKCR,.xml,"Content Type",2,"text/xml" > HKCR,.xsl,"Content Type",2,"text/xsl" > HKCR,chm.file,,2,"Compiled HTML Help File" > HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" > +HKCR,CLSID\{CACAF262-9370-4615-A13B-9F5539DA4C0A}\InProcServer32,,2,"windowscodecs.dll" > +HKCR,CLSID\{CACAF262-9370-4615-A13B-9F5539DA4C0A}\InProcServer32,ThreadingModel,2,"Apartment" > HKCR,cplfile,,2,"Control Panel Item" > HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" > HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" This should be done by registering the dll. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] This patch fixes context menu crashes for edit controlsas apparent in vb apps.
by Dmitry Timoshkov June 8, 2009

June 8, 2009

"Michael Martin" <martinmnet(a)hotmail.com> wrote: > The following patch fixes 18130. In my tests, context menu for > the Edit window control does not send the WM_COMMAND message. > Please comment. And what is the reason of the crash? Please add a test case replicating the problem first, only then start fixing it. -- Dmitry.

1 0

Re: d3d9: ATI1N support
by Stefan Dösinger June 8, 2009

June 8, 2009

Nice that you found a way to support this format :-) Can you separate the compressed data loading changes from the ATI1N specific changes? I will make regression testing easier if anything should break. Do you have an app that needs this format? I think a test would be a good idea. Am 07.06.2009 um 09:48 schrieb Frank Richter: > --- > dlls/wined3d/device.c | 5 +- > dlls/wined3d/directx.c | 8 +++ > dlls/wined3d/surface.c | 110 > ++++++++++++++++++++++++------------------- > dlls/wined3d/surface_base.c | 6 +- > dlls/wined3d/utils.c | 6 ++ > include/wine/wined3d.idl | 1 + > 6 files changed, 82 insertions(+), 54 deletions(-) > > > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index f1dd938..a08f713 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -920,10 +920,9 @@ static HRESULT WINAPI > IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, > mul_4h = (Height + 3) & ~3; > if (WINED3DFMT_UNKNOWN == Format) { > Size = 0; > - } else if (Format == WINED3DFMT_DXT1) { > - /* DXT1 is half byte per pixel */ > + } else if (Format == WINED3DFMT_DXT1 || Format == > WINED3DFMT_ATI1N) { > + /* DXT1, ATI1N are half byte per pixel */ > Size = (mul_4w * glDesc->byte_count * mul_4h) >> 1; > - > } else if (Format == WINED3DFMT_DXT2 || Format == > WINED3DFMT_DXT3 || > Format == WINED3DFMT_DXT4 || Format == > WINED3DFMT_DXT5 || > Format == WINED3DFMT_ATI2N) { > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 4a2a270..60045aa 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -2467,6 +2467,14 @@ static BOOL CheckTextureCapability(struct > WineD3DAdapter *adapter, > return FALSE; > > /* Vendor specific formats */ > + case WINED3DFMT_ATI1N: > + if(GL_SUPPORT(EXT_TEXTURE_COMPRESSION_RGTC)) { > + TRACE_(d3d_caps)("[OK]\n"); > + return TRUE; > + } > + TRACE_(d3d_caps)("[FAILED]\n"); > + return FALSE; > + > case WINED3DFMT_ATI2N: > if(GL_SUPPORT(ATI_TEXTURE_COMPRESSION_3DC) || > GL_SUPPORT(EXT_TEXTURE_COMPRESSION_RGTC)) { > shader_backend = select_shader_backend(adapter, > DeviceType); > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index 2f5554f..6469fa4 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -132,6 +132,25 @@ static BOOL > primary_render_target_is_p8(IWineD3DDeviceImpl *device) > return FALSE; > } > > +/* Download data for a compressed surface */ > +static void surface_download_data_compressed(IWineD3DSurfaceImpl > *This, const struct GlPixelFormatDesc *format_desc) { > + TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, > format %#x, type %#x, data %p\n", > + This, This->glDescription.level, format_desc->glFormat, > format_desc->glType, > + This->resource.allocatedMemory); > + > + if(This->Flags & SFLAG_PBO) { > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); > + checkGLcall("glBindBufferARB"); > + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, > This->glDescription.level, NULL)); > + checkGLcall("glGetCompressedTexImageARB()"); > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); > + checkGLcall("glBindBufferARB"); > + } else { > + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, > This->glDescription.level, This->resource.allocatedMemory)); > + checkGLcall("glGetCompressedTexImageARB()"); > + } > +} > + > /* This call just downloads data, the caller is responsible for > activating the > * right context and binding the correct texture. */ > static void surface_download_data(IWineD3DSurfaceImpl *This) { > @@ -145,31 +164,19 @@ static void > surface_download_data(IWineD3DSurfaceImpl *This) { > } > > ENTER_GL(); > - > - if (format_desc->format == WINED3DFMT_DXT1 || format_desc- > >format == WINED3DFMT_DXT2 > - || format_desc->format == WINED3DFMT_DXT3 || > format_desc->format == WINED3DFMT_DXT4 > - || format_desc->format == WINED3DFMT_DXT5 || > format_desc->format == WINED3DFMT_ATI2N) > - { > + > + if (format_desc->format == WINED3DFMT_DXT1 || format_desc- > >format == WINED3DFMT_DXT2 > + || format_desc->format == WINED3DFMT_DXT3 || format_desc- > >format == WINED3DFMT_DXT4 > + || format_desc->format == WINED3DFMT_DXT5) { > if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { /* We can > assume this as the texture would not have been created otherwise */ > FIXME("(%p) : Attempting to lock a compressed texture > when texture compression isn't supported by opengl\n", This); > } else { > - TRACE("(%p) : Calling glGetCompressedTexImageARB level > %d, format %#x, type %#x, data %p\n", > - This, This->glDescription.level, format_desc- > >glFormat, format_desc->glType, > - This->resource.allocatedMemory); > - > - if(This->Flags & SFLAG_PBO) { > - > GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); > - checkGLcall("glBindBufferARB"); > - GL_EXTCALL(glGetCompressedTexImageARB(This- > >glDescription.target, This->glDescription.level, NULL)); > - checkGLcall("glGetCompressedTexImageARB()"); > - > GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); > - checkGLcall("glBindBufferARB"); > - } else { > - GL_EXTCALL(glGetCompressedTexImageARB(This- > >glDescription.target, This->glDescription.level, This- > >resource.allocatedMemory)); > - checkGLcall("glGetCompressedTexImageARB()"); > - } > + surface_download_data_compressed(This, format_desc); > } > LEAVE_GL(); > + } else if (format_desc->format == WINED3DFMT_ATI1N || > format_desc->format == WINED3DFMT_ATI2N) { > + surface_download_data_compressed(This, format_desc); > + LEAVE_GL(); > } else { > void *mem; > GLenum format = format_desc->glFormat; > @@ -286,6 +293,35 @@ static void > surface_download_data(IWineD3DSurfaceImpl *This) { > This->Flags |= SFLAG_INSYSMEM; > } > > +/* Upload data for a compressed surface */ > +static void surface_upload_data_compressed(IWineD3DSurfaceImpl > *This, const struct GlPixelFormatDesc *format_desc, > + GLenum internal, GLsizei width, GLsizei height, const > GLvoid *data) { > + /* glCompressedTexSubImage2D for uploading and glTexImage2D for > allocating does not work well on some drivers(r200 dri, MacOS ATI > driver) > + * glCompressedTexImage2D does not accept NULL pointers. So for > compressed textures surface_allocate_surface does nothing, and this > + * function uses glCompressedTexImage2D instead of the SubImage > call > + */ > + TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h %d, > data %p\n", This, width, height, data); > + ENTER_GL(); > + > + if(This->Flags & SFLAG_PBO) { > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); > + checkGLcall("glBindBufferARB"); > + TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, data); > + > + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, > This->glDescription.level, internal, > + width, height, 0 /* border */, This->resource.size, NULL)); > + checkGLcall("glCompressedTexSubImage2D"); > + > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); > + checkGLcall("glBindBufferARB"); > + } else { > + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, > This->glDescription.level, internal, > + width, height, 0 /* border */, This->resource.size, data)); > + checkGLcall("glCompressedTexSubImage2D"); > + } > + LEAVE_GL(); > +} > + > /* This call just uploads data, the caller is responsible for > activating the > * right context and binding the correct texture. */ > static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum > internal, GLsizei width, GLsizei height, GLenum format, GLenum type, > const GLvoid *data) { > @@ -293,38 +329,16 @@ static void > surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi > > if (format_desc->heightscale != 1.0 && format_desc->heightscale ! > = 0.0) height *= format_desc->heightscale; > > - if (format_desc->format == WINED3DFMT_DXT1 || format_desc- > >format == WINED3DFMT_DXT2 > - || format_desc->format == WINED3DFMT_DXT3 || > format_desc->format == WINED3DFMT_DXT4 > - || format_desc->format == WINED3DFMT_DXT5 || > format_desc->format == WINED3DFMT_ATI2N) > - { > + if (format_desc->format == WINED3DFMT_DXT1 || format_desc- > >format == WINED3DFMT_DXT2 > + || format_desc->format == WINED3DFMT_DXT3 || format_desc- > >format == WINED3DFMT_DXT4 > + || format_desc->format == WINED3DFMT_DXT5) { > if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { > FIXME("Using DXT1/3/5 without advertized support\n"); > } else { > - /* glCompressedTexSubImage2D for uploading and > glTexImage2D for allocating does not work well on some drivers(r200 > dri, MacOS ATI driver) > - * glCompressedTexImage2D does not accept NULL > pointers. So for compressed textures surface_allocate_surface does > nothing, and this > - * function uses glCompressedTexImage2D instead of the > SubImage call > - */ > - TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h > %d, data %p\n", This, width, height, data); > - ENTER_GL(); > - > - if(This->Flags & SFLAG_PBO) { > - > GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); > - checkGLcall("glBindBufferARB"); > - TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, > data); > - > - GL_EXTCALL(glCompressedTexImage2DARB(This- > >glDescription.target, This->glDescription.level, internal, > - width, height, 0 /* border */, This- > >resource.size, NULL)); > - checkGLcall("glCompressedTexSubImage2D"); > - > - > GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); > - checkGLcall("glBindBufferARB"); > - } else { > - GL_EXTCALL(glCompressedTexImage2DARB(This- > >glDescription.target, This->glDescription.level, internal, > - width, height, 0 /* border */, This- > >resource.size, data)); > - checkGLcall("glCompressedTexSubImage2D"); > - } > - LEAVE_GL(); > + surface_upload_data_compressed(This, format_desc, internal, > width, height, data); > } > + } else if (format_desc->format == WINED3DFMT_ATI1N || > format_desc->format == WINED3DFMT_ATI2N) { > + surface_upload_data_compressed(This, format_desc, internal, width, > height, data); > } else { > TRACE("(%p) : Calling glTexSubImage2D w %d, h %d, data, %p > \n", This, width, height, data); > ENTER_GL(); > diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c > index d487f80..83cbd9d 100644 > --- a/dlls/wined3d/surface_base.c > +++ b/dlls/wined3d/surface_base.c > @@ -339,7 +339,7 @@ DWORD WINAPI > IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) { > /* DXTn formats don't have exact pitches as they are to the new > row of blocks, > where each block is 4x4 pixels, 8 bytes (dxt1) and 16 bytes > (dxt2/3/4/5) > ie pitch = (width/4) * bytes per > block */ > - if (format == WINED3DFMT_DXT1) /* DXT1 is 8 bytes per block */ > + if (format == WINED3DFMT_DXT1 || format == WINED3DFMT_ATI1N) /* > DXT1, ATI1N are 8 bytes per block */ > ret = ((This->currentDesc.Width + 3) >> 2) << 3; > else if (format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 || > format == WINED3DFMT_DXT4 || format == > WINED3DFMT_DXT5) /* DXT2/3/4/5 is 16 bytes per block */ > @@ -521,8 +521,8 @@ HRESULT WINAPI > IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3D > TRACE("(%p) : Setting texture format to (%d,%s)\n", This, > format, debug_d3dformat(format)); > if (format == WINED3DFMT_UNKNOWN) { > This->resource.size = 0; > - } else if (format == WINED3DFMT_DXT1) { > - /* DXT1 is half byte per pixel */ > + } else if (format == WINED3DFMT_DXT1 || format == > WINED3DFMT_ATI1N) { > + /* DXT1, ATI1N are half byte per pixel */ > This->resource.size = ((max(This->pow2Width, 4) * > format_desc->byte_count) * max(This->pow2Height, 4)) >> 1; > > } else if (format == WINED3DFMT_DXT2 || format == > WINED3DFMT_DXT3 || > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index f141a3b..822ce14 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -129,6 +129,7 @@ static const struct StaticPixelFormatDesc > formats[] = > {WINED3DFMT_R32_UINT, 0x0, 0x0, > 0x0, 0x0, 4, 0, 0, FALSE}, > {WINED3DFMT_R16G16B16A16_SNORM, 0x0, 0x0, > 0x0, 0x0, 8, 0, 0, FALSE}, > /* Vendor-specific formats */ > + {WINED3DFMT_ATI1N, 0x0, 0x0, > 0x0, 0x0, 1, 0, 0, TRUE }, > {WINED3DFMT_ATI2N, 0x0, 0x0, > 0x0, 0x0, 1, 0, 0, TRUE }, > {WINED3DFMT_NVHU, 0x0, 0x0, > 0x0, 0x0, 2, 0, 0, TRUE }, > {WINED3DFMT_NVHS, 0x0, 0x0, > 0x0, 0x0, 2, 0, 0, TRUE }, > @@ -459,6 +460,10 @@ static const GlPixelFormatDescTemplate > gl_formats_template[] = { > WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, > EXT_PACKED_DEPTH_STENCIL}, > /* Vendor-specific formats */ > + {WINED3DFMT_ATI1N, GL_COMPRESSED_RED_RGTC1_EXT, > GL_COMPRESSED_RED_RGTC1_EXT, 0, > + GL_RED, GL_UNSIGNED_BYTE, > + 0, > + EXT_TEXTURE_COMPRESSION_RGTC}, > {WINED3DFMT_ATI2N, > GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, > GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0, > GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, > 0, > @@ -868,6 +873,7 @@ const char* debug_d3dformat(WINED3DFORMAT fmt) { > FMT_TO_STR(WINED3DFMT_D24FS8); > FMT_TO_STR(WINED3DFMT_VERTEXDATA); > FMT_TO_STR(WINED3DFMT_CxV8U8); > + FMT_TO_STR(WINED3DFMT_ATI1N); > FMT_TO_STR(WINED3DFMT_ATI2N); > FMT_TO_STR(WINED3DFMT_NVHU); > FMT_TO_STR(WINED3DFMT_NVHS); > diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl > index 51d886c..6d087fd 100644 > --- a/include/wine/wined3d.idl > +++ b/include/wine/wined3d.idl > @@ -272,6 +272,7 @@ cpp_quote("#define WINED3DFMT_MULTI2_ARGB8 > WINEMAKEFOURCC('M', 'E', 'T', '1')") > cpp_quote("#define WINED3DFMT_G8R8_G8B8 WINEMAKEFOURCC('G', 'R', > 'G', 'B')") > cpp_quote("#define WINED3DFMT_R8G8_B8G8 WINEMAKEFOURCC('R', 'G', > 'B', 'G')") > /* Vendor specific formats */ > +cpp_quote("#define WINED3DFMT_ATI1N WINEMAKEFOURCC('A', 'T', > 'I', '1')") > cpp_quote("#define WINED3DFMT_ATI2N WINEMAKEFOURCC('A', 'T', > 'I', '2')") > cpp_quote("#define WINED3DFMT_NVHU WINEMAKEFOURCC('N', 'V', > 'H', 'U')") > cpp_quote("#define WINED3DFMT_NVHS WINEMAKEFOURCC('N', 'V', > 'H', 'S')") > >

1 0