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

change in dlls/version/info.c breaks IBM Translation Manager
by Phil Krylov July 25, 2005

July 25, 2005

Hello, http://cvs.winehq.org/cvsweb/wine/dlls/version/info.c.diff?r1=1.47&r2=1.48&… This recent change in dlls/version/info.c breaks IBM Translation Manager on startup: > wine: Unhandled exception (thread 0009), starting debugger... > WineDbg starting on pid 0x8 > Unhandled exception: page fault on read access to 0x7bb0f4ac in 32-bit code (0x7b4ce282). > In 32 bit mode. > Register dump: > CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 > EIP:7b4ce282 ESP:7baff860 EBP:7baff8b0 EFLAGS:00010283( - 00 -RIS1C) > EAX:7bb0fa58 EBX:7b4d37dc ECX:0000fd34 EDX:7bb0f4ac > ESI:7baffb24 EDI:7baffb40 > Stack dump: > 0x7baff860: 7baffb28 00000000 7baffd4c ffffffff > 0x7baff870: 7baffb3c 00000002 00000000 00000000 > 0x7baff880: 7baff9da 7bb0fa58 7b4d3ae0 7bb0f4ac > 0x7baff890: 7baffd4c 00001794 7baf0000 00007baf > 0x7baff8a0: 0000fd34 7b4d37dc 7bb0fa58 7baffb24 > 0x7baff8b0: 7baff908 7b4ce2ad 7baffd24 7baffb24 > Backtrace: > =>1 0x7b4ce282 ConvertVersionInfo32To16+0x172(info32=0x7baffd24, info16=0x7baffb24) [/home/phil/build/wine/dlls/version/info.c:267] in version (0x7baff8b0) > 2 0x7b4ce2ad ConvertVersionInfo32To16+0x19d(info32=0x7baff9d4, info16=0x7baff9d4) [/home/phil/build/wine/dlls/version/info.c:273] in version (0x7baff908) > 3 0x7b4cf64c VerQueryValueA(pBlock=0x7baff9d4, lpSubBlock=0x569214, lplpBuffer=0x7baff9cc, puLen=0x7baff9d0) [/home/phil/build/wine/dlls/version/info.c:772] in version (0x7baff93c) > fixme:dbghelp:sffip_cb NIY on 'P:\EQFD\BINNTCVP\EQFD.pdb' > 4 0x00401bb6 in eqfd (+0x1bb6) (0x7baffdb8) > 5 0x004aa8e7 in eqfd (+0xaa8e7) (0x7baffddc) > 6 0x004745c8 in eqfd (+0x745c8) (0x7baffdf4) > 7 0x0044ef54 EntryPoint+0x1a4 in eqfd (0x7bafff2c) > 8 0x7bbb3f48 start_process+0x8d(arg=0x0) [/home/phil/build/wine/dlls/kernel/process.c:996] in kernel32 (0x7baffff4) > 9 0xb7fab48d wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) > 0x7b4ce282 ConvertVersionInfo32To16+0x172 [/home/phil/build/wine/dlls/version/info.c:267] in version: movzwl 0x0(%edx),%eax > 267 while ( (DWORD)child32 < (DWORD)info32 + wLength && child32->wLength != 0 ) > Wine-dbg> -- Ph.

2 7

Re: [wined3d] resource object tracking.
by Raphael July 25, 2005

July 25, 2005

On Monday 25 July 2005 20:31, Oliver Stieber wrote: > Hi, > This patch implements resource tracking, require for reset and evict > managed resources and provides extra sanity checks. > > I've had to test with an older version of wine-cvs since head doesn't seem > to compile cleanly or run at the moment, but there aren't otherwise any > changes in wine-cvs that would affect this patch. > Why you need 2 breaks here ? + case D3DRTYPE_VOLUME: + break; + + /* TODO: nothing really? */ + break; Regards, Raphael PS: its better to use unsigned for indexes and counts :)

1 0

wine installation for Debian
by Khe Siang Tan July 25, 2005

July 25, 2005

Hi just wondering if someone could help me....i am running Debian operating system....and i am trying to install/run WINE.....i have typed the command $apt-get install wine in root user. KHE:/home/zhe# apt-get install wine Reading Package Lists... Done Building Dependency Tree... Done wine is already the newest version. 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. it seems to have installed but it has not appeared on my programs list....how do i get it running.... i have also tried this command: KHE:/home/zhe# dpkg -i wine_0.0.20030115-1.deb dpkg: error processing wine_0.0.20030115-1.deb (--install): cannot access archive: No such file or directory Errors were encountered while processing: wine_0.0.20030115-1.deb how do i get WINE running thx Cheers K-Si Send instant messages to your online friends http://au.messenger.yahoo.com

3 2

