August 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw: Add a separate function for light initialization.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: c892ed497c7faecfe9060a2e4b146812269701c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c892ed497c7faecfe9060a2e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:21 2010 +0200 ddraw: Add a separate function for light initialization. --- dlls/ddraw/ddraw.c | 4 +--- dlls/ddraw/ddraw_private.h | 4 +--- dlls/ddraw/light.c | 9 ++++++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 55753c4..28af7d0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4375,9 +4375,7 @@ static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DLight_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); + d3d_light_init(object, ddraw_from_d3d3(iface)); TRACE("Created light %p.\n", object); *light = (IDirect3DLight *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fe65b79..f7ea61d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -525,12 +525,10 @@ struct IDirect3DLightImpl IDirect3DLightImpl *next; }; -/* Vtable */ -extern const IDirect3DLightVtbl IDirect3DLight_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void light_activate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; void light_deactivate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; +void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /****************************************************************************** * IDirect3DMaterial implementation structure - Wraps to D3D7 diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 9726d86..3cf26b5 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -287,7 +287,7 @@ IDirect3DLightImpl_GetLight(IDirect3DLight *iface, return DD_OK; } -const IDirect3DLightVtbl IDirect3DLight_Vtbl = +static const struct IDirect3DLightVtbl d3d_light_vtbl = { /*** IUnknown Methods ***/ IDirect3DLightImpl_QueryInterface, @@ -298,3 +298,10 @@ const IDirect3DLightVtbl IDirect3DLight_Vtbl = IDirect3DLightImpl_SetLight, IDirect3DLightImpl_GetLight }; + +void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) +{ + light->lpVtbl = &d3d_light_vtbl; + light->ref = 1; + light->ddraw = ddraw; +}

1 0

Henri Verbeet : ddraw: Add a separate function for viewport initialization.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 921bd1bf9a55908cf97b321668e5d73be51696f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=921bd1bf9a55908cf97b32166… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:23 2010 +0200 ddraw: Add a separate function for viewport initialization. --- dlls/ddraw/ddraw.c | 5 +---- dlls/ddraw/ddraw_private.h | 4 +--- dlls/ddraw/viewport.c | 10 +++++++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7541671..7d97a91 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4505,10 +4505,7 @@ static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DViewport3_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); - object->use_vp2 = 0xff; + d3d_viewport_init(object, ddraw_from_d3d3(iface)); TRACE("Created viewport %p.\n", object); *viewport = (IDirect3DViewport3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6ea61fe..81d2fd3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -587,11 +587,9 @@ struct IDirect3DViewportImpl IDirect3DMaterialImpl *background; }; -/* Vtable */ -extern const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; +void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DExecuteBuffer - Wraps to D3D7 diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 56572e3..118e03a 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1078,7 +1078,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, * The VTable *****************************************************************************/ -const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl = +static const struct IDirect3DViewport3Vtbl d3d_viewport_vtbl = { /*** IUnknown Methods ***/ IDirect3DViewportImpl_QueryInterface, @@ -1106,3 +1106,11 @@ const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl = IDirect3DViewportImpl_GetBackgroundDepth2, IDirect3DViewportImpl_Clear2, }; + +void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) +{ + viewport->lpVtbl = &d3d_viewport_vtbl; + viewport->ref = 1; + viewport->ddraw = ddraw; + viewport->use_vp2 = 0xff; +}

1 0

