May 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Make sure the DC is up-to-date before accessing the pixel format.
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 7e2e30bade83bcf838cf05abd90cac9d81996b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2e30bade83bcf838cf05abd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 19:58:23 2008 +0200 gdi32: Make sure the DC is up-to-date before accessing the pixel format. --- dlls/gdi32/opengl.c | 1 + dlls/gdi32/painting.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index f0810a8..022fc2c 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -253,6 +253,7 @@ static BOOL WINAPI wglSetPixelFormatWINE(HDC hdc, int iPixelFormat, const PIXELF if (!dc) return 0; + update_dc( dc ); if (!dc->funcs->pwglSetPixelFormatWINE) FIXME(" :stub\n"); else bRet = dc->funcs->pwglSetPixelFormatWINE(dc->physDev, iPixelFormat, ppfd); diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 8c9aa98..c3d8310 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -372,6 +372,7 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT iPixelFormat, if (!dc) return 0; + update_dc( dc ); if (!dc->funcs->pSetPixelFormat) FIXME(" :stub\n"); else bRet = dc->funcs->pSetPixelFormat(dc->physDev,iPixelFormat,ppfd); @@ -433,6 +434,7 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, if (!dc) return 0; + update_dc( dc ); if (!dc->funcs->pDescribePixelFormat) { FIXME(" :stub\n");

1 0

Alexandre Julliard : winex11: Silence a harmless error.
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 4d926e3ebc480a2edb7313af56e8395fe7f802a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d926e3ebc480a2edb7313af5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 19:58:35 2008 +0200 winex11: Silence a harmless error. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f92f943..04c2f2a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1425,10 +1425,11 @@ int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev) { int tmp; TRACE("(%p)\n", physDev); + if (!physDev->current_pf) return 0; /* not set yet */ + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physDev->current_pf, TRUE, &tmp); if(!fmt) { - /* This happens on HDCs on which SetPixelFormat wasn't called yet */ ERR("Unable to find a WineGLPixelFormat for iPixelFormat=%d\n", physDev->current_pf); return 0; }

1 0

Alexandre Julliard : winex11: Create all the GL drawables using the gdi_display to avoid synchronization issues .
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 6e9dea8a279757693f61205fc53b08dba933dc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9dea8a279757693f61205fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 19:37:54 2008 +0200 winex11: Create all the GL drawables using the gdi_display to avoid synchronization issues. --- dlls/winex11.drv/window.c | 50 ++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0b20338..791dcd0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -414,7 +414,6 @@ static void sync_window_text( Display *display, Window win, const WCHAR *text ) */ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) { - Display *display = thread_display(); struct x11drv_win_data *data; XVisualInfo *vis; int w, h; @@ -429,6 +428,7 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) if (data->whole_window) { + Display *display = thread_display(); Window client = data->client_window; if (vis->visualid != XVisualIDFromVisual(visual)) @@ -438,6 +438,7 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) } wine_tsx11_lock(); XFree(vis); + XFlush( display ); wine_tsx11_unlock(); if (client) goto done; return FALSE; @@ -457,7 +458,7 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) if (!parent) parent = root_window; wine_tsx11_lock(); - data->colormap = XCreateColormap(display, parent, vis->visual, + data->colormap = XCreateColormap(gdi_display, parent, vis->visual, (vis->class == PseudoColor || vis->class == GrayScale || vis->class == DirectColor) ? @@ -467,17 +468,18 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) XInstallColormap(gdi_display, attrib.colormap); if(data->gl_drawable) XDestroyWindow(gdi_display, data->gl_drawable); - data->gl_drawable = XCreateWindow(display, parent, -w, 0, w, h, 0, + data->gl_drawable = XCreateWindow(gdi_display, parent, -w, 0, w, h, 0, vis->depth, InputOutput, vis->visual, CWColormap | CWOverrideRedirect, &attrib); if(data->gl_drawable) { - pXCompositeRedirectWindow(display, data->gl_drawable, + pXCompositeRedirectWindow(gdi_display, data->gl_drawable, CompositeRedirectManual); - XMapWindow(display, data->gl_drawable); + XMapWindow(gdi_display, data->gl_drawable); } XFree(vis); + XFlush( gdi_display ); wine_tsx11_unlock(); } else @@ -487,8 +489,8 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) wine_tsx11_lock(); - if(data->pixmap) XFreePixmap(display, data->pixmap); - data->pixmap = XCreatePixmap(display, root_window, w, h, vis->depth); + if(data->pixmap) XFreePixmap(gdi_display, data->pixmap); + data->pixmap = XCreatePixmap(gdi_display, root_window, w, h, vis->depth); if(!data->pixmap) { XFree(vis); @@ -496,14 +498,15 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) return FALSE; } - if(data->gl_drawable) destroy_glxpixmap(display, data->gl_drawable); - data->gl_drawable = create_glxpixmap(display, vis, data->pixmap); + if(data->gl_drawable) destroy_glxpixmap(gdi_display, data->gl_drawable); + data->gl_drawable = create_glxpixmap(gdi_display, vis, data->pixmap); if(!data->gl_drawable) { - XFreePixmap(display, data->pixmap); + XFreePixmap(gdi_display, data->pixmap); data->pixmap = 0; } XFree(vis); + XFlush( gdi_display ); wine_tsx11_unlock(); if (data->pixmap) SetPropA(hwnd, pixmap_prop, (HANDLE)data->pixmap); } @@ -517,9 +520,6 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) done: data->fbconfig_id = fbconfig_id; SetPropA(hwnd, fbconfig_id_prop, (HANDLE)data->fbconfig_id); - wine_tsx11_lock(); - XFlush( display ); - wine_tsx11_unlock(); /* force DCE invalidation */ SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | @@ -530,7 +530,7 @@ done: /*********************************************************************** * sync_gl_drawable */ -static void sync_gl_drawable(Display *display, struct x11drv_win_data *data) +static void sync_gl_drawable(struct x11drv_win_data *data) { int w = data->client_rect.right - data->client_rect.left; int h = data->client_rect.bottom - data->client_rect.top; @@ -546,7 +546,7 @@ static void sync_gl_drawable(Display *display, struct x11drv_win_data *data) if(usexcomposite) { wine_tsx11_lock(); - XMoveResizeWindow(display, data->gl_drawable, -w, 0, w, h); + XMoveResizeWindow(gdi_display, data->gl_drawable, -w, 0, w, h); wine_tsx11_unlock(); return; } @@ -561,7 +561,7 @@ static void sync_gl_drawable(Display *display, struct x11drv_win_data *data) return; } - pix = XCreatePixmap(display, root_window, w, h, vis->depth); + pix = XCreatePixmap(gdi_display, root_window, w, h, vis->depth); if(!pix) { ERR("Failed to create pixmap for offscreen rendering\n"); @@ -570,11 +570,11 @@ static void sync_gl_drawable(Display *display, struct x11drv_win_data *data) return; } - glxp = create_glxpixmap(display, vis, pix); + glxp = create_glxpixmap(gdi_display, vis, pix); if(!glxp) { ERR("Failed to create drawable for offscreen rendering\n"); - XFreePixmap(display, pix); + XFreePixmap(gdi_display, pix); XFree(vis); wine_tsx11_unlock(); return; @@ -584,14 +584,14 @@ static void sync_gl_drawable(Display *display, struct x11drv_win_data *data) mark_drawable_dirty(data->gl_drawable, glxp); - XFreePixmap(display, data->pixmap); - destroy_glxpixmap(display, data->gl_drawable); + XFreePixmap(gdi_display, data->pixmap); + destroy_glxpixmap(gdi_display, data->gl_drawable); TRACE( "Recreated GL drawable %lx to replace %lx\n", glxp, data->gl_drawable ); data->pixmap = pix; data->gl_drawable = glxp; - XFlush( display ); + XFlush( gdi_display ); wine_tsx11_unlock(); SetPropA(data->hwnd, gl_drawable_prop, (HANDLE)data->gl_drawable); @@ -1252,7 +1252,7 @@ static void sync_client_position( Display *display, struct x11drv_win_data *data wine_tsx11_unlock(); } - if (data->gl_drawable && (mask & (CWWidth|CWHeight))) sync_gl_drawable( display, data ); + if (data->gl_drawable && (mask & (CWWidth|CWHeight))) sync_gl_drawable( data ); } @@ -1496,15 +1496,15 @@ void X11DRV_DestroyWindow( HWND hwnd ) if (data->pixmap) { - destroy_glxpixmap(display, data->gl_drawable); wine_tsx11_lock(); - XFreePixmap(display, data->pixmap); + destroy_glxpixmap(gdi_display, data->gl_drawable); + XFreePixmap(gdi_display, data->pixmap); wine_tsx11_unlock(); } else if (data->gl_drawable) { wine_tsx11_lock(); - XDestroyWindow(display, data->gl_drawable); + XDestroyWindow(gdi_display, data->gl_drawable); wine_tsx11_unlock(); }

