October 2006 - Wine-Devel - list.winehq.org

Re: mscoree: Invoke installed win32 mono runtime or exec mono nativefor .NET executables (try 2)
by Dmitry Timoshkov Oct. 9, 2006

Oct. 9, 2006

"Paul Chitescu" <paulc(a)voip.null.ro> wrote: > --- ./dlls/mscoree/mscoree_main.c.orig 2006-10-06 21:38:15.000000000 +0300 > +++ ./dlls/mscoree/mscoree_main.c 2006-10-08 16:11:47.000000000 +0300 > @@ -19,15 +19,104 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > -#include <stdarg.h> > +#define WIN32_LEAN_AND_MEAN > + > +#include "config.h" > +#include "wine/port.h" > +#include "wine/library.h" > +#include "wine/debug.h" WIN32_LEAN_AND_MEAN is used only by windows.h to omit some optional includes. Since inclusion of windows.h is forbidden in Wine DLLs defining WIN32_LEAN_AND_MEAN is not needed. -- Dmitry.

2 1

Re: [PATCH 1/5] lz32/tests: Test more last errors set by LZOpenFile[AW].
by Vitaliy Margolen Oct. 9, 2006

Oct. 9, 2006

Saulius Krasuckas wrote: > (Headers in this series of patches was slightly edited by hand due to lack > of internet connection and newer git version. Don't be surprised for > inconsistencies and just drop if that was the case) > > --- > > dlls/lz32/tests/lzexpand_main.c | 76 ++++++++++++++++++++++++++++++++++++++- > 1 files changed, 74 insertions(+), 2 deletions(-) > > 484c0e401dc09dd89fffb55da7f34599638bb1cd > diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c > index eead144..17c2757 100644 > --- a/dlls/lz32/tests/lzexpand_main.c > +++ b/dlls/lz32/tests/lzexpand_main.c > @@ -131,6 +131,7 @@ static void test_LZOpenFileA_existing_co > memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); > memset(&test, 0xA5, sizeof(test)); > full_file_path_name_in_a_CWD(filename_, expected, FALSE); > + SetLastError(0xfaceabee); Please use the common accepted and agreed on 0xdeadbeef. As it is used in all the other tests. > /* d, using underscore-terminated file name. */ > file = LZOpenFileA(_terminated, &test, OF_EXIST); > ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n"); > + ok(GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_BAD_PATHNAME, > + "GetLastError() returns %ld\n", GetLastError()); This doesn't look right. It either fails or it doesn't. You can't have both. Or this test is nor correct and should be removed. Vitaliy

3 5

grr. anti-unix fud in newspaper...
by Dan Kegel Oct. 9, 2006

Oct. 9, 2006

This morning in the LA Times, the business section had a big article on Airbus' woes, and blamed it on the CAD software: http://www.latimes.com/business/la-fi-airbus9oct09,1,4119560.story?coll=la-… "In designing the plane, German engineers in Hamburg used older versions of design software based on the Unix operating system while their counterparts in Toulouse ran a newer Windows software." This drive-by blaming of the operating system (which might be read by some as "unix is so crappy it can't run the latest cad software") I found less misleading details online at http://aecnews.com/articles/2035.aspx which said Airbus foolishly used Catia v4 in some locations and Catia v5 at others even though their file formats are incompatible, and didn't invest in conversion software. http://www-306.ibm.com/software/applications/plm/catiav5/sysreq/ shows that Catia v5 is available for Unix as well as Windows. So the whole unix vs. windows thing in the LA Times is a canard. The reporter who wrote the story often reports on aerospace stories, but lacks enough software knowledge to be able to filter out inaccurate info from his sources. C'est la vie. - Dan

1 0

dsound.dll, dlls/dsound/mixer.c -- DSOUND_MixerVol() optimization
by baggett.patrick＠figglesoftware.com Oct. 9, 2006

Oct. 9, 2006

I was reading through dlls/dsound/mixer.c and I came across the function DSOUND_MixerVol() that really stood out. The purpose of the code it to apply a volume amplification by multiplying the channel data by the amplification factor. What *really* struck me was the parallelism that could be achieved using SIMD instructions (I am the author of the project SIMDx86 on Sourceforge): for (i = 0; i < len; i += 2) { *bps = (*bps * dsb->cvolpan.dwTotalLeftAmpFactor) >> 16; bps++; } The segment below it for stereo sound not shown but is basically the same thing. This could be done extremely easily using MMX, which could process 32 samples/loop interation, or SSE2 which could process 64 samples/loop (actually, more, but cache lines aren't that big yet). With the addition of some aggressive prefetching, there could be a signifigant speed up. Now, here is the question: What is WINE's policy toward: 1) Optimizations, rather than bugfix patches. 2) Inline assembly language (allowed, disallowed)? Inline assembly language for the purpose of optimization (instead of, say, fixing up stack)? 3) Function pointers to select optimal code paths? 4) Detecting/using enhanced x86 instruction sets (e.g. MMX/SSE2)? Is there still an effort to make WINE work with non-x86? (DarWINE or something)?