Re: ALSA: Call snd_pcm_drain instead of a buggy homegrown version
by Vitaliy Margolen July 25, 2005

July 25, 2005

Isn't WODM_RESET should stop playback/recording immediately? In which case shouldn't we use snd_pcm_drop instead? I'm guessing here. I have that loop disabled here for some time now. And I can't hear any artifacts. PS: If we drop that loop we should remove all associated stuff as well. Vitaliy Margolen Monday, July 25, 2005, 9:27:42, Robert Shearman wrote: > Changelog: > wait_for_poll can go into an infinite loop. Remove it and replace it > with snd_pcm_drain which is more likely to do what the original author > intended.

2 2

Exception Handling with a "bad" ESP
by Glenn Wurster July 25, 2005

July 25, 2005

I've been doing some debugging of the exception handler and have come across a problem for which I'm not sure what the best solution is. It involves an application using the ESP for something other than the stack. The current DIB code uses protection to detect when the application modifies the DIB bits and respond accordingly. It does this by disabling read and/or write access to pages and then catching exceptions when they are thrown so that it can keep the X11 and windows versions of the DIB seporate but reflect changes appropriately (There may be other pieces of Wine which use similar tactics). The application I am debugging, however, uses the ESP as a counter/memory offset in it's updating of the DIB. While not the best selection of registers, the application relies on ESP not being used for anything else while the DIB updates take place (In Windows this assumption is true). A made-up example of assembly code is as follows: mov esp, [0x12345678] ; Save the ESP mov 0x128796, esp ; Set up ESP for the DIB modification mov 0, ebp loop: mov ebp, [sp + bp] ; Write out the byte to the DIB inc ebp sub esp, 0x10000 ; The high word is a counter jns loop mov [0x12345678], esp ; Restore the ESP Now, one of the first things our exception handler in signal_i386.c does is set up the stack layout to deliver the exception to the application (see the setup_exception function), but in this case ESP definately does not point to the stack (and the application never intended for an exception to occurr). It instead contains a counter in the high word, and a memory offset in the low word. Because of this, there is a double fault which happens and Wine actually Segfaults as opposed to breaking into the debugger. So, what I'm wondering is if anyone who has experiance with the exception handling code has any thoughts on how this problem can be fixed. If your interested in actual application code which does this, Alpha Centauri is what I found the initial problem with. You can download the demo at http://www.firaxis.com/downloads/Demo/smac_demo1_1.exe. The assembly code in the application which causes the crash is located starting at around offset 0x0060d954. As an interesting side-effect, if there are other applications which are using ESP in a "bad" manor, then we may be corrupting memory whenever we generate an exception within Wine. This issue would be very hard to track down, which makes me think that only exceptions which would normally be generated in Windows should cause Wine to modify the application stack. Comments? Suggestions? Glenn.

6 13

Re: WLDAP32: improve error handling for the bind functions
by Dimi Paun July 25, 2005

July 25, 2005

From: "Hans Leidekker" <hans(a)it.vu.nl> > > - credW = strAtoW( cred ); > - if (!credW) return LDAP_NO_MEMORY; > + if (dn) { > + dnW = strAtoW( dn ); > + if (!dnW) return LDAP_NO_MEMORY; > + } > + if (cred) { > + credW = strAtoW( cred ); > + if (!credW) return LDAP_NO_MEMORY; > + } This leaks memory, if credW fails to allocate. Something like this would work: + WCHAR *dnW = NULL, *credW = NULL; + int ret = LDAP_NO_MEMORY; + + if (dn) { + dnW = strAtoW( dn ); + if (!dnW) goto exit; + } + if (cred) { + credW = strAtoW( cred ); + if (!credW) goto exit; + } + ret = ldap_bindW( ld, dnW, credW, method ); + exit: + free dnW, credW + return ret;

1 0

rpc problems with kohan2 installer.
by Oliver Stieber July 25, 2005

July 25, 2005