1 0

Alexandre Julliard : winex11: Create a dummy parent window for composite child windows to avoid using the root .
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: b605980bf15fbc83cc0e38d951731ccbd2125401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b605980bf15fbc83cc0e38d95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 19:14:11 2008 +0200 winex11: Create a dummy parent window for composite child windows to avoid using the root. --- dlls/winex11.drv/window.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 791dcd0..191931a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -454,21 +454,26 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) if(usexcomposite) { XSetWindowAttributes attrib; - Window parent = X11DRV_get_whole_window( GetAncestor( hwnd, GA_ROOT )); + static Window dummy_parent; - if (!parent) parent = root_window; wine_tsx11_lock(); - data->colormap = XCreateColormap(gdi_display, parent, vis->visual, + attrib.override_redirect = True; + if (!dummy_parent) + { + dummy_parent = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, screen_depth, + InputOutput, visual, CWOverrideRedirect, &attrib ); + XMapWindow( gdi_display, dummy_parent ); + } + data->colormap = XCreateColormap(gdi_display, dummy_parent, vis->visual, (vis->class == PseudoColor || vis->class == GrayScale || vis->class == DirectColor) ? AllocAll : AllocNone); - attrib.override_redirect = True; attrib.colormap = data->colormap; XInstallColormap(gdi_display, attrib.colormap); if(data->gl_drawable) XDestroyWindow(gdi_display, data->gl_drawable); - data->gl_drawable = XCreateWindow(gdi_display, parent, -w, 0, w, h, 0, + data->gl_drawable = XCreateWindow(gdi_display, dummy_parent, -w, 0, w, h, 0, vis->depth, InputOutput, vis->visual, CWColormap | CWOverrideRedirect, &attrib);

1 0

Alexandre Julliard : Revert "winealsa: Remove calls to deprecated functions ."
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 1ecf0c96faf9b798e8098e5824e0ef62ae7ce61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecf0c96faf9b798e8098e582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 19:40:34 2008 +0200 Revert "winealsa: Remove calls to deprecated functions." This reverts commit c8bdebde3dc94baf1439697306e6f797ca5c7ad2. To be revisited after 1.0. --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/dscapture.c | 1 + dlls/winealsa.drv/dsoutput.c | 1 + dlls/winealsa.drv/wavein.c | 1 + dlls/winealsa.drv/waveout.c | 2 ++ 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index a4b1008..ce6b75d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -735,6 +735,7 @@ if (err<0) { \ } while(0); X(period_time); + X(tick_time); #undef X if (!sw) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 8be3e3a..98fe195 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -448,6 +448,7 @@ static int CreateMMAP(IDsCaptureDriverBufferImpl* pdbi) snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, INT_MAX); snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0); snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); + snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE); err = snd_pcm_sw_params(pcm, sw_params); avail = snd_pcm_avail_update(pcm); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 18bdb46..130e181 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -210,6 +210,7 @@ static int DSDB_CreateMMAP(IDsDriverBufferImpl* pdbi) snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, INT_MAX); snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0); snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); + snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE); err = snd_pcm_sw_params(pcm, sw_params); avail = snd_pcm_avail_update(pcm); diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index af62bcf..9c89fde 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -483,6 +483,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); + EXIT_ON_ERROR( snd_pcm_sw_params_set_xfer_align(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set xfer align"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6c8ffd4..f4452e5 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -759,7 +759,9 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); + EXIT_ON_ERROR( snd_pcm_sw_params_set_xfer_align(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set xfer align"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); + EXIT_ON_ERROR( snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE), MMSYSERR_ERROR, "unable to set xrun mode"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR

1 0

Alexander Dorofeyev : ddraw: Fix some code unprotected by ddraw lock.
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 17dacf90b23a0bcecd18e8ab30f2929e550ad4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=17dacf90b23a0bcecd18e8ab3… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun May 11 00:19:43 2008 +0300 ddraw: Fix some code unprotected by ddraw lock. --- dlls/ddraw/device.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 57bb83c..88d5453 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2343,8 +2343,6 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, HRESULT hr; TRACE("(%p)->(%08x,%p)\n", This, dwRenderStateType, lpdwRenderState); - /* D3DRENDERSTATE_TEXTUREMAPBLEND is mapped to texture state stages in SetRenderState; reverse - the mapping to get the value. */ switch(dwRenderStateType) { case D3DRENDERSTATE_TEXTUREHANDLE: @@ -2355,6 +2353,8 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, IWineD3DBaseTexture *tex = NULL; *lpdwRenderState = 0; + EnterCriticalSection(&ddraw_cs); + hr = IWineD3DDevice_GetTexture(This->wineD3DDevice, 0, &tex); @@ -2378,11 +2378,15 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, IWineD3DBaseTexture_Release(tex); } + LeaveCriticalSection(&ddraw_cs); + return hr; } case D3DRENDERSTATE_TEXTUREMAPBLEND: { + /* D3DRENDERSTATE_TEXTUREMAPBLEND is mapped to texture state stages in SetRenderState; reverse + the mapping to get the value. */ DWORD colorop, colorarg1, colorarg2; DWORD alphaop, alphaarg1, alphaarg2; @@ -2627,6 +2631,8 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice3, iface); TRACE("(%p)->(%08x,%d)\n", This, RenderStateType, Value); + EnterCriticalSection(&ddraw_cs); + switch(RenderStateType) { case D3DRENDERSTATE_TEXTUREHANDLE: @@ -2661,8 +2667,6 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, case D3DRENDERSTATE_TEXTUREMAPBLEND: { - EnterCriticalSection(&ddraw_cs); - This->legacyTextureBlending = TRUE; switch ( (D3DTEXTUREBLEND) Value) @@ -2748,8 +2752,6 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, ERR("Unhandled texture environment %d !\n",Value); } - LeaveCriticalSection(&ddraw_cs); - hr = D3D_OK; break; } @@ -2761,6 +2763,8 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, break; } + LeaveCriticalSection(&ddraw_cs); + return hr; } @@ -4429,6 +4433,8 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, HRESULT hr; TRACE("(%p)->(%d,%p)\n", This, Stage, tex); + EnterCriticalSection(&ddraw_cs); + if (This->legacyTextureBlending) IDirect3DDevice3_GetRenderState(iface, D3DRENDERSTATE_TEXTUREMAPBLEND, &texmapblend); @@ -4447,8 +4453,6 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, DDPIXELFORMAT ddfmt; HRESULT result; - EnterCriticalSection(&ddraw_cs); - result = IWineD3DDevice_GetTexture(This->wineD3DDevice, 0, &tex); @@ -4477,10 +4481,10 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, { IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_CURRENT); } - - LeaveCriticalSection(&ddraw_cs); } + LeaveCriticalSection(&ddraw_cs); + return hr; }

