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

Stefan Doesinger : wined3d: Implement texldl in ARB.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: ae600fe0c87c41d9a4d0f58686ec4383f2fb204d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae600fe0c87c41d9a4d0f5868… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Fri May 29 17:24:55 2009 +0200 wined3d: Implement texldl in ARB. --- dlls/wined3d/arb_program_shader.c | 33 ++++++++++++++++++++++++++++++--- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3bb603b..1a9781e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -951,6 +951,12 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD shader_addline(buffer, "TXD %s, %s, %s, %s, texture[%u], %s;\n", dst_str, coord_reg, dsx, dsy, sampler_idx, tex_type); } + else if(flags & TEX_LOD) + { + if(flags & TEX_PROJ) FIXME("Projected texture sampling with explicit lod\n"); + if(flags & TEX_BIAS) FIXME("Biased texture sampling with explicit lod\n"); + shader_addline(buffer, "TXL %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + } else if (flags & TEX_BIAS) { /* Shouldn't be possible, but let's check for it */ @@ -2399,6 +2405,22 @@ static void shader_hw_texldd(const struct wined3d_shader_instruction *ins) shader_hw_sample(ins, sampler_idx, reg_dest, reg_src[0], flags, reg_src[1], reg_src[2]); } +static void shader_hw_texldl(const struct wined3d_shader_instruction *ins) +{ + DWORD sampler_idx = ins->src[1].reg.idx; + char reg_dest[40]; + char reg_coord[40]; + DWORD flags = TEX_LOD; + + shader_arb_get_dst_param(ins, &ins->dst[0], reg_dest); + shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord); + + if (ins->flags & WINED3DSI_TEXLD_PROJECT) flags |= TEX_PROJ; + if (ins->flags & WINED3DSI_TEXLD_BIAS) flags |= TEX_BIAS; + + shader_hw_sample(ins, sampler_idx, reg_dest, reg_coord, flags, NULL, NULL); +} + static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { GLuint program_id = 0; @@ -2603,7 +2625,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, * Testing shows no performance difference between OPTION NV_fragment_program2 and NV_fragment_program. * So enable the best we can get. */ - if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd) + if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd || + reg_maps->usestexldl) { want_nv_prog = TRUE; } @@ -2810,7 +2833,11 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Always enable the NV extension if available. Unlike fragment shaders, there is no * mesurable performance penalty, and we can always make use of it for clipplanes. */ - if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) { + if(GL_SUPPORT(NV_VERTEX_PROGRAM3)) { + shader_addline(buffer, "OPTION NV_vertex_program3;\n"); + priv_ctx.target_version = NV3; + shader_addline(buffer, "ADDRESS aL;\n"); + } else if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) { shader_addline(buffer, "OPTION NV_vertex_program2;\n"); priv_ctx.target_version = NV2; shader_addline(buffer, "ADDRESS aL;\n"); @@ -3492,7 +3519,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXDP3TEX */ pshader_hw_texdp3tex, /* WINED3DSIH_TEXKILL */ pshader_hw_texkill, /* WINED3DSIH_TEXLDD */ shader_hw_texldd, - /* WINED3DSIH_TEXLDL */ NULL, + /* WINED3DSIH_TEXLDL */ shader_hw_texldl, /* WINED3DSIH_TEXM3x2DEPTH */ pshader_hw_texm3x2depth, /* WINED3DSIH_TEXM3x2PAD */ pshader_hw_texm3x2pad, /* WINED3DSIH_TEXM3x2TEX */ pshader_hw_texm3x2tex, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 49eee0b..0d253a4 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -692,6 +692,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usestexldd = 1; } + else if(ins.handler_idx == WINED3DSIH_TEXLDL) + { + reg_maps->usestexldl = 1; + } else if(ins.handler_idx == WINED3DSIH_MOVA) { reg_maps->usesmova = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e089e2..b7aa84d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,7 +629,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova; + char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova, usestexldl; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

1 0

Aric Stewart : msctf: Implement ITfCompartmentMgr::EnumCompartments.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 6b2f56a0a77ce466cbd8b210d50d5d560009e0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2f56a0a77ce466cbd8b210d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 17:01:37 2009 +0900 msctf: Implement ITfCompartmentMgr::EnumCompartments. --- dlls/msctf/compartmentmgr.c | 157 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 2e6c798..5342568 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -59,6 +59,15 @@ typedef struct tagCompartmentMgr { struct list values; } CompartmentMgr; +typedef struct tagCompartmentEnumGuid { + const IEnumGUIDVtbl *Vtbl; + LONG refCount; + + struct list *values; + struct list *cursor; +} CompartmentEnumGuid; + +static HRESULT CompartmentEnumGuid_Constructor(struct list* values, IEnumGUID **ppOut); HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *iface) { @@ -166,8 +175,10 @@ static HRESULT WINAPI CompartmentMgr_EnumCompartments(ITfCompartmentMgr *iface, IEnumGUID **ppEnum) { CompartmentMgr *This = (CompartmentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,ppEnum); + if (!ppEnum) + return E_INVALIDARG; + return CompartmentEnumGuid_Constructor(&This->values, ppEnum); } static const ITfCompartmentMgrVtbl CompartmentMgr_CompartmentMgrVtbl = @@ -214,3 +225,145 @@ HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown ** return hr; } } + +/************************************************** + * IEnumGUID implementaion for ITfCompartmentMgr::EnumCompartments + **************************************************/ +static void CompartmentEnumGuid_Destructor(CompartmentEnumGuid *This) +{ + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI CompartmentEnumGuid_QueryInterface(IEnumGUID *iface, REFIID iid, LPVOID *ppvOut) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumGUID)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI CompartmentEnumGuid_AddRef(IEnumGUID *iface) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid*)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI CompartmentEnumGuid_Release(IEnumGUID *iface) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + CompartmentEnumGuid_Destructor(This); + return ret; +} + +/***************************************************** + * IEnumGuid functions + *****************************************************/ +static HRESULT WINAPI CompartmentEnumGuid_Next( LPENUMGUID iface, + ULONG celt, GUID *rgelt, ULONG *pceltFetched) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + ULONG fetched = 0; + + TRACE("(%p)\n",This); + + if (rgelt == NULL) return E_POINTER; + + while (fetched < celt && This->cursor) + { + CompartmentValue* value = LIST_ENTRY(This->cursor,CompartmentValue,entry); + if (!value) + break; + + This->cursor = list_next(This->values,This->cursor); + *rgelt = value->guid; + + ++fetched; + ++rgelt; + } + + if (pceltFetched) *pceltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI CompartmentEnumGuid_Skip( LPENUMGUID iface, ULONG celt) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + TRACE("(%p)\n",This); + + This->cursor = list_next(This->values,This->cursor); + return S_OK; +} + +static HRESULT WINAPI CompartmentEnumGuid_Reset( LPENUMGUID iface) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + TRACE("(%p)\n",This); + This->cursor = list_head(This->values); + return S_OK; +} + +static HRESULT WINAPI CompartmentEnumGuid_Clone( LPENUMGUID iface, + IEnumGUID **ppenum) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + HRESULT res; + + TRACE("(%p)\n",This); + + if (ppenum == NULL) return E_POINTER; + + res = CompartmentEnumGuid_Constructor(This->values, ppenum); + if (SUCCEEDED(res)) + { + CompartmentEnumGuid *new_This = (CompartmentEnumGuid *)*ppenum; + new_This->cursor = This->cursor; + } + return res; +} + +static const IEnumGUIDVtbl IEnumGUID_Vtbl ={ + CompartmentEnumGuid_QueryInterface, + CompartmentEnumGuid_AddRef, + CompartmentEnumGuid_Release, + + CompartmentEnumGuid_Next, + CompartmentEnumGuid_Skip, + CompartmentEnumGuid_Reset, + CompartmentEnumGuid_Clone +}; + +static HRESULT CompartmentEnumGuid_Constructor(struct list *values, IEnumGUID **ppOut) +{ + CompartmentEnumGuid *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CompartmentEnumGuid)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->Vtbl= &IEnumGUID_Vtbl; + This->refCount = 1; + + This->values = values; + This->cursor = list_head(values); + + TRACE("returning %p\n", This); + *ppOut = (IEnumGUID*)This; + return S_OK; +}