Hi, I picked up a copy of Kohan 2, but I can't get it to install it looks like an RPC error. trace:rpc:I_RpcSend (0x7bc84e18) trace:rpc:RPCRT4_OpenBinding (Binding == ^0x7bc84e50) trace:rpc:RPCRT4_Receive buffer length = 12 trace:rpc:I_RpcGetBuffer (0x7ba8a6e4): BufferLength=12 trace:rpc:I_RpcGetBuffer Buffer=0x7bc44978 trace:rpc:RPCRT4_CloseBinding (Binding == ^0x7bc84e50) trace:rpc:RPCRT4_process_packet freeing Buffer=0x7bc84ed8 trace:rpc:RPCRT4_DestroyBinding binding: 0x7bc84e50 trace:rpc:I_RpcFreeBuffer (0x7bc84e18) Buffer=0x7bc850d0 trace:rpc:RPCRT4_CloseBinding (Binding == ^0x7bcae5f8) trace:rpc:RPCRT4_DestroyConnection connection: 0x7bc36cf0 trace:rpc:RPCRT4_CloseConnection (Connection == ^0x7bc36cf0) warn:rpc:RPCRT4_Receive Short read of header, 0/16 bytes warn:rpc:RPCRT4_io_thread receive failed with error 6c0 trace:rpc:RPCRT4_DestroyConnection connection: 0x7bc435d0 trace:rpc:RPCRT4_CloseConnection (Connection == ^0x7bc435d0) trace:ole:rpc_sendreceive_thread completed with status 0x0 trace:ole:DllMain 0x7b7c0000 0x3 (nil) trace:ole:DllMain 0x7b570000 0x3 (nil) trace:ole:CoWaitForMultipleHandles waiting for rpc completion or window message trace:ole:CoWaitForMultipleHandles -- 0x00000000 trace:ole:RpcChannelBuffer_SendReceive RPC call status: 0x0 trace:ole:RpcChannelBuffer_SendReceive -- 0x00000000 trace:ole:deserialize_param vt 26 at 0x7ba8a760 trace:ole:deserialize_param vt 3 at 0x7ba8c3d0 trace:ole:ITypeInfo_fnRelease (0x7bc880c0)->(6) trace:ole:ITypeLib2_fnRelease (0x7bc39748)->(8) ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

2 2

Re: hhctrl: Add the WebBrowser implementation [take 5]
by Alexandre Julliard July 25, 2005

July 25, 2005

James Hawkins <truiken(a)gmail.com> writes: > +typedef struct IOleInPlaceFrameImpl > +{ > + IOleInPlaceFrame frame; > + HWND window; > +} IOleInPlaceFrameImpl; > + > +typedef struct IOleInPlaceSiteImpl > +{ > + IOleInPlaceSite inplace; > + IOleInPlaceFrameImpl frame; > +} IOleInPlaceSiteImpl; > + > +typedef struct IOleClientSiteImpl > +{ > + IOleClientSite client; > + IOleInPlaceSiteImpl inplace; > + IDocHostUIHandler ui; > +} IOleClientSiteImpl; You should define a single structure with multiple vtbl pointers, and compute the This pointer based on structure offsets. Look at how this is done in other places, like shelllink.c for instance. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: hhctrl: Add the remaining commands to HtmlHelp
by Alexandre Julliard July 25, 2005

July 25, 2005

James Hawkins <truiken(a)gmail.com> writes: > Hey, > > Changelog > * Add the remaining commands to HtmlHelp. That switch is not supposed to list all the commands, it's here to only display the message box on calls caused by direct user action, to avoid spamming the user with message boxes. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32: theming "framework"
by Frank Richter July 25, 2005

July 25, 2005

On 16.07.2005 01:13, Frank Richter wrote: > Frank Richter <frank.richter(a)gmail.com> > Added some generic code to allow subclassing(for the purpose of theming) > of standard controls. What are the issues with this one? -f.r.

2 1

Re: hhctrl: Add the CHM implemenation
by Dmitry Timoshkov July 25, 2005

July 25, 2005

"James Hawkins" <truiken(a)gmail.com> wrote: > --- /dev/null 2005-07-23 07:02:07.637731864 -0500 > +++ dlls/hhctrl.ocx/itss.h 2005-07-25 01:09:16.000000000 -0500 > @@ -0,0 +1,302 @@ > +/*** Autogenerated by WIDL 0.1 from itss.idl - Do not edit ***/ Probably we need to move itss.idl to include/ so that a generated itss.h could be accessed globally. > + hr = pStorage->lpVtbl->OpenStream(pStorage, stringsW, NULL, STGM_READ, 0, &pStream); Please use IStorage_OpenStream macro here and similar macros instead of accessing vtable directly. -- Dmitry.

2 2

Writing tests when creating patches
by Paul Vriens July 24, 2005

July 24, 2005

Hi, I've noticed that in the past weeks there were several patches that contained a remark like: - checked on on windows - compared with native - ... Wouldn't it be nice if tests accompanied these fixes? Do we have some guidelines in this? I know that writing tests is not everybody's hobby. Cheers, Paul.

2 1

Wine causing strange messages in Linux dmesg log
by Chris Rankin July 24, 2005

July 24, 2005

Hi, Ever since (approx) when the winecfg tool became active, a Windows tool that examined IDE capabilities has stopped working. Instead, the following messages are being written into the dmesg log: hdc: write_intr: wrong transfer direction! hdd: write_intr: wrong transfer direction! hdc is a DVD-ROM drive, whereas hdd is a CD-RW drive, and the tool (DiscInfo.exe v1.5.5) tries to use SPTI. However, the tool identified both as hard disks. Does anyone have any ideas what's broken, please? Cheers, Chris ___________________________________________________________ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com