1 0

Huw Davies : gdiplus: Add some stubs for region functions.
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 9bc1fc9f112407d9217e7c104c27a9df3862014d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc1fc9f112407d9217e7c104… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 12 16:45:36 2008 +0100 gdiplus: Add some stubs for region functions. --- dlls/gdiplus/gdiplus.spec | 8 ++++---- dlls/gdiplus/region.c | 30 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 8 ++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 297fefe..2d6f210 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -122,9 +122,9 @@ @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) @ stdcall GdipCreatePen2(ptr long long ptr) -@ stub GdipCreateRegion +@ stdcall GdipCreateRegion(ptr) @ stub GdipCreateRegionHrgn -@ stub GdipCreateRegionPath +@ stdcall GdipCreateRegionPath(ptr ptr) @ stub GdipCreateRegionRect @ stub GdipCreateRegionRectI @ stub GdipCreateRegionRgnData @@ -148,7 +148,7 @@ @ stdcall GdipDeletePathIter(ptr) @ stdcall GdipDeletePen(ptr) @ stub GdipDeletePrivateFontCollection -@ stub GdipDeleteRegion +@ stdcall GdipDeleteRegion(ptr) @ stdcall GdipDeleteStringFormat(ptr) @ stdcall GdipDisposeImage(ptr) @ stdcall GdipDisposeImageAttributes(ptr) @@ -379,7 +379,7 @@ @ stub GdipGetRegionBoundsI @ stub GdipGetRegionData @ stub GdipGetRegionDataSize -@ stub GdipGetRegionHRgn +@ stdcall GdipGetRegionHRgn(ptr ptr ptr) @ stub GdipGetRegionScans @ stub GdipGetRegionScansCount @ stub GdipGetRegionScansI diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 92da580..4286b47 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -30,6 +30,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) +{ + FIXME("(%p): stub\n", region); + + *region = NULL; + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) +{ + FIXME("(%p, %p): stub\n", path, region); + + *region = NULL; + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) +{ + FIXME("(%p): stub\n", region); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) +{ + FIXME("(%p, %p, %p): stub\n", region, graphics, hrgn); + + *hrgn = NULL; + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 55ebe91..a8c1d65 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -354,6 +354,14 @@ GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringForm GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*); +GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **); +GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *, GpRegion **); +GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *); +GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *); +GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *); +GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *); + + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : Improve the formatting of the announcement message.
by Alexandre Julliard 12 May '08