1 0

Henri Verbeet : wined3d: Fix a typo.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: dad6c311ec2c033815d549f0d1cf005e27661027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad6c311ec2c033815d549f0d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:19:49 2009 +0200 wined3d: Fix a typo. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6ab0443..eedc257 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2508,7 +2508,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } default: - ERR("Unsupported conversation type %d\n", convert); + ERR("Unsupported conversion type %#x.\n", convert); } return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Fall back to backbuffer offscreen rendering if FBOs are unavailable.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: fccb3d82fd5b05f0ece48e2c0547ca3357c12a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fccb3d82fd5b05f0ece48e2c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:17:09 2009 +0200 wined3d: Fall back to backbuffer offscreen rendering if FBOs are unavailable. Backbuffer appears to be a better choice than PBuffer at the moment, since PBuffer appears to be somewhat broken. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 05443fc..3354f7b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1031,8 +1031,8 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* We can only use ORM_FBO when the hardware supports it. */ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) { - WARN_(d3d_caps)("GL_EXT_framebuffer_object not supported, falling back to PBuffer offscreen rendering mode.\n"); - wined3d_settings.offscreen_rendering_mode = ORM_PBUFFER; + WARN_(d3d_caps)("GL_EXT_framebuffer_object not supported, falling back to backbuffer offscreen rendering mode.\n"); + wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; } /* MRTs are currently only supported when FBOs are used. */