1 0

QuickTime Problems
by Andrew Neil Ramage July 24, 2005

July 24, 2005

I installed the latest RPM release for SuSE 9.3 on my new laptop. Having installed Quick Time, I tried to view some .mov files (trailers) Anyone know what is wrong ? The output to the command window I started wine from is below. andrew(a)apollo:~/.wine/drive_c/Program Files/QuickTime> wine QuickTimePlayer.exe Sample.mov fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (0x403bf200)->(00000000,00000008) fixme:font:CreateScalableFontResourceA (0,"c:\\windows\\QTFont.for","c:\\windows\\QTFont.qfn",(null)): stub fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented X Error of failed request: BadDrawable (invalid Pixmap or Window parameter) Major opcode of failed request: 67 (X_PolyRectangle) Resource id in failed request: 0x4200007 Serial number of failed request: 13172 Current serial number in output stream: 13199 andrew(a)apollo:~/.wine/drive_c/Program Files/QuickTime> -- Andrew You can be the captain I will draw the chart Sailing into destiny Closer to the heart Closer to the Heart by Rush (A Farewell to Kings, 1977) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

Re: Treat LDAP as X for macro detection in winapi_check
by Alexandre Julliard July 24, 2005

July 24, 2005

Vincent Béron <vberon(a)mecano.gme.usherb.ca> writes: > Since we don't use HAVE_LDAP_H, it's an exception as well. There's no reason not to use HAVE_LDAP_H for header checks. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: fix lots of missings-declarations warnings (reworked)
by Alexandre Julliard July 24, 2005

July 24, 2005

Stefan Huehner <stefan(a)huehner.org> writes: > [old message] > this patch adds prototypes for the functions in opengl_norm.c which are > prefixed with 'wine_'. As this file is generated from the make_opengl > script this was also modified to emit this additional lines as it > already did for opengl_ext.c. This patch fixes 374 missing-declarations > warnings. At the cost of adding 374 useless prototypes... We really don't want to do that, it's perfectly legitimate in that case that the functions don't have a declaration, that's why the warning is not turned on by default. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber July 23, 2005

July 23, 2005

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs > Just a couple of queries.. Why are you passing the offset to GetMemory? I can't see there ever being a need for it IWineD3DVertexBufferImpl_GetMemory(foo) + offset should be fine > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber July 23, 2005