12 May '08

Module: website Branch: master Commit: e32670611dde059223130f76ef6b95dbcfd5813f URL: http://source.winehq.org/git/website.git/?a=commit;h=e32670611dde059223130f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 18:36:15 2008 +0200 Improve the formatting of the announcement message. --- site | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/site b/site index 32a6bb8..3b48e37 100644 --- a/site +++ b/site @@ -133,16 +133,38 @@ function view_announce ($ver) { global $file_root, $config, $html; - if ($ver == "latest") - $announce = "http://source.winehq.org/git/wine.git/master:ANNOUNCE"; - else - $announce = "http://source.winehq.org/git/wine.git/tags/wine-".$ver.":ANNOUNCE"; + $tag = ($ver == "latest") ? "master" : "tags/wine-" . $ver; + $announce = $config->git_tree . "/wine.git/" . $tag . ":ANNOUNCE"; - if ($announce = @join("",file($announce))) + if ($arr = file($announce)) { + $in_header = 1; + while (list($c,$val) = each($arr)) + { + $arr[$c] = $html->urlify($arr[$c]); + + if (ereg("^--------------------", $arr[$c])) $in_header = 0; + else if (ereg("^Bugs fixed", $arr[$c])) $in_bugs = 1; + else if (ereg("^Changes since", $arr[$c])) $in_bugs = 0; + + if ($in_header) + { + $arr[$c] = ereg_replace("AUTHORS", + "<a href=\"".$config->git_tree."/wine.git/".$tag.":\\0\">\\0</a>", + $arr[$c]); + } + else if ($in_bugs) + { + $arr[$c] = ereg_replace("^( +)([0-9]+)", + "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", + $arr[$c]); + } + } + $announce = join("",$arr); + // display page $html->template_title = 'Announce'; - return $html->theme_box($config->theme, "box_title", 'Announce', "100%", $html->format_msg($announce), '10', 'white', 'topMenu'); + return $html->theme_box($config->theme, "box_title", 'Announce', "100%", $html->pre($announce), '10', 'white', 'topMenu'); } $html->redirect($file_root);