1 0

Henri Verbeet : wined3d: Only initialize unused components of varyings that are read.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 2c009e4d874722c1a7b50b1c0ecf7a7eaa3e9002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c009e4d874722c1a7b50b1c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:19:51 2009 +0200 wined3d: Only initialize unused components of varyings that are read. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 846044f..e065296 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3423,7 +3423,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in * input varyings are assigned above, if the optimizer works properly. */ for(i = 0; i < in_count + 2; i++) { - if(set[i] != WINED3DSP_WRITEMASK_ALL) { + if (set[i] && set[i] != WINED3DSP_WRITEMASK_ALL) + { unsigned int size = 0; memset(reg_mask, 0, sizeof(reg_mask)); if(!(set[i] & WINED3DSP_WRITEMASK_0)) {

1 0

Francois Gouget : wineesd.drv: Initialize the stream name before using it.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: f7faba23094d7c26769e36f8d80ef357cbf11f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7faba23094d7c26769e36f8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 16 19:15:21 2009 +0200 wineesd.drv: Initialize the stream name before using it. --- dlls/wineesd.drv/audio.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index bb6aae0..4ce176f 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1176,11 +1176,15 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) out_rate = (int) wwo->waveFormat.Format.nSamplesPerSec; TRACE("esd output format = 0x%08x, rate = %d\n", out_format, out_rate); + wwo->stream_name = get_stream_name("out", wDevID); wwo->stream_fd = esd_play_stream(out_format, out_rate, NULL, wwo->stream_name); TRACE("wwo->stream_fd=%d\n", wwo->stream_fd); - if(wwo->stream_fd < 0) return MMSYSERR_ALLOCATED; + if(wwo->stream_fd < 0) + { + HeapFree(GetProcessHeap(), 0, wwo->stream_name); + return MMSYSERR_ALLOCATED; + } - wwo->stream_name = get_stream_name("out", wDevID); wwo->stream_id = 0; wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; @@ -1899,14 +1903,18 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) in_rate = (int) wwi->waveFormat.Format.nSamplesPerSec; TRACE("esd input format = 0x%08x, rate = %d\n", in_format, in_rate); + wwi->stream_name = get_stream_name("in", wDevID); #ifdef WID_USE_ESDMON wwi->stream_fd = esd_monitor_stream(in_format, in_rate, NULL, wwi->stream_name); #else wwi->stream_fd = esd_record_stream(in_format, in_rate, NULL, wwi->stream_name); #endif TRACE("wwi->stream_fd=%d\n",wwi->stream_fd); - if(wwi->stream_fd < 0) return MMSYSERR_ALLOCATED; - wwi->stream_name = get_stream_name("in", wDevID); + if(wwi->stream_fd < 0) + { + HeapFree(GetProcessHeap(), 0, wwi->stream_name); + return MMSYSERR_ALLOCATED; + } wwi->state = WINE_WS_STOPPED; if (wwi->lpQueuePtr) {

1 0

Francois Gouget : winweesd.drv: Make sure esd_all_info is always initialized and freed when needed.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 45311c6724ab5c46e928d90bfb59f3c763acb9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=45311c6724ab5c46e928d90bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 16 19:15:45 2009 +0200 winweesd.drv: Make sure esd_all_info is always initialized and freed when needed. --- dlls/wineesd.drv/audio.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 4ce176f..f198ace 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1416,6 +1416,7 @@ static esd_player_info_t* wod_get_player(WINE_WAVEOUT* wwo, esd_info_t** esd_all if (wwo->esd_fd < 0) { WARN("esd_open_sound() failed (%d)\n", errno); + *esd_all_info = NULL; return NULL; } } @@ -1468,7 +1469,8 @@ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) else ret = MMSYSERR_ERROR; - esd_free_all_info(esd_all_info); + if (esd_all_info) + esd_free_all_info(esd_all_info); return ret; } @@ -1493,7 +1495,8 @@ static DWORD wodSetVolume(WORD wDevID, DWORD dwParam) esd_info_t* esd_all_info; /* wod_get_player sets the stream_id as a side effect */ wod_get_player(wwo, &esd_all_info); - esd_free_all_info(esd_all_info); + if (esd_all_info) + esd_free_all_info(esd_all_info); } if (!wwo->stream_id) return MMSYSERR_ERROR;