6 6

Still can't even compile Wine at PowerPC-based Linux-box.
by Peter Lemenkov Oct. 9, 2006

Oct. 9, 2006

Hello, All! The last wine version which at least compiles at my PowerPC fine is 0.9.17. Since then I can't even compile Wine. It fails with the next message ==================================== ../../tools/widl/widl -I. -I. -I../../include -I../../include -D__WINESRC__ -D_SHDOCVW_ -t -T shdocvw_v1.tlb shdocvw_v1.idl warning: create_msft_typeinfo: ignoring attr 46 warning: create_msft_typeinfo: ignoring attr 46 warning: add_func_desc: ignoring attr 5 error: encode_type: VT_USERDEFINED - unhandled type 17 make[2]: *** [shdocvw_v1.tlb] Error 2 make[2]: Leaving directory `/home/petro/work/projects/wine/dlls/shdocvw' make[1]: *** [shdocvw] Error 2 make[1]: Leaving directory `/home/petro/work/projects/wine/dlls' make: *** [dlls] Error 2 ==================================== I have no clue how to debug this, so I would ask you: how can I fix this strange situation? -- With best regards!

3 2

Re: [TRY4 4/8] gdi32: Generate the [HKLM\Software\Microsoft\WindowsNT\CurrentVersion\GRE_Initialize].
by Dmitry Timoshkov Oct. 9, 2006

Oct. 9, 2006

"Byeong-Sik Jeon" <wjsqudtlr(a)gmail.com> wrote: > + /* @@ Wine registry key: HKLM\Software\Microsoft\Windows NT\CurrentVersion\GRE_Initialize */ > + if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, gre_initialize_reg_key, > + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL) == ERROR_SUCCESS) '@@ Wine registry key' should be used to mark Wine internal registry keys, which is not the case here. -- Dmitry.

1 0

re: windows web server app fails to send more than 11680 bytes !?
by Dan Kegel Oct. 9, 2006

Oct. 9, 2006

idc wrote: >I'm testing a windows app I'd very much like to run under Wine (using v0.9.22)... >It's not yet working under Wine, fails to serve larger files... >For example, the app tries to write 25017 bytes to the socket, but the >socket only allows 11680 bytes at a time, and the TCP stack fragments >this in 8 packets of 1460 bytes, presumably because it only has 8 >buffers reserved. So far so good. >We see them being sent on the Ethernet and the ACK's are coming in, but >after these 8 packets there should be a signal to trigger the OnSend >function of the app so it can send the next part of data, but this never >happens... >If it really gets interesting, I can ask the developer for a more detailed report, >including the Ethereal log snippet, in case somebody wants to actually >look into it. First I'd like to find out if this is the right place, or if I should >"bury" it into bugzilla. It's fine to bring it up here, but you should definitely create a bug report in bugzilla, including a small test program that reproduces the problem, with source if possible. (That doesn't bury it; rather, it exposes it to the blinding light of our crack debugging team :-) - Dan

1 0

Probing videoram using ATIFGLEXTENSION
by Fabian Bieler Oct. 8, 2006

Oct. 8, 2006

Hello! I wrote a patch to query the amount of videoram via the NV-CONTROL and ATIFGLEXTENSION Xserver extensions. The problem is: I have no access to a box with an ATI adapter to test it. Therefore, I'm sending the patch to wine-devel rather than to wine-patches. Perhaps somebody with an ATI card could test the patch. Alternatively, I attached a small test program which just prints the amount of videoram to stdout and uses the same code as the patch. Fabian >From c1b2f368aa4580faef68cc0eaff0c5387e3eb8bf Mon Sep 17 00:00:00 2001 From: Fabian Bieler <der.fabe(a)gmx.net> Date: Fri, 6 Oct 2006 00:07:00 +0200 Subject: [PATCH] use NV-CONTROL and ATIFGLEXTENSION Xserver extensions to query amount of videoram --- dlls/wined3d/device.c | 26 +--- dlls/wined3d/directx.c | 36 +++++ dlls/wined3d/wined3d_private.h | 1 dlls/winex11.drv/Makefile.in | 1 dlls/winex11.drv/init.c | 7 + dlls/winex11.drv/opengl.c | 17 +++ dlls/winex11.drv/vendor_specific.c | 242 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 6 + 8 files changed, 312 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 82c8044..3358111 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1061,7 +1061,7 @@ static HRESULT WINAPI IWineD3DDeviceImp /** TODO: change this into a texture transform matrix so that it's processed in hardware **/ - TRACE("Pool %d %d %d %d\n",Pool, WINED3DPOOL_DEFAULT, WINED3DPOOL_MANAGED, WINED3DPOOL_SYSTEMMEM); + TRACE("Pool %d %d %d %d",Pool, WINED3DPOOL_DEFAULT, WINED3DPOOL_MANAGED, WINED3DPOOL_SYSTEMMEM); /** Quick lockable sanity check TODO: remove this after surfaces, usage and locablility have been debugged properly * this function is too deap to need to care about things like this. @@ -2305,24 +2305,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl } static UINT WINAPI IWineD3DDeviceImpl_GetAvailableTextureMem(IWineD3DDevice *iface) { - /** NOTE: There's a probably a hack-around for this one by putting as many pbuffers, VBO's (or whatever) - * Into the video ram as possible and seeing how many fit - * you can also get the correct initial value from nvidia and ATI's driver via X - * texture memory is video memory + AGP memory - *******************/ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - static BOOL showfixmes = TRUE; - if (showfixmes) { - FIXME("(%p) : stub, simulating %dMB for now, returning %dMB left\n", This, - (wined3d_settings.emulated_textureram/(1024*1024)), - ((wined3d_settings.emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); - showfixmes = FALSE; - } - TRACE("(%p) : simulating %dMB, returning %dMB left\n", This, - (wined3d_settings.emulated_textureram/(1024*1024)), - ((wined3d_settings.emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); - /* return simulated texture memory left */ - return (wined3d_settings.emulated_textureram - wineD3DGlobalStatistics->glsurfaceram); + + TRACE("(%p) : emulating %dMib, returning %dMib\n", This, (This->videoRam/1024), + ((This->videoRam*1024 - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); + /* videomemory is simulated videomemory + AGP memory left */ + return (This->videoRam*1024 - wineD3DGlobalStatistics->glsurfaceram); } @@ -5909,7 +5897,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DStateBlockImpl *object; HRESULT temp_result; - TRACE("(%p)\n", This); + TRACE("(%p)", This); if (This->isRecordingState) { return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 33b4fb5..4205986 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -42,9 +42,17 @@ #define GLINFO_LOCATION This->gl_info #define X11DRV_ESCAPE 6789 enum x11drv_escape_codes { - X11DRV_GET_DISPLAY, /* get X11 display for a DC */ - X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_GET_FONT, /* get current X font for a DC */ + X11DRV_GET_DISPLAY, /* get X11 display for a DC */ + X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ + X11DRV_GET_FONT, /* get current X font for a DC */ + X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ + X11DRV_START_EXPOSURES, /* start graphics exposures */ + X11DRV_END_EXPOSURES, /* end graphics exposures */ + X11DRV_GET_DCE, /* get the DCE pointer */ + X11DRV_SET_DCE, /* set the DCE pointer */ + X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ + X11DRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ + X11DRV_GET_VIDEORAM /* get videoram in kBytes */ }; /* retrieve the X display to use on a given DC */ @@ -158,6 +166,25 @@ static void WineD3D_ReleaseFakeGLContext } } +/* returns videoRam in kBytes */ +static unsigned int IWineD3DImpl_GetVideoRam( HDC hdc ) +{ + unsigned int videoRam; + enum x11drv_escape_codes escape = X11DRV_GET_VIDEORAM; + + if (ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, + sizeof(videoRam), (LPSTR)&videoRam )) + { + TRACE("Using %u kByte\n", videoRam); + return videoRam; + } + else + { + TRACE("Using default of %u kByte\n", wined3d_settings.emulated_textureram); + return wined3d_settings.emulated_textureram; + } +} + /********************************************************** * IUnknown parts follows **********************************************************/ @@ -1589,7 +1616,7 @@ static HRESULT WINAPI IWineD3DImpl_Check static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat) { IWineD3DImpl *This = (IWineD3DImpl *)iface; - TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%u,%s,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s))\n", + TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%u,%s,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s)) ", This, Adapter, DeviceType, debug_d3ddevicetype(DeviceType), @@ -2396,6 +2423,7 @@ static HRESULT WINAPI IWineD3DImpl_Crea /* Initialize other useful values */ object->adapterNo = Adapter; object->devType = DeviceType; + object->videoRam = IWineD3DImpl_GetVideoRam(GetDC(0)); TRACE("(%p) : Creating stateblock\n", This); /* Creating the startup stateBlock - Note Special Case: 0 => Don't fill in yet! */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b859ade..8563bac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -527,6 +527,7 @@ #define NEEDS_DI WINED3DDEVICE_CREATION_PARAMETERS createParms; UINT adapterNo; D3DDEVTYPE devType; + UINT videoRam; /* emulated videoram in kByte */ IWineD3DSwapChain **swapchains; uint NumberOfSwapChains; diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 200bec6..cc8439a 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -32,6 +32,7 @@ C_SRCS = \ scroll.c \ settings.c \ text.c \ + vendor_specific.c \ window.c \ winpos.c \ wintab.c \ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b3ee171..987826c 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -422,6 +422,13 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph } return FALSE; break; + case X11DRV_GET_VIDEORAM: + if (out_count >= sizeof(unsigned int)) + { + *(unsigned int *)out_data = get_videoram(gdi_display); + return TRUE; + } + break; } } break; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 64b1166..f1f623b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2648,6 +2648,16 @@ BOOL destroy_glxpixmap(XID glxpixmap) return TRUE; } +const char *get_glversion() +{ + if (!has_opengl()) { + ERR("No libGL on this box - disabling OpenGL support !\n"); + return NULL; + } + + return WineGLInfo.glVersion; +} + /** * X11DRV_SwapBuffers * @@ -2863,4 +2873,11 @@ BOOL destroy_glxpixmap(XID glxpixmap) return FALSE; } +const char *get_glversion() +{ + ERR_(opengl)("No OpenGL support compiled in.\n"); + return NULL; +} + + #endif /* defined(HAVE_OPENGL) */ diff --git a/dlls/winex11.drv/vendor_specific.c b/dlls/winex11.drv/vendor_specific.c new file mode 100644 index 0000000..350c659 --- /dev/null +++ b/dlls/winex11.drv/vendor_specific.c @@ -0,0 +1,242 @@ +/* + * X11DRV vendor specific Xserver extensions + * + * Copyright 2006 Fabian Bieler + * + * 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include "x11drv.h" +#include "wine/debug.h" + +#include <X11/Xlibint.h> + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +/* from "NVCtrl.h" */ +#define NV_CTRL_VIDEO_RAM 6 + +/* from "nv_control.h" */ +#define NV_CONTROL_NAME "NV-CONTROL" +#define NV_CONTROL_EVENTS 1 +typedef struct { + CARD8 reqType; + CARD8 nvReqType; + CARD16 length B16; + CARD32 screen B32; + CARD32 display_mask B32; + CARD32 attribute B32; +} xnvCtrlQueryAttributeReq; +#define sz_xnvCtrlQueryAttributeReq sizeof(xnvCtrlQueryAttributeReq) +typedef struct { + BYTE type; + BYTE pad0; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 flags B32; + INT32 value B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; + CARD32 pad7 B32; +} xnvCtrlQueryAttributeReply; +//#define sz_xnvCtrlQueryAttributeReply 32 +#define X_nvCtrlQueryAttribute 2 + +/* from "R200_extensions.h" "atiddx_extensions.h" respectively */ +#define ATIFGL_EXTENSION_NAME "ATIFGLEXTENSION" +#define ATIFGL_EXTENSION_EVENTS 0 +typedef struct _FGLGetDriverData { + CARD8 reqType; + CARD8 fireglReqType; + CARD16 length B16; + CARD32 screen B32; + CARD16 size B16; + CARD16 pad1; +} xFGLGetDriverDataReq; +#define sz_xFGLGetDriverDataReq sizeof(xFGLGetDriverDataReq) +typedef union { +struct { + BYTE type; + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD8 majorVersion; + CARD8 minorVersion; + CARD8 patchlevel B16; + CARD8 BIOSVersionMajor; + CARD8 BIOSVersionMinor; + CARD8 HasSecondary; + CARD16 pad3 B16; + CARD16 usBoardType B16; + CARD16 usChipType B16; + CARD16 usVideoRam B16; + CARD8 ATiRevID; + CARD8 AGPTransferMode; + CARD32 AGPCapPtr; + CARD32 AGPStatus; + CARD32 AGPCommand; + CARD32 ulGamma1 B32; + CARD32 ulGamma2 B32; + CARD32 ulDriverType B32; + CARD32 ulDesktopSetup B32; + CARD32 ulPrimary B32; +} v0; +struct { + BYTE type; + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD8 majorVersion; + CARD8 minorVersion; + CARD8 patchlevel B16; + CARD8 BIOSVersionMajor; + CARD8 BIOSVersionMinor; + CARD8 HasSecondary; + CARD16 pad3 B16; + CARD16 usBoardType B16; + CARD16 usChipType B16; + CARD16 usVideoRam B16; + CARD8 sATiRevID[17]; + CARD8 AGPTransferMode; + CARD32 AGPCapPtr; + CARD32 AGPStatus; + CARD32 AGPCommand; + CARD32 ulGamma1 B32; + CARD32 ulGamma2 B32; + CARD32 ulDriverType B32; + CARD32 ulDesktopSetup B32; + CARD32 ulPrimary B32; +} v3_7; +struct { + BYTE type; + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD8 majorVersion; + CARD8 minorVersion; + CARD8 patchlevel B16; + CARD8 BIOSVersionMajor; + CARD8 BIOSVersionMinor; + CARD8 HasSecondary; + CARD16 pad3 B16; + CARD16 usBoardType B16; + CARD16 usChipType B16; + CARD32 ulVideoRam B32; + CARD8 sATiRevID[17]; + CARD8 AGPTransferMode; + CARD32 AGPCapPtr; + CARD32 AGPStatus; + CARD32 AGPCommand; + CARD32 ulGamma1 B32; + CARD32 ulGamma2 B32; + CARD32 ulDriverType B32; + CARD32 ulDesktopSetup B32; + CARD32 ulPrimary B32; + CARD8 sBoardName[96]; +} v8_24; +} xFGLGetDriverDataReply; +#define X_FGLGetDriverData 0 + +unsigned int get_videoram(Display *dpy) +{ + int major_opcode, first_event, first_error; + unsigned int vram=0; + + TRACE("Probing videoram...\n"); + + /* Try the NV-CONTROL x-server extension: */ + if(XQueryExtension(dpy, NV_CONTROL_NAME, &major_opcode, &first_event, &first_error)) { + xnvCtrlQueryAttributeReply rep; + xnvCtrlQueryAttributeReq *req; + + wine_tsx11_lock(); + GetReq(nvCtrlQueryAttribute, req); + req->reqType = major_opcode; + req->nvReqType = X_nvCtrlQueryAttribute; + req->screen = DefaultScreen(dpy); + req->display_mask = 0; + req->attribute = NV_CTRL_VIDEO_RAM; + if(_XReply(dpy, (xReply *)&rep, 0, xTrue)) { + if(rep.flags) { + vram=rep.value; + TRACE("Got %u kByte from NV-CONTROL\n", vram); + } + } + wine_tsx11_unlock(); + SyncHandle(); + } + + /* Try the ATIFGLEXTENSION x-server extension: */ + if(XQueryExtension(dpy, ATIFGL_EXTENSION_NAME, &major_opcode, &first_event, &first_error)) { + xFGLGetDriverDataReq *req; + xFGLGetDriverDataReply rep; + + char *v; + unsigned short version; + int size; + + /* This extension was altered a few times, so we need to get the driver version. + * ATI OpenGL version strings are of the form + * "<OGLmajor>.<OGLminor>.<OGLpatchlevel> ([XFree86-version-]<DRIVERmajor>.<DRIVERminor>.<DRIVERpatchlevel>)" */ + v=(char *)get_glversion(); + v=strchr(v, '('); + if(!v) { + ERR("Failed to parse ATI OpenGL version string '%s'", get_glversion()); + } + else + { + v=max(strchr(v, '-'),v); + if(*v)v++; + version=strtol(v, &v, 10)<<8; + if(*v)v++; + version+=strtol(v, NULL, 10); + if(version<0x0307) + size=(sizeof(rep.v0) - 32) >> 2; + else if(version<0x0818) + size=(sizeof(rep.v3_7) - 32) >> 2; + else + size=(sizeof(rep.v8_24) - 32) >> 2; + TRACE("Found ATI driver version %hhu.%hhu\n", (version&0xff00)>>8, version&0x00ff); + + wine_tsx11_lock(); + GetReq(FGLGetDriverData, req); + req->reqType = major_opcode; + req->fireglReqType = X_FGLGetDriverData; + req->screen = DefaultScreen(dpy); + if(_XReply(dpy, (xReply *)&rep, size, xTrue)) + { + if(version<0x0307) { + if(rep.v0.usVideoRam==0x200 || rep.v0.usVideoRam==0x400 || rep.v0.usVideoRam==0x800 || rep.v0.usVideoRam==0x1000) + vram=rep.v0.usVideoRam<<6; + } + else if(version<0x0818) { + if(rep.v3_7.usVideoRam==0x200 || rep.v3_7.usVideoRam==0x400 || rep.v3_7.usVideoRam==0x800 || rep.v3_7.usVideoRam==0x1000) + vram=rep.v3_7.usVideoRam<<6; + } + else { + vram=rep.v8_24.ulVideoRam; + } + } + TRACE("Got %u kByte from ATIFGLEXTENSION\n", vram); + wine_tsx11_unlock(); + SyncHandle(); + } + } + + return vram; +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a4eb516..5fb918a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -271,6 +271,9 @@ extern void X11DRV_XRender_UpdateDrawabl extern XVisualInfo *X11DRV_setup_opengl_visual(Display *display); extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); extern BOOL destroy_glxpixmap(XID glxpixmap); +extern const char *get_glversion(); + +extern unsigned int get_videoram(Display *dpy); /* XIM support */ extern XIC X11DRV_CreateIC(XIM xim, Display *display, Window win); @@ -474,7 +477,8 @@ enum x11drv_escape_codes X11DRV_GET_DCE, /* get the DCE pointer */ X11DRV_SET_DCE, /* set the DCE pointer */ X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ - X11DRV_SYNC_PIXMAP /* sync the dibsection to its pixmap */ + X11DRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ + X11DRV_GET_VIDEORAM /* get videoram in kBytes */ }; struct x11drv_escape_set_drawable -- 1.4.1.1

3 3

Re: [RPCRT4] TCP server support (2/2) accept TCP connections
by Robert Shearman Oct. 8, 2006

Oct. 8, 2006

Damjan Jovanovic wrote: > Adds support for RPC TCP servers using native (as opposed to winsock) > sockets. Probably closes bug 2416. > > Is this any better, Robert? The design looks good to me. I'll work on the provider infrastructure so that the extra thread isn't needed in the TCP case. I think you'll need to rebase against current git as I had a patch committed recently which will have probably caused a conflict in your patch. There are two further minor points with the patch, which I've highlighted below: > Changelog: > * added support for RPC TCP servers > > --- a/AUTHORS 2006-07-10 18:01:06.000000000 +0200 > +++ b/AUTHORS 2006-10-08 11:34:59.000000000 +0200 > @@ -873,3 +873,4 @@ > Rizsanyi Zsolt > Per Ã…ngstrÃ¶m > Peter Ã…strand > +Damjan Jovanovic > This list is sorted by surname, but more importantly is regenerated by Alexandre using a script every 6 months or so. I think you'd do better crediting yourself in the copyright lines in rpc_transport.c. > + thread = CreateThread(NULL, 0, rpcrt4_tcp_poll_thread, tcpc, 0, NULL); > + if (thread == NULL) > + { > + WARN("creating server polling thread failed, error %lu\n", > + GetLastError()); > + tcpc->sock = -1; > + } > + > + done: > + if (thread == NULL) /* ie. we failed somewhere */ > + { > + close(sock); > + if (tcpc->onEventAvailable != NULL) > + { > + CloseHandle(tcpc->onEventAvailable); > + tcpc->onEventAvailable = NULL; > + } > + if (tcpc->onEventHandled != NULL) > + { > + CloseHandle(tcpc->onEventHandled); > + tcpc->onEventHandled = NULL; > + } > + continue; > + } > + } > You leak the thread handle. -- Rob Shearman

1 0

Force a Display/Input-Driver? (Re: [PATCH 2/5] dinput: Use x11_[acquire|unacquire]_mouse to stop mouse from escaping in exclusive mode.)
by Detlef Riekenberg Oct. 8, 2006

Oct. 8, 2006

On Do, 2006-10-05 at 08:09 -0600, Vitaliy Margolen wrote: > diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c > + if ((mod = GetModuleHandleA( "winex11.drv" ))) When we force wine to use a specific Display/Input-Driver, the driver-selection by reading the Registry is unneeded and should be removed. IMHO, the clean way is to use the dynamic Driver Name, build from the Registry (preferable by a common used wine specific Function in a dll). > + = (void*) GetProcAddress(mod, "wine_tsx11_acquire_mouse"); The exported name is also not generic. And we have both issues already: $ grep -i --line-number "winex11.drv" dlls/*/* dlls/imm32/imm.c:143: x11drv = GetModuleHandleA("winex11.drv"); dlls/opengl32/wgl.c:637: HMODULE mod = GetModuleHandleA( "winex11.drv" ); dlls/wined3d/wined3d_main.c:113: mod = GetModuleHandleA( "winex11.drv" ); dlls/wintab32/wintab32.c:77: hx11drv = GetModuleHandleA("winex11.drv"); Exported Name: dlls/wined3d/wined3d_main.c:116: ... = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); -- By by ... Detlef

2 2