July 23, 2005

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs I should have added, this patch is good to go in though.... > > Regards, > Raphael > > ? wined3d.spec.def > Index: directx.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/directx.c,v > retrieving revision 1.41 > diff -u -r1.41 directx.c > --- directx.c 13 Jul 2005 19:38:40 -0000 1.41 > +++ directx.c 22 Jul 2005 19:52:14 -0000 > @@ -1455,7 +1455,7 @@ > *pCaps->MaxStreams = MAX_STREAMS; > *pCaps->MaxStreamStride = 1024; > > - if (((vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || (vs_mode == VS_SW) || > (DeviceType == D3DDEVTYPE_REF)) { > + if (((wined3d_settings.vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || > (wined3d_settings.vs_mode == VS_SW) || (DeviceType == D3DDEVTYPE_REF)) { > *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); > > if (This->gl_info.gl_vendor == VENDOR_MESA || > @@ -1469,7 +1469,7 @@ > *pCaps->MaxVertexShaderConst = 0; > } > > - if ((ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType != > D3DDEVTYPE_REF)) { > + if ((wined3d_settings.ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType > != D3DDEVTYPE_REF)) { > *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); > *pCaps->PixelShader1xMaxValue = 1.0; > } else { > Index: drawprim.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > retrieving revision 1.20 > diff -u -r1.20 drawprim.c > --- drawprim.c 22 Jul 2005 18:27:04 -0000 1.20 > +++ drawprim.c 22 Jul 2005 19:52:19 -0000 > @@ -365,8 +365,8 @@ > TRACE("Stream is up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > data = (BYTE *)This->stateBlock->streamSource[element->Stream]; > } else { > - TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; > + TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0); > } > stride = This->stateBlock->streamStride[element->Stream]; > data += (BaseVertexIndex * stride); > @@ -571,12 +571,12 @@ > if (This->stateBlock->streamIsUP) { > data = (BYTE *)This->stateBlock->streamSource[nStream]; > } else { > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[nStream])->resource.allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > } > } else { > #if 0 /* TODO: Vertex shader support */ > thisFVF = This->stateBlock->vertexShaderDecl->fvf[nStream]; > - data = ((IDirect3DVertexBuffer8Impl > *)This->stateBlock->streamSource[nStream])->allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > #endif > } > VTRACE(("FVF for stream %d is %lx\n", nStream, thisFVF)); > Index: vertexbuffer.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/vertexbuffer.c,v > retrieving revision 1.13 > diff -u -r1.13 vertexbuffer.c > --- vertexbuffer.c 13 Jul 2005 14:15:54 -0000 1.13 > +++ vertexbuffer.c 22 Jul 2005 19:52:19 -0000 > @@ -1,8 +1,8 @@ > /* > * IWineD3DVertexBuffer Implementation > * > - * Copyright 2002-2004 Jason Edmeades > - * Copyright 2003-2004 Raphael Junqueira > + * Copyright 2002-2005 Jason Edmeades > + * Raphael Junqueira > * Copyright 2004 Christian Costa > * > * This library is free software; you can redistribute it and/or > @@ -149,3 +149,13 @@ > IWineD3DVertexBufferImpl_Unlock, > IWineD3DVertexBufferImpl_GetDesc > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} > Index: wined3d_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_main.c,v > retrieving revision 1.11 > diff -u -r1.11 wined3d_main.c > --- wined3d_main.c 22 Jul 2005 18:26:05 -0000 1.11 > +++ wined3d_main.c 22 Jul 2005 19:52:19 -0000 > @@ -30,8 +30,14 @@ > int num_lock = 0; > void (*wine_tsx11_lock_ptr)(void) = NULL; > void (*wine_tsx11_unlock_ptr)(void) = NULL; > -int vs_mode = VS_HW; /* Hardware by default */ > -int ps_mode = PS_NONE; /* Disabled by default */ > + > + > +wined3d_settings_t wined3d_settings = > +{ > + VS_HW, /* Hardware by default */ > + PS_NONE, /* Disabled by default */ > + VBO_HW /* Hardware by default */ > +}; > > WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; > CRITICAL_SECTION resourceStoreCriticalSection; > @@ -128,12 +134,12 @@ > if (!strcmp(buffer,"none")) > { > TRACE("Disable vertex shaders\n"); > - vs_mode = VS_NONE; > + wined3d_settings.vs_mode = VS_NONE; > } > else if (!strcmp(buffer,"emulation")) > { > TRACE("Force SW vertex shaders\n"); > - vs_mode = VS_SW; > + wined3d_settings.vs_mode = VS_SW; > } > } > if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) > @@ -141,14 +147,34 @@ > if (!strcmp(buffer,"enabled")) > { > TRACE("Allow pixel shaders\n"); > - ps_mode = PS_HW; > + wined3d_settings.ps_mode = PS_HW; > + } > + if (!strcmp(buffer,"disabled")) > + { > + TRACE("Disable pixel shaders\n"); > + wined3d_settings.ps_mode = PS_NONE; > + } > + } > + if ( !get_config_key( hkey, appkey, "VertexBufferMode", buffer, size) ) > + { > + if (!strcmp(buffer,"none")) > + { > + TRACE("Disable Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_NONE; > + } > + else if (!strcmp(buffer,"hardware")) > + { > + TRACE("Allow Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_HW; > } > } > } > - if (vs_mode == VS_HW) > + if (wined3d_settings.vs_mode == VS_HW) > TRACE("Allow HW vertex shaders\n"); > - if (ps_mode == PS_NONE) > + if (wined3d_settings.ps_mode == PS_NONE) > TRACE("Disable pixel shaders\n"); > + if (wined3d_settings.vbo_mode == VBO_NONE) > + TRACE("Disable Vertex Buffer Hardware support\n"); > > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > Index: wined3d_private.h > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > retrieving revision 1.42 > diff -u -r1.42 wined3d_private.h > --- wined3d_private.h 22 Jul 2005 09:06:03 -0000 1.42 > +++ wined3d_private.h 22 Jul 2005 19:52:20 -0000 > @@ -69,16 +69,28 @@ > extern const DWORD SavedVertexStates_T[NUM_SAVEDVERTEXSTATES_T]; > extern const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S]; > > -/* vertex and pixel shader modes */ > -extern int vs_mode; > +/** > + * Settings > + */ > #define VS_NONE 0 > #define VS_HW 1 > #define VS_SW 2 > > -extern int ps_mode; > #define PS_NONE 0 > #define PS_HW 1 > > +#define VBO_NONE 0 > +#define VBO_HW 1 > + > +typedef struct wined3d_settings_s { > +/* vertex and pixel shader modes */ > + int vs_mode; > + int ps_mode; > + int vbo_mode; > +} wined3d_settings_t; > + > +extern wined3d_settings_t wined3d_settings; > + > /* X11 locking */ > > extern void (*wine_tsx11_lock_ptr)(void); > @@ -979,6 +991,9 @@ > extern void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture > *iface); > extern BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL); > extern BOOL WINAPI IWineD3DBaseTextureImpl_GetDirty(IWineD3DBaseTexture *iface); > + > + extern BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD > iOffset); > + extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface); > /*** class static members ***/ > ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber July 23, 2005

July 23, 2005

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs > Hi, I've got debugged and tested VBO support with full support for vertex shaders to go in soon, but I'm trying to stabilize d3d before pushing performance features. > Regards, > Raphael > > ? wined3d.spec.def > Index: directx.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/directx.c,v > retrieving revision 1.41 > diff -u -r1.41 directx.c > --- directx.c 13 Jul 2005 19:38:40 -0000 1.41 > +++ directx.c 22 Jul 2005 19:52:14 -0000 > @@ -1455,7 +1455,7 @@ > *pCaps->MaxStreams = MAX_STREAMS; > *pCaps->MaxStreamStride = 1024; > > - if (((vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || (vs_mode == VS_SW) || > (DeviceType == D3DDEVTYPE_REF)) { > + if (((wined3d_settings.vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || > (wined3d_settings.vs_mode == VS_SW) || (DeviceType == D3DDEVTYPE_REF)) { > *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); > > if (This->gl_info.gl_vendor == VENDOR_MESA || > @@ -1469,7 +1469,7 @@ > *pCaps->MaxVertexShaderConst = 0; > } > > - if ((ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType != > D3DDEVTYPE_REF)) { > + if ((wined3d_settings.ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType > != D3DDEVTYPE_REF)) { > *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); > *pCaps->PixelShader1xMaxValue = 1.0; > } else { > Index: drawprim.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > retrieving revision 1.20 > diff -u -r1.20 drawprim.c > --- drawprim.c 22 Jul 2005 18:27:04 -0000 1.20 > +++ drawprim.c 22 Jul 2005 19:52:19 -0000 > @@ -365,8 +365,8 @@ > TRACE("Stream is up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > data = (BYTE *)This->stateBlock->streamSource[element->Stream]; > } else { > - TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; > + TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0); > } > stride = This->stateBlock->streamStride[element->Stream]; > data += (BaseVertexIndex * stride); > @@ -571,12 +571,12 @@ > if (This->stateBlock->streamIsUP) { > data = (BYTE *)This->stateBlock->streamSource[nStream]; > } else { > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[nStream])->resource.allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > } > } else { > #if 0 /* TODO: Vertex shader support */ > thisFVF = This->stateBlock->vertexShaderDecl->fvf[nStream]; > - data = ((IDirect3DVertexBuffer8Impl > *)This->stateBlock->streamSource[nStream])->allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > #endif > } > VTRACE(("FVF for stream %d is %lx\n", nStream, thisFVF)); > Index: vertexbuffer.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/vertexbuffer.c,v > retrieving revision 1.13 > diff -u -r1.13 vertexbuffer.c > --- vertexbuffer.c 13 Jul 2005 14:15:54 -0000 1.13 > +++ vertexbuffer.c 22 Jul 2005 19:52:19 -0000 > @@ -1,8 +1,8 @@ > /* > * IWineD3DVertexBuffer Implementation > * > - * Copyright 2002-2004 Jason Edmeades > - * Copyright 2003-2004 Raphael Junqueira > + * Copyright 2002-2005 Jason Edmeades > + * Raphael Junqueira > * Copyright 2004 Christian Costa > * > * This library is free software; you can redistribute it and/or > @@ -149,3 +149,13 @@ > IWineD3DVertexBufferImpl_Unlock, > IWineD3DVertexBufferImpl_GetDesc > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} > Index: wined3d_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_main.c,v > retrieving revision 1.11 > diff -u -r1.11 wined3d_main.c > --- wined3d_main.c 22 Jul 2005 18:26:05 -0000 1.11 > +++ wined3d_main.c 22 Jul 2005 19:52:19 -0000 > @@ -30,8 +30,14 @@ > int num_lock = 0; > void (*wine_tsx11_lock_ptr)(void) = NULL; > void (*wine_tsx11_unlock_ptr)(void) = NULL; > -int vs_mode = VS_HW; /* Hardware by default */ > -int ps_mode = PS_NONE; /* Disabled by default */ > + > + > +wined3d_settings_t wined3d_settings = > +{ > + VS_HW, /* Hardware by default */ > + PS_NONE, /* Disabled by default */ > + VBO_HW /* Hardware by default */ > +}; > > WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; > CRITICAL_SECTION resourceStoreCriticalSection; > @@ -128,12 +134,12 @@ > if (!strcmp(buffer,"none")) > { > TRACE("Disable vertex shaders\n"); > - vs_mode = VS_NONE; > + wined3d_settings.vs_mode = VS_NONE; > } > else if (!strcmp(buffer,"emulation")) > { > TRACE("Force SW vertex shaders\n"); > - vs_mode = VS_SW; > + wined3d_settings.vs_mode = VS_SW; > } > } > if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) > @@ -141,14 +147,34 @@ > if (!strcmp(buffer,"enabled")) > { > TRACE("Allow pixel shaders\n"); > - ps_mode = PS_HW; > + wined3d_settings.ps_mode = PS_HW; > + } > + if (!strcmp(buffer,"disabled")) > + { > + TRACE("Disable pixel shaders\n"); > + wined3d_settings.ps_mode = PS_NONE; > + } > + } > + if ( !get_config_key( hkey, appkey, "VertexBufferMode", buffer, size) ) > + { > + if (!strcmp(buffer,"none")) > + { > + TRACE("Disable Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_NONE; > + } > + else if (!strcmp(buffer,"hardware")) > + { > + TRACE("Allow Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_HW; > } > } > } > - if (vs_mode == VS_HW) > + if (wined3d_settings.vs_mode == VS_HW) > TRACE("Allow HW vertex shaders\n"); > - if (ps_mode == PS_NONE) > + if (wined3d_settings.ps_mode == PS_NONE) > TRACE("Disable pixel shaders\n"); > + if (wined3d_settings.vbo_mode == VBO_NONE) > + TRACE("Disable Vertex Buffer Hardware support\n"); > > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > Index: wined3d_private.h > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > retrieving revision 1.42 > diff -u -r1.42 wined3d_private.h > --- wined3d_private.h 22 Jul 2005 09:06:03 -0000 1.42 > +++ wined3d_private.h 22 Jul 2005 19:52:20 -0000 > @@ -69,16 +69,28 @@ > extern const DWORD SavedVertexStates_T[NUM_SAVEDVERTEXSTATES_T]; > extern const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S]; > > -/* vertex and pixel shader modes */ > -extern int vs_mode; > +/** > + * Settings > + */ > #define VS_NONE 0 > #define VS_HW 1 > #define VS_SW 2 > > -extern int ps_mode; > #define PS_NONE 0 > #define PS_HW 1 > > +#define VBO_NONE 0 > +#define VBO_HW 1 > + > +typedef struct wined3d_settings_s { > +/* vertex and pixel shader modes */ > + int vs_mode; > + int ps_mode; > + int vbo_mode; > +} wined3d_settings_t; > + > +extern wined3d_settings_t wined3d_settings; > + > /* X11 locking */ > > extern void (*wine_tsx11_lock_ptr)(void); > @@ -979,6 +991,9 @@ > extern void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture > *iface); > extern BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL); > extern BOOL WINAPI IWineD3DBaseTextureImpl_GetDirty(IWineD3DBaseTexture *iface); > + > + extern BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD > iOffset); > + extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface); > /*** class static members ***/ > ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: glu32: fix some of -Wmissing-declarations warinings
by Vincent Béron July 23, 2005

July 23, 2005

Le sam 23/07/2005 à 12:06, Stefan Huehner a écrit : [snip] 2 small nits: > --- /dev/null 2005-03-29 14:09:30.000000000 +0200 > +++ dlls/glu32/glu_local.h 2005-07-23 16:55:03.000000000 +0200 > @@ -0,0 +1,104 @@ > +/* A line indicating what this file is for, along with a copyright assignment, would be good. > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. [snip] How about a double include protection? (I know there's only one .c file in which it is included and that it's not likely to change, but I still recommend using one.) Vincent

1 0

Re: Move 16bit header to include/wine
by Francois Gouget July 23, 2005

July 23, 2005

On Fri, 22 Jul 2005, Vincent Béron wrote: > Similar to previous one, only this time it's a whole file. I don't know > if current PSDK still carry it, in which case maybe we want to keep it > where it is? It's still present in the main directory of the XP-SP2 PSDK. So I think it should remain where it is. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ In theory, theory and practice are the same, but in practice they're different.

1 0

Thought you all should know....
by Dustin Navea July 22, 2005

July 22, 2005

To the PC reporters and journalists that this email gets sent to, this should probably be sent to people on your lists, pending further research on your part. I got this from the EFF (for those that dont know, thats the Electronic Frontires Foundation, the guys that monitor your privacy), and for those that dont care, just delete this.. I just figured you all should know.. ---Contents of the message below--- * Is Your Printer Spying On You? Help EFF Watch the Watchers Imagine that every time you printed a document, it automatically included a secret code that could be used to identify the printer - and potentially, the person who used it. Sounds like something from an episode of "Alias," right? Unfortunately, the scenario isn't fictional. In an effort to identify counterfeiters, the US government has succeeded in persuading some color laser printer manufacturers to encode each page with identifying information. That means that without your knowledge or consent, an act you assume is private could become public. A communication tool you're using in everyday life could become a tool for government surveillance. And what's worse, there are no laws to prevent abuse. The ACLU recently issued a report revealing that the FBI has amassed more than 1,100 pages of documents on the organization since 2001, as well as documents concerning other non-violent groups, including Greenpeace and United for Peace and Justice. In the current political climate, it's not hard to imagine the government using the ability to determine who may have printed what document for purposes other than identifying counterfeiters. Yet there are no laws to stop the Secret Service - or for that matter, any other governmental agency or private company - from using printer codes to secretly trace the origin of non-currency documents. We're unaware of any printer manufacturer that has a privacy policy that would protect you, and no law regulates what people can do with the information once it's turned over. And that doesn't even reach the issue of how such a privacy-invasive tool could be developed and implemented in printers without the public becoming aware of it in the first place. With nothing on the books, we lack tools to stop the privacy and anonymity violations this technology enables. For this reason, EFF is gathering information about what printers are revealing and how - a necessary precursor to any legal challenge or new legislation to protect your privacy. And we could use your help. In the preliminary research paper linked below, we explain what we've observed so far, briefly explore the privacy implications, and ask you to print and send us test sheets from your color laser printer and/or a color laser printer at your local print shop. That way, we can watch the watchers and ensure that your privacy isn't compromised in ways that harm your fundamental constitutional rights. In addition to documenting what printers are revealing, EFF is filing a Freedom of Information Act (FOIA) request, and we will keep you updated on what we discover. In the meantime, we urge you to participate in this research project and pass the word along. Thank you for your support! EFF paper: "Investigating Machine Identification Code Technology in Color Laser Printers": <http://www.eff.org/Privacy/printers/wp.php> Directions for printing test sheets: <http://www.eff.org/Privacy/printers/wp.php#testsheets> PC World: "Government Uses Color Laser Printer Technology to Track Documents": <http://www.pcworld.com/news/article/0,aid,118664,00.asp> ACLU: "FBI Is Keeping Documents on ACLU and Other Peaceful Groups": <http://www.aclu.org/SafeandFree/SafeandFree.cfm?ID=18784&c=206>

1 0

Re: RICHED20: EM_SETZOOM / EM_GETZOOM implementation
by Dimi Paun July 22, 2005

July 22, 2005

From: "Phil Krylov" <phil(a)newstar.rinet.ru> > Added EM_GETZOOM and EM_SETZOOM RichEdit message handlers. > + case EM_GETZOOM: > + if (!wParam || !lParam) > + return FALSE; > + *(int *)wParam = editor->nZoomNumerator; > + *(int *)lParam = editor->nZoomDenominator; > + return TRUE; I don't know what Windows does, but it may also do: + case EM_GETZOOM: + if (wParam) *(int *)wParam = editor->nZoomNumerator; + if (lParam) *(int *)lParam = editor->nZoomDenominator; + return TRUE; Have you checked? -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

2 1

Re: Fix the ldap_search_sA/W prototypes
by Hans Leidekker July 22, 2005

July 22, 2005

On Friday 22 July 2005 19:34, Francois Gouget wrote: @ cdecl ldap_search_s(ptr str long str ptr long) ldap_search_sA -@ cdecl ldap_search_sA(ptr str long str ptr long) -@ cdecl ldap_search_sW(ptr wstr long wstr ptr long) +@ cdecl ldap_search_sA(ptr str long str ptr long ptr) +@ cdecl ldap_search_sW(ptr wstr long wstr ptr long ptr) ldap_search_s also needs the extra argument. -Hans

1 0

Re: [wined3d] drawprint tidyup initilization of strided data.
by Dimi Paun July 22, 2005

July 22, 2005

> +#define SET_STRIDED (_usage, _name) \ > +case _usage: \ > +strided->u.s._name.lpData = data; \ > +strided->u.s._name.dwType = element->Type; \ > +strided->u.s._name.dwStride = stride; \ > +break; > + > +#define SET_STRIDED_(_usage, _name) \ > +case _usage: \ > +strided->u.s._name.lpData = data; \ > +strided->u.s._name.dwType = element->Type; \ > +strided->u.s._name.dwStride = stride; \ This is pretty ugly: the resulting code doesn't look like C. In fact, it looks rather magical.For example, why pass in _usage as a param to the macro, just to get rid of the case _usage: which you actually want outside the macro for readability. Also, accessing the magic strided, data, element, stride directly is very weird, and problematic. The casual user wouldn't know what hit him :) I say let it be as is. If you really want the macro, something like this would be better: +#define SET_STRIDED_(_strided, _name, _data, _element, _stride) \ +_strided->u.s._name.lpData = _data; \ +_strided->u.s._name.dwType = _element->Type; \ +_strided->u.s._name.dwStride = _stride; -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

3 4