1 0

Francois Gouget : wineesd.drv: Remove a redundant assignment.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: f6c7e48af19296b4f8b7c49f30c61b5664e9015a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c7e48af19296b4f8b7c49f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 16 19:15:54 2009 +0200 wineesd.drv: Remove a redundant assignment. --- dlls/wineesd.drv/audio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index f198ace..a69949c 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1466,8 +1466,6 @@ static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol) *lpdwVol = left + (right << 16); ret = MMSYSERR_NOERROR; } - else - ret = MMSYSERR_ERROR; if (esd_all_info) esd_free_all_info(esd_all_info);

1 0

Roderick Colenbrander : wgl: Get rid of glXQueryDrawable because officially it only works on GLXDrawables .
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 28a2646d21c5b16af974677f00ac02c678e08dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a2646d21c5b16af974677f0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Jun 16 23:49:12 2009 +0200 wgl: Get rid of glXQueryDrawable because officially it only works on GLXDrawables. Nvidia allows it to operate on a standard Window too but Mesa and AMD don't and this isn't needed according to the GLX specs. This prevents crashes when creating +wgl logs. --- dlls/winex11.drv/opengl.c | 41 ++++++++++++++--------------------------- 1 files changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f207a32..f1557b6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -146,6 +146,7 @@ static const WineGLExtension *WineGLExtensionList[MAX_EXTENSIONS]; static int WineGLExtensionListSize; static void X11DRV_WineGL_LoadExtensions(void); +static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, BOOL AllowOffscreen, int *fmt_count); static BOOL glxRequireVersion(int requiredVersion); static BOOL glxRequireExtension(const char *requiredExtension); @@ -582,37 +583,23 @@ static int describeContext(Wine_GLContext* ctx) { return ctx_vis_id; } -static int describeDrawable(Wine_GLContext* ctx, Drawable drawable) { +static BOOL describeDrawable(X11DRV_PDEVICE *physDev) { int tmp; - int nElements; - int attribList[3] = { GLX_FBCONFIG_ID, 0, None }; - GLXFBConfig *fbCfgs; - - if (pglXQueryDrawable == NULL) { - /** glXQueryDrawable not available so returns not supported */ - return -1; - } - - TRACE(" Drawable %p have :\n", (void*) drawable); - pglXQueryDrawable(gdi_display, drawable, GLX_WIDTH, (unsigned int*) &tmp); - TRACE(" - WIDTH as %d\n", tmp); - pglXQueryDrawable(gdi_display, drawable, GLX_HEIGHT, (unsigned int*) &tmp); - TRACE(" - HEIGHT as %d\n", tmp); - pglXQueryDrawable(gdi_display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &tmp); - TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); + WineGLPixelFormat *fmt; + int fmt_count = 0; - attribList[1] = tmp; - fbCfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), attribList, &nElements); - if (fbCfgs == NULL) { - return -1; - } + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physDev->current_pf, TRUE /* Offscreen */, &fmt_count); + if(!fmt) return FALSE; - pglXGetFBConfigAttrib(gdi_display, fbCfgs[0], GLX_VISUAL_ID, &tmp); - TRACE(" - VISUAL_ID as 0x%x\n", tmp); + TRACE(" HDC %p has:\n", physDev->hdc); + TRACE(" - iPixelFormat %d\n", fmt->iPixelFormat); + TRACE(" - Drawable %p\n", (void*) get_glxdrawable(physDev)); + TRACE(" - FBCONFIG_ID 0x%x\n", fmt->fmt_id); - XFree(fbCfgs); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &tmp); + TRACE(" - VISUAL_ID 0x%x\n", tmp); - return tmp; + return TRUE; } static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuffer* pbuf) { @@ -1842,7 +1829,7 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if (ctx->ctx == NULL) { /* The describe lines below are for debugging purposes only */ if (TRACE_ON(wgl)) { - describeDrawable(ctx, drawable); + describeDrawable(physDev); describeContext(ctx); }

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 85f9460a587ad316791c720aea902b0588296ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f9460a587ad316791c720ae… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jun 16 21:14:05 2009 +0100 crypt32: Constify some variables. --- dlls/crypt32/object.c | 6 +++--- dlls/crypt32/str.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index e880f08..f505b7d 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1080,7 +1080,7 @@ static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, return ret; } -static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id, +static BOOL CRYPT_FormatHexStringWithPrefix(const CRYPT_DATA_BLOB *blob, int id, LPWSTR str, DWORD *pcbStr) { WCHAR buf[MAX_STRING_RESOURCE_LEN]; @@ -1114,13 +1114,13 @@ static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id, return ret; } -static BOOL CRYPT_FormatKeyId(CRYPT_DATA_BLOB *keyId, LPWSTR str, +static BOOL CRYPT_FormatKeyId(const CRYPT_DATA_BLOB *keyId, LPWSTR str, DWORD *pcbStr) { return CRYPT_FormatHexStringWithPrefix(keyId, IDS_KEY_ID, str, pcbStr); } -static BOOL CRYPT_FormatCertSerialNumber(CRYPT_DATA_BLOB *serialNum, LPWSTR str, +static BOOL CRYPT_FormatCertSerialNumber(const CRYPT_DATA_BLOB *serialNum, LPWSTR str, DWORD *pcbStr) { return CRYPT_FormatHexStringWithPrefix(serialNum, IDS_CERT_SERIAL_NUMBER, diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index d3bca2b..c0b7677 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -341,7 +341,7 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 }; DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, - PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz) + const CERT_NAME_BLOB *pName, DWORD dwStrType, LPWSTR psz, DWORD csz) { static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG;

1 0