Henri Verbeet : ddraw: Remove unused / redundant includes.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: c5a14085d45a7402f3013e0397957d1250261f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a14085d45a7402f3013e039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:20 2010 +0200 ddraw: Remove unused / redundant includes. --- dlls/ddraw/clipper.c | 15 +-------------- dlls/ddraw/ddraw.c | 18 ------------------ dlls/ddraw/ddraw_private.h | 18 ++++++++---------- dlls/ddraw/device.c | 18 ------------------ dlls/ddraw/executebuffer.c | 18 ------------------ dlls/ddraw/light.c | 17 ----------------- dlls/ddraw/main.c | 19 ++----------------- dlls/ddraw/material.c | 18 ------------------ dlls/ddraw/palette.c | 8 +------- dlls/ddraw/parent.c | 17 ----------------- dlls/ddraw/regsvr.c | 16 ++++------------ dlls/ddraw/surface.c | 18 ------------------ dlls/ddraw/utils.c | 4 +--- dlls/ddraw/vertexbuffer.c | 17 ----------------- dlls/ddraw/viewport.c | 18 ------------------ 15 files changed, 17 insertions(+), 222 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index a8a3242..25e71fa 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -20,23 +20,10 @@ */ #include "config.h" - -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ddraw.h" -#include "winerror.h" +#include "wine/port.h" #include "ddraw_private.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /***************************************************************************** diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6f060e7..55753c4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -23,25 +23,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 990d4f7..fe65b79 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -19,24 +19,22 @@ #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H -/* MAY NOT CONTAIN X11 or DGA specific includes/defines/structs! */ +#include <assert.h> +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "wine/debug.h" -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" #include "winbase.h" -#include "wtypes.h" #include "wingdi.h" #include "winuser.h" -#include "ddraw.h" -#include "ddrawi.h" -#include "d3d.h" -#include "wine/list.h" +#include "d3d.h" +#include "ddraw.h" #ifdef DDRAW_INIT_GUID #include "initguid.h" #endif +#include "wine/list.h" #include "wine/wined3d.h" extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 25ff428..bb046b4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -30,25 +30,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 04f856a..9f08976 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -23,25 +23,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7); diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index dd41ffe..9726d86 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -21,23 +21,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7292ed8..0fccec7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -26,28 +26,13 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS +#define DDRAW_INIT_GUID +#include "ddraw_private.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" #include "wine/exception.h" #include "winreg.h" -#include "ddraw.h" -#include "d3d.h" - -#define DDRAW_INIT_GUID -#include "ddraw_private.h" - static typeof(WineDirect3DCreate) *pWineDirect3DCreate; WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 3c5dc1d..68da7ff 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -22,25 +22,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 9ef0a7c..2937ec6 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -18,13 +18,7 @@ */ #include "config.h" -#include "winerror.h" -#include "wine/debug.h" - -#define COBJMACROS - -#include <assert.h> -#include <string.h> +#include "wine/port.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c index 473152e..2d8f519 100644 --- a/dlls/ddraw/parent.c +++ b/dlls/ddraw/parent.c @@ -23,23 +23,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c index 6ab75d1..52a6fb7 100644 --- a/dlls/ddraw/regsvr.c +++ b/dlls/ddraw/regsvr.c @@ -18,20 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> +#include "config.h" +#include "wine/port.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" - -#include "ddraw.h" - -#include "wine/debug.h" +#include "ddraw_private.h" #include "wine/unicode.h" +#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8f23ab1..46c166a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -26,25 +26,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index ed8b480..89234c1 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -22,11 +22,9 @@ */ #include "config.h" - -#define NONAMELESSUNION +#include "wine/port.h" #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index f16cf12..fc02660 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -21,23 +21,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 403463b..56572e3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -22,25 +22,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7);

1 0

Henri Verbeet : ddraw: Merge texture.c into surface.c.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 407f78e9e1cd97d499b075c4182bfd906a0c9d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=407f78e9e1cd97d499b075c41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:19 2010 +0200 ddraw: Merge texture.c into surface.c. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/surface.c | 398 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/texture.c | 501 ------------------------------------------------ 3 files changed, 398 insertions(+), 502 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=407f78e9e1cd97d499b07…

1 0

Andrew Eikum : oleaut32: Use correct bitpattern if referenced type is not user defined.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: a0c0d2693d99452ee9e0ccd6f76252e9e64eb951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c0d2693d99452ee9e0ccd6f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:11 2010 -0500 oleaut32: Use correct bitpattern if referenced type is not user defined. This reduces the diff between the TLB file output by Wine and Windows XP when running the typelib test module. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 92d4ab0..b2c086b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1109,7 +1109,7 @@ static int ctl2_encode_typedesc( mix_field = typedata[0]>>16; break; default: - mix_field = 0x7fff; + mix_field = ((typedata[0] >> 16) == 0x7fff) ? 0x7fff : 0x7ffe; break; } }

1 0