1 0

Hans Leidekker : wininet: Implement INTERNET_OPTION_USER_AGENT for InternetQueryOption.
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 6c8d315a72786936a831436d4494dac7e52393b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8d315a72786936a831436d4… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 9 15:23:46 2008 +0200 wininet: Implement INTERNET_OPTION_USER_AGENT for InternetQueryOption. --- dlls/wininet/internet.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/wininet/tests/internet.c | 14 +++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 69b6897..856f302 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1895,9 +1895,42 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d } case INTERNET_OPTION_USER_AGENT: - FIXME("INTERNET_OPTION_USER_AGENT\n"); - break; + { + DWORD required; + LPWININETAPPINFOW ai = (LPWININETAPPINFOW)lpwhh; + + TRACE("INTERNET_OPTION_USER_AGENT\n"); + if (lpwhh->htype != INTERNET_HANDLE_TYPE_INTERNET) + { + INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + return FALSE; + } + if (bIsUnicode) + { + required = (strlenW(ai->lpszAgent) + 1) * sizeof(WCHAR); + if (*lpdwBufferLength < required) + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + else if (lpBuffer) + { + strcpyW(lpBuffer, ai->lpszAgent); + bSuccess = TRUE; + } + } + else + { + required = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); + if (*lpdwBufferLength < required) + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + else if (lpBuffer) + { + WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, lpBuffer, required, NULL, NULL); + bSuccess = TRUE; + } + } + *lpdwBufferLength = required; + break; + } case INTERNET_OPTION_HTTP_VERSION: { if (*lpdwBufferLength < sizeof(HTTP_VERSION_INFO)) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 15495db..9f08b77 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -146,10 +146,10 @@ static void test_InternetQueryOptionA(void) buffer=HeapAlloc(GetProcessHeap(),0,len); retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); err=GetLastError(); - todo_wine ok(retval == 1,"Got wrong return value %d\n",retval); + ok(retval == 1,"Got wrong return value %d\n",retval); if (retval) { - todo_wine ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); + ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); todo_wine ok(len == strlen(useragent),"Got wrong user agent length %d instead of %d\n",len,lstrlenA(useragent)); } ok(err == 0xdeadbeef, "Got wrong error code %d\n",err); @@ -160,9 +160,9 @@ static void test_InternetQueryOptionA(void) buffer=HeapAlloc(GetProcessHeap(),0,100); retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); err=GetLastError(); - todo_wine ok(len == strlen(useragent) + 1,"Got wrong user agent length %d instead of %d\n", len, lstrlenA(useragent) + 1); + ok(len == strlen(useragent) + 1,"Got wrong user agent length %d instead of %d\n", len, lstrlenA(useragent) + 1); ok(!retval, "Got wrong return value %d\n", retval); - todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %d\n", err); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %d\n", err); HeapFree(GetProcessHeap(),0,buffer); hurl = InternetConnectA(hinet,"www.winehq.com",INTERNET_DEFAULT_HTTP_PORT,NULL,NULL,INTERNET_SERVICE_HTTP,0,0); @@ -173,7 +173,7 @@ static void test_InternetQueryOptionA(void) err=GetLastError(); ok(len == 0,"Got wrong user agent length %d instead of 0\n",len); ok(retval == 0,"Got wrong return value %d\n",retval); - todo_wine ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); + ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); InternetCloseHandle(hurl); InternetCloseHandle(hinet); @@ -185,9 +185,9 @@ static void test_InternetQueryOptionA(void) len=0; retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,NULL,&len); err=GetLastError(); - todo_wine ok(len == 1,"Got wrong user agent length %d instead of %d\n",len,1); + ok(len == 1,"Got wrong user agent length %d instead of %d\n",len,1); ok(retval == 0,"Got wrong return value %d\n",retval); - todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); InternetCloseHandle(hinet);

1 0

Hans Leidekker : wininet: HTTP_BuildProxyRequestUrl returns a pointer.
by Alexandre Julliard 12 May '08

12 May '08

Module: wine Branch: master Commit: 1c5bc9a77215afd8e59541e19acc44aaa29bcf11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5bc9a77215afd8e59541e19… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 9 15:18:51 2008 +0200 wininet: HTTP_BuildProxyRequestUrl returns a pointer. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b8e3b4d..0118d7b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1201,7 +1201,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) } /*********************************************************************** - * HTTP_InsertAuthorizationForHeader + * HTTP_InsertAuthorization * * Insert or delete the authorization field in the request header. */ @@ -1268,7 +1268,7 @@ static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) size = 15; /* "http://" + sizeof(port#) + ":/\0" */ size += strlenW( session->lpszHostName ) + strlenW( req->lpszPath ); - if (!(url = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return FALSE; + if (!(url = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return NULL; sprintfW( url, format, session->lpszHostName, session->nHostPort ); if (req->lpszPath[0] != '/') strcatW( url, slash );

1 0