Mariusz Pluciński : gameux: Add definitions of resource identifiers to header file.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 83335590369da812440ecbda1c88ead24f1ec7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=83335590369da812440ecbda1… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Aug 18 17:18:33 2010 +0200 gameux: Add definitions of resource identifiers to header file. --- include/gameux.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index f9ec1e5..773e784 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -32,6 +32,18 @@ library gameuxLib { importlib("stdole2.tlb"); + cpp_quote("#define ID_GDF_XML __GDF_XML") + cpp_quote("#define ID_GDF_THUMBNAIL __GDF_THUMBNAIL") + cpp_quote("#define ID_ICON_ICO __ICON_ICO") + + cpp_quote("#if defined(__GNUC__)") + cpp_quote("#define ID_GDF_XML_STR (const WCHAR[]){'_','_','G','D','F','_','X','M','L',0}") + cpp_quote("#define ID_GDF_THUMBNAIL_STR (const WCHAR[]){'_','_','G','D','F','_','T','H','U','M','B','N','A','I','L',0}") + cpp_quote("#elif defined(_MSC_VER)") + cpp_quote("#define ID_GDF_XML_STR L\"__GDF_XML\"") + cpp_quote("#define ID_GDF_THUMBNAIL_STR L\"__GDF_THUMBNAIL\"") + cpp_quote("#endif") + typedef enum { GIS_NOT_INSTALLED = 1,

1 0

Jörg Höhle : kernel32/tests: GetVolumeInformationA X: succeeds iff drive's default dir is root.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: fc872628d9640c1441f8d6e332cccc62b6638cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc872628d9640c1441f8d6e33… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 28 21:23:47 2010 +0200 kernel32/tests: GetVolumeInformationA X: succeeds iff drive's default dir is root. --- dlls/kernel32/tests/volume.c | 128 +++++++++++++++++++++++++++++++----------- 1 files changed, 94 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc872628d9640c1441f8d…

1 0

Roderick Colenbrander : winex11: X11DRV_nores_SetCurrentMode return DISP_CHANGE_SUCCESSFUL when switching to the current mode .
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 2c39733eabd66c73eea370f513912da6dd9df14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c39733eabd66c73eea370f51… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Aug 17 20:35:29 2010 +0100 winex11: X11DRV_nores_SetCurrentMode return DISP_CHANGE_SUCCESSFUL when switching to the current mode. --- dlls/winex11.drv/settings.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7f0753a..9c40225 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -150,7 +150,8 @@ static int X11DRV_nores_GetCurrentMode(void) static LONG X11DRV_nores_SetCurrentMode(int mode) { - TRACE("Ignoring mode change request\n"); + if (mode == 0) return DISP_CHANGE_SUCCESSFUL; + TRACE("Ignoring mode change request mode=%d\n", mode); return DISP_CHANGE_FAILED; }

1 0

Marko Nikolic : advapi32/tests: Removed sign comparison warnings in eventlog tests.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: f3a645f0deed7b18aca9487a5852f8bdc85bbd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a645f0deed7b18aca9487a5… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Tue Aug 17 15:39:24 2010 +0200 advapi32/tests: Removed sign comparison warnings in eventlog tests. --- dlls/advapi32/tests/eventlog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 88a02c7..5b46eaf 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -633,7 +633,7 @@ static BOOL create_new_eventlog(void) HKEY key, eventkey; BOOL bret = FALSE; LONG lret; - int i; + DWORD i; /* First create our eventlog */ lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); @@ -711,7 +711,7 @@ static void test_readwrite(void) DWORD sidsize, count; BOOL ret, sidavailable; BOOL on_vista = FALSE; /* Used to indicate Vista, W2K8 or Win7 */ - int i; + DWORD i; char *localcomputer = NULL; DWORD size; @@ -1095,7 +1095,7 @@ static void cleanup_eventlog(void) BOOL bret; LONG lret; HKEY key; - int i; + DWORD i; char winesvc[MAX_PATH]; /* Delete the registry tree */

1 0

Jacek Caban : mshtml: Avoid asynchronous parse_complete call.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 8507db18a88a176a91ec6cc73f91a726de89e255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8507db18a88a176a91ec6cc73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:39:29 2010 +0200 mshtml: Avoid asynchronous parse_complete call. --- dlls/mshtml/mutation.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8cf43fb..edcb2cc 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -312,10 +312,8 @@ static void call_explorer_69(HTMLDocumentObj *doc) FIXME("handle result\n"); } -static void parse_complete_proc(task_t *task) +static void parse_complete(HTMLDocumentObj *doc) { - HTMLDocumentObj *doc = ((docobj_task_t*)task)->doc; - TRACE("(%p)\n", doc); if(doc->usermode == EDITMODE) @@ -328,35 +326,24 @@ static void parse_complete_proc(task_t *task) call_explorer_69(doc); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ - - set_ready_state(doc->basedoc.window, READYSTATE_INTERACTIVE); } static void handle_end_load(HTMLDocumentNode *This) { - docobj_task_t *task; - TRACE("\n"); if(!This->basedoc.doc_obj) return; - if(This != This->basedoc.doc_obj->basedoc.doc_node) { - set_ready_state(This->basedoc.window, READYSTATE_INTERACTIVE); - return; + if(This == This->basedoc.doc_obj->basedoc.doc_node) { + /* + * This should be done in the worker thread that parses HTML, + * but we don't have such thread (Gecko parses HTML for us). + */ + parse_complete(This->basedoc.doc_obj); } - task = heap_alloc(sizeof(docobj_task_t)); - if(!task) - return; - - task->doc = This->basedoc.doc_obj; - - /* - * This should be done in the worker thread that parses HTML, - * but we don't have such thread (Gecko parses HTML for us). - */ - push_task(&task->header, &parse_complete_proc, This->basedoc.doc_obj->basedoc.task_magic); + set_ready_state(This->basedoc.window, READYSTATE_INTERACTIVE); } static nsresult NSAPI nsRunnable_Run(nsIRunnable *iface)

1 0