January 2009 - Wine-commits

Henri Verbeet : wined3d: Remove AddDirtyBox() from the public interface.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: fd90021666f28801f77064ffb527bebc50003855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd90021666f28801f77064ffb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 14 10:01:10 2009 +0100 wined3d: Remove AddDirtyBox() from the public interface. This is an internal wined3d function. --- dlls/wined3d/device.c | 4 ++- dlls/wined3d/volume.c | 49 +++++++++++++++++++++------------------ dlls/wined3d/volumetexture.c | 6 +++- dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.idl | 3 -- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d485ded..542e0b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1143,7 +1143,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface, memset(&object->lockedBox, 0, sizeof(WINED3DBOX)); object->dirty = TRUE; - return IWineD3DVolume_AddDirtyBox((IWineD3DVolume *) object, NULL); + volume_add_dirty_box((IWineD3DVolume *)object, NULL); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface, UINT EdgeLength, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index c8d42ad..ceffae7 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -64,6 +64,31 @@ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { } } +void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) +{ + IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; + + This->dirty = TRUE; + if (dirty_box) + { + This->lockedBox.Left = min(This->lockedBox.Left, dirty_box->Left); + This->lockedBox.Top = min(This->lockedBox.Top, dirty_box->Top); + This->lockedBox.Front = min(This->lockedBox.Front, dirty_box->Front); + This->lockedBox.Right = max(This->lockedBox.Right, dirty_box->Right); + This->lockedBox.Bottom = max(This->lockedBox.Bottom, dirty_box->Bottom); + This->lockedBox.Back = max(This->lockedBox.Back, dirty_box->Back); + } + else + { + This->lockedBox.Left = 0; + This->lockedBox.Top = 0; + This->lockedBox.Front = 0; + This->lockedBox.Right = This->currentDesc.Width; + This->lockedBox.Bottom = This->currentDesc.Height; + This->lockedBox.Back = This->currentDesc.Depth; + } +} + /* ******************************************* IWineD3DVolume IUnknown parts follow ******************************************* */ @@ -225,7 +250,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DL * Dirtify on lock * as seen in msdn docs */ - IWineD3DVolume_AddDirtyBox(iface, &This->lockedBox); + volume_add_dirty_box(iface, &This->lockedBox); /** Dirtify Container if needed */ if (NULL != This->container) { @@ -261,27 +286,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) { /* Internal use functions follow : */ -static HRESULT WINAPI IWineD3DVolumeImpl_AddDirtyBox(IWineD3DVolume *iface, CONST WINED3DBOX* pDirtyBox) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - This->dirty = TRUE; - if (NULL != pDirtyBox) { - This->lockedBox.Left = min(This->lockedBox.Left, pDirtyBox->Left); - This->lockedBox.Top = min(This->lockedBox.Top, pDirtyBox->Top); - This->lockedBox.Front = min(This->lockedBox.Front, pDirtyBox->Front); - This->lockedBox.Right = max(This->lockedBox.Right, pDirtyBox->Right); - This->lockedBox.Bottom = max(This->lockedBox.Bottom, pDirtyBox->Bottom); - This->lockedBox.Back = max(This->lockedBox.Back, pDirtyBox->Back); - } else { - This->lockedBox.Left = 0; - This->lockedBox.Top = 0; - This->lockedBox.Front = 0; - This->lockedBox.Right = This->currentDesc.Width; - This->lockedBox.Bottom = This->currentDesc.Height; - This->lockedBox.Back = This->currentDesc.Depth; - } - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWineD3DBase* container) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; @@ -362,7 +366,6 @@ const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_LockBox, IWineD3DVolumeImpl_UnlockBox, /* Internal interface */ - IWineD3DVolumeImpl_AddDirtyBox, IWineD3DVolumeImpl_LoadTexture, IWineD3DVolumeImpl_SetContainer }; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 6fd2ff0..ea8c073 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -119,7 +119,7 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac FIXME("Volumetexture (%p) has been reloaded at least 20 times due to WINED3DSAMP_SRGBTEXTURE changes on it\'s sampler\n", This); for (i = 0; i < This->baseTexture.levels; i++) { - IWineD3DVolume_AddDirtyBox(This->volumes[i], NULL); + volume_add_dirty_box(This->volumes[i], NULL); IWineD3DVolume_LoadTexture(This->volumes[i], i, srgb_mode); } } else { @@ -295,7 +295,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTextur IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; This->baseTexture.dirty = TRUE; TRACE("(%p) : dirtyfication of volume Level (0)\n", This); - return IWineD3DVolume_AddDirtyBox(This->volumes[0], pDirtyBox); + volume_add_dirty_box(This->volumes[0], pDirtyBox); + + return WINED3D_OK; } const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d62ebef..a020c79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1455,6 +1455,8 @@ typedef struct IWineD3DVolumeImpl extern const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl; +void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box); + /***************************************************************************** * IWineD3DVolumeTexture implementation structure (extends IWineD3DBaseTextureImpl) */ diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 35bdacd..bcd5b8d 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2512,9 +2512,6 @@ interface IWineD3DVolume : IWineD3DResource ); HRESULT UnlockBox( ); - HRESULT AddDirtyBox( - [in] const WINED3DBOX *dirty_box - ); HRESULT LoadTexture( [in] int gl_level, [in] BOOL srgb_mode

1 0

Henri Verbeet : wined3d: Remove CleanDirtyBox().
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 881780276b74fa9db1ff5e96f8e9f7d139248ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881780276b74fa9db1ff5e96f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 14 10:01:10 2009 +0100 wined3d: Remove CleanDirtyBox(). It's never used. --- dlls/wined3d/volume.c | 13 ------------- include/wine/wined3d.idl | 2 -- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6700bb4..c8d42ad 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -261,18 +261,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) { /* Internal use functions follow : */ -static HRESULT WINAPI IWineD3DVolumeImpl_CleanDirtyBox(IWineD3DVolume *iface) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - This->dirty = FALSE; - This->lockedBox.Left = This->currentDesc.Width; - This->lockedBox.Top = This->currentDesc.Height; - This->lockedBox.Front = This->currentDesc.Depth; - This->lockedBox.Right = 0; - This->lockedBox.Bottom = 0; - This->lockedBox.Back = 0; - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DVolumeImpl_AddDirtyBox(IWineD3DVolume *iface, CONST WINED3DBOX* pDirtyBox) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; This->dirty = TRUE; @@ -375,7 +363,6 @@ const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_UnlockBox, /* Internal interface */ IWineD3DVolumeImpl_AddDirtyBox, - IWineD3DVolumeImpl_CleanDirtyBox, IWineD3DVolumeImpl_LoadTexture, IWineD3DVolumeImpl_SetContainer }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 21e55c1..35bdacd 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2515,8 +2515,6 @@ interface IWineD3DVolume : IWineD3DResource HRESULT AddDirtyBox( [in] const WINED3DBOX *dirty_box ); - HRESULT CleanDirtyBox( - ); HRESULT LoadTexture( [in] int gl_level, [in] BOOL srgb_mode

1 0

Alistair Leslie-Hughes : msxml3: Add fixme for unsupported parameter.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 421dca6a96dcf1e38ad49c57342efab537b86262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421dca6a96dcf1e38ad49c573… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 14 08:29:27 2009 +1100 msxml3: Add fixme for unsupported parameter. --- dlls/msxml3/domdoc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a24f16f..11136ab 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1312,6 +1312,9 @@ static HRESULT WINAPI domdoc_createNode( TRACE("(%p)->(type,%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); + if(namespaceURI && namespaceURI[0]) + FIXME("nodes with namespaces currently not supported.\n"); + hr = get_node_type(Type, &node_type); if(FAILED(hr)) return hr;

1 0

Alistair Leslie-Hughes : mshtml: Add missing IHTMLCurrentStyle interfaces.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 022ae89e0fd463291be8d312d1fdc8021b87829e URL: http://source.winehq.org/git/wine.git/?a=commit;h=022ae89e0fd463291be8d312d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 13 19:22:54 2009 +1100 mshtml: Add missing IHTMLCurrentStyle interfaces. --- dlls/mshtml/htmlcurstyle.c | 4 +- include/mshtmdid.h | 11 ++++ include/mshtml.idl | 139 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f6a3a6a..0a93570 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -32,14 +32,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLCurrentStyle { DispatchEx dispex; const IHTMLCurrentStyleVtbl *lpIHTMLCurrentStyleVtbl; LONG ref; nsIDOMCSSStyleDeclaration *nsstyle; -} HTMLCurrentStyle; +}; #define HTMLCURSTYLE(x) ((IHTMLCurrentStyle*) &(x)->lpIHTMLCurrentStyleVtbl) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index d9c8f7c..c8c8b27 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -409,6 +409,11 @@ #define DISPID_A_TEXTOVERFLOW (DISPID_A_FIRST+209) #define DISPID_INTERNAL_CATTRIBUTECOLLPTRCACHE (DISPID_A_FIRST+210) #define DISPID_A_MINHEIGHT (DISPID_A_FIRST+211) +#define DISPID_INTERNAL_INVOKECONTEXTDOCUMENT (DISPID_A_FIRST+212) +#define DISPID_A_INTERPOLATION (DISPID_A_FIRST+213) +#define DISPID_A_MAXHEIGHT (DISPID_A_FIRST+214) +#define DISPID_A_MINWIDTH (DISPID_A_FIRST+215) +#define DISPID_A_MAXWIDTH (DISPID_A_FIRST+216) #define DISPID_WINDOWOBJECT (-5500) #define DISPID_LOCATIONOBJECT (-5506) @@ -2251,6 +2256,12 @@ #define DISPID_IHTMLCURRENTSTYLE3_WORDSPACING DISPID_A_WORDSPACING #define DISPID_IHTMLCURRENTSTYLE3_WHITESPACE DISPID_A_WHITESPACE +/* IHTMLCurrentStyle4 */ +#define DISPID_IHTMLCURRENTSTYLE4_MSINTERPOLATIONMODE DISPID_A_INTERPOLATION +#define DISPID_IHTMLCURRENTSTYLE4_MAXHEIGHT DISPID_A_MAXHEIGHT +#define DISPID_IHTMLCURRENTSTYLE4_MINWIDTH DISPID_A_MINWIDTH +#define DISPID_IHTMLCURRENTSTYLE4_MAXWIDTH DISPID_A_MAXWIDTH + /* HTMLTextContainerEvents2 */ #define DISPID_HTMLTEXTCONTAINEREVENTS2_ONCHANGE DISPID_EVMETH_ONCHANGE #define DISPID_HTMLTEXTCONTAINEREVENTS2_ONSELECT DISPID_EVMETH_ONSELECT diff --git a/include/mshtml.idl b/include/mshtml.idl index fa3fc97..4fdd5d3 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -2737,6 +2737,120 @@ interface IHTMLCurrentStyle : IDispatch } /***************************************************************************** + * IHTMLCurrentStyle2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f658-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLCurrentStyle2 : IDispatch +{ + [propget, id(DISPID_IHTMLCURRENTSTYLE2_LAYOUTFLOW), displaybind, bindable] + HRESULT layoutFlow([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_WORDWRAP), displaybind, bindable] + HRESULT wordWrap([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_TEXTUNDERLINEPOSITION), displaybind, bindable] + HRESULT textUnderlinePosition([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_HASLAYOUT), displaybind, bindable] + HRESULT hasLayout([retval, out] VARIANT_BOOL * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBARBASECOLOR), displaybind, bindable] + HRESULT scrollbarBaseColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBARFACECOLOR), displaybind, bindable] + HRESULT scrollbarFaceColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBAR3DLIGHTCOLOR), displaybind, bindable] + HRESULT scrollbar3dLightColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBARSHADOWCOLOR), displaybind, bindable] + HRESULT scrollbarShadowColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBARHIGHLIGHTCOLOR), displaybind, bindable] + HRESULT scrollbarHighlightColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBARDARKSHADOWCOLOR), displaybind, bindable] + HRESULT scrollbarDarkShadowColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBARARROWCOLOR), displaybind, bindable] + HRESULT scrollbarArrowColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_SCROLLBARTRACKCOLOR), displaybind, bindable] + HRESULT scrollbarTrackColor([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_WRITINGMODE), displaybind, bindable] + HRESULT writingMode([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_ZOOM), displaybind, bindable] + HRESULT zoom([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_FILTER), displaybind, bindable] + HRESULT filter([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_TEXTALIGNLAST), displaybind, bindable] + HRESULT textAlignLast([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_TEXTKASHIDASPACE), displaybind, bindable] + HRESULT textKashidaSpace([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE2_ISBLOCK), displaybind, bindable, hidden, restricted, nonbrowsable] + HRESULT isBlock([retval, out] VARIANT_BOOL * p); +} + +/***************************************************************************** + * IHTMLCurrentStyle3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f818-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLCurrentStyle3 : IDispatch +{ + [propget, id(DISPID_IHTMLCURRENTSTYLE3_TEXTOVERFLOW), displaybind, bindable] + HRESULT textOverflow([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE3_MINHEIGHT), displaybind, bindable] + HRESULT minHeight([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE3_WORDSPACING), displaybind, bindable] + HRESULT wordSpacing([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE3_WHITESPACE), displaybind, bindable] + HRESULT whiteSpace([retval, out] BSTR * p); +} + +/***************************************************************************** + * IHTMLCurrentStyle4 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f33b-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLCurrentStyle4 : IDispatch +{ + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MSINTERPOLATIONMODE), displaybind, bindable] + HRESULT msInterpolationMode([retval, out] BSTR * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MAXHEIGHT), displaybind, bindable] + HRESULT maxHeight([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MINWIDTH), displaybind, bindable] + HRESULT minWidth([retval, out] VARIANT * p); + + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MAXWIDTH), displaybind, bindable] + HRESULT maxWidth([retval, out] VARIANT * p); +}; + +/***************************************************************************** * DispHTMLCurrentStyle dispinterface */ [ @@ -3087,6 +3201,31 @@ methods: [propget, id(DISPID_IHTMLCURRENTSTYLE3_WHITESPACE), displaybind, bindable] BSTR whiteSpace(); + + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MSINTERPOLATIONMODE), displaybind, bindable] + BSTR msInterpolationMode(); + + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MAXHEIGHT), displaybind, bindable] + VARIANT maxHeight(); + + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MINWIDTH), displaybind, bindable] + VARIANT minWidth(); + + [propget, id(DISPID_IHTMLCURRENTSTYLE4_MAXWIDTH), displaybind, bindable] + VARIANT maxWidth(); +} + +[ + noncreatable, + uuid(3050f3dc-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLCurrentStyle +{ + [default] dispinterface DispHTMLCurrentStyle; + interface IHTMLCurrentStyle; + interface IHTMLCurrentStyle2; + interface IHTMLCurrentStyle3; + interface IHTMLCurrentStyle4; } /*****************************************************************************

1 0

Alexandre Julliard : winebuild: Add -b as a short option for --target for gcc compatibility.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 034a7f8849d6fa1c734cb14a824611a32d6871ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=034a7f8849d6fa1c734cb14a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 14 12:52:53 2009 +0100 winebuild: Add -b as a short option for --target for gcc compatibility. --- tools/winebuild/main.c | 13 ++++++------- tools/winebuild/winebuild.man.in | 10 +++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 31ef8a0..e88522f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -223,6 +223,7 @@ static const char usage_str[] = "Usage: winebuild [OPTIONS] [FILES]\n\n" "Options:\n" " --as-cmd=AS Command to use for assembling (default: as)\n" +" -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" " -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" @@ -247,7 +248,6 @@ static const char usage_str[] = " -r, --res=RSRC.RES Load resources from RSRC.RES\n" " --save-temps Do not delete the generated intermediate files\n" " --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" -" --target=TARGET Specify target CPU and platform for cross-compiling\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" @@ -274,11 +274,10 @@ enum long_options_values LONG_OPT_RELAY32, LONG_OPT_SAVE_TEMPS, LONG_OPT_SUBSYSTEM, - LONG_OPT_TARGET, LONG_OPT_VERSION }; -static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:d:e:f:hi:kl:m:o:r:u:vw"; +static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hi:kl:m:o:r:u:vw"; static const struct option long_options[] = { @@ -294,9 +293,9 @@ static const struct option long_options[] = { "relay32", 0, 0, LONG_OPT_RELAY32 }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, - { "target", 1, 0, LONG_OPT_TARGET }, { "version", 0, 0, LONG_OPT_VERSION }, /* aliases for short options */ + { "target", 1, 0, 'b' }, { "delay-lib", 1, 0, 'd' }, { "export", 1, 0, 'E' }, { "entry", 1, 0, 'e' }, @@ -372,6 +371,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case 'N': spec->dll_name = xstrdup( optarg ); break; + case 'b': + set_target( optarg ); + break; case 'd': add_delayed_import( optarg ); break; @@ -476,9 +478,6 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_SUBSYSTEM: set_subsystem( optarg, spec ); break; - case LONG_OPT_TARGET: - set_target( optarg ); - break; case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2e8aa75..08e8d1b 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -59,6 +59,11 @@ Wine internal usage only, you should never need to use this option. Specify the command to use to compile assembly files; the default is \fBas\fR. .TP +.BI \-b,\ --target= cpu-manufacturer[-kernel]-os +Specify the target CPU and platform on which the generated code will +be built. The target specification is in the standard autoconf format +as returned by config.sub. +.TP .BI \-d,\ --delay-lib= name Set the delayed import mode for the specified library, which must be one of the libraries imported with the \fB-l\fR option. Delayed mode @@ -199,11 +204,6 @@ argument array to use Unicode strings. A graphical executable has a Optionally a major and minor subsystem version can also be specified; the default subsystem version is 4.0. .TP -.BI --target= cpu-manufacturer[-kernel]-os -Specify the target CPU and platform on which the generated code will -be built. The target specification is in the standard autoconf format -as returned by config.sub. -.TP .BI \-u,\ --undefined= symbol Add \fIsymbol\fR to the list of undefined symbols when invoking the linker. This makes it possible to force a specific module of a static

1 0

Alexandre Julliard : configure: Specify the target flags directly from configure to avoid trouble on BSD make .
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 8c84636cd5a007d3f511809849a48ca27b0277bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c84636cd5a007d3f51180984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 14 12:53:42 2009 +0100 configure: Specify the target flags directly from configure to avoid trouble on BSD make. --- Make.rules.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makedll.rules.in | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 0c86aa1..b4020aa 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -43,7 +43,6 @@ STRIP = @STRIP@ WINDRES = @WINDRES@ LN = @LN@ LN_S = @LN_S@ -TARGET = @TARGET@ TOOLSDIR = @TOOLSDIR@ AS = @AS@ LD = @LD@ @@ -62,7 +61,8 @@ EXTRACFLAGS = @EXTRACFLAGS@ ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) -WINEBUILDFLAGS = $(DLLFLAGS) $(TARGET:%=--target %) --as-cmd "$(AS)" +TARGETFLAGS = @TARGETFLAGS@ +WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) --as-cmd "$(AS)" MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper diff --git a/configure b/configure index 48603ae..21acdc8 100755 --- a/configure +++ b/configure @@ -745,7 +745,7 @@ X_PRE_LIBS X_CFLAGS CPP XMKMF -TARGET +TARGETFLAGS TOOLSDIR WIN16_INSTALL WIN16_FILES @@ -3932,7 +3932,7 @@ TOOLSDIR=$wine_cv_toolsdir if test "$cross_compiling" = "yes" then - TARGET="$host_alias" + TARGETFLAGS="-b $host_alias" fi diff --git a/configure.ac b/configure.ac index 1a84d69..9ef2bff 100644 --- a/configure.ac +++ b/configure.ac @@ -166,7 +166,7 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) if test "$cross_compiling" = "yes" then - AC_SUBST(TARGET,"$host_alias") + AC_SUBST(TARGETFLAGS,"-b $host_alias") fi AC_PATH_XTRA diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index b043f9e..12be790 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%) $(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB) $(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC) - $(WINEBUILD) $(TARGET:%=--target %) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) + $(WINEBUILD) $(TARGETFLAGS) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS) $(RM) $@

1 0

Andrew Talbot : riched20: Declare some functions static.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: d287e8869178ae6048a3a175dc0bed690590be4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d287e8869178ae6048a3a175d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 13 23:25:51 2009 +0000 riched20: Declare some functions static. --- dlls/riched20/editor.h | 7 --- dlls/riched20/list.c | 42 +++++++------- dlls/riched20/paint.c | 47 ++++++++-------- dlls/riched20/para.c | 137 ++++++++++++++++++++++++------------------------ 4 files changed, 113 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d287e8869178ae6048a3a…

1 0

Dmitry Timoshkov : wordpad: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 1793f55f357cce115b6bda1c0993d94b79d57253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1793f55f357cce115b6bda1c0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:31:00 2009 +0800 wordpad: Use "-1" as a "don't care value", fix dialog id duplicates. --- programs/wordpad/Da.rc | 20 ++++++++++---------- programs/wordpad/De.rc | 20 ++++++++++---------- programs/wordpad/En.rc | 20 ++++++++++---------- programs/wordpad/Fr.rc | 20 ++++++++++---------- programs/wordpad/Hu.rc | 20 ++++++++++---------- programs/wordpad/Ja.rc | 20 ++++++++++---------- programs/wordpad/Ko.rc | 20 ++++++++++---------- programs/wordpad/Nl.rc | 20 ++++++++++---------- programs/wordpad/No.rc | 20 ++++++++++---------- programs/wordpad/Pl.rc | 20 ++++++++++---------- programs/wordpad/Pt.rc | 20 ++++++++++---------- programs/wordpad/Ru.rc | 20 ++++++++++---------- programs/wordpad/Si.rc | 20 ++++++++++---------- programs/wordpad/Tr.rc | 20 ++++++++++---------- programs/wordpad/Zh.rc | 40 ++++++++++++++++++++-------------------- 15 files changed, 160 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1793f55f357cce115b6bd…

1 0

Dmitry Timoshkov : wrc: Warn for duplicate dialog ids.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: c34b64d6d921c95a93abcb5b7e2e7d8f992bf8a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34b64d6d921c95a93abcb5b7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:31:29 2009 +0800 wrc: Warn for duplicate dialog ids. --- tools/wrc/parser.y | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index c0cc2ba..1742628 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1966,6 +1966,14 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control if(prev) prev->next = ctrl; + /* Check for duplicate identifiers */ + while (prev) + { + if (ctrl->id != -1 && ctrl->id == prev->id) + parser_warning("Duplicate dialog control id %d\n", ctrl->id); + prev = prev->prev; + } + if(type != -1) { ctrl->ctlclass = new_name_id();

1 0

Hervé Chanal : shell32: A nicer icon for desktop.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 831290e93d328ca19e277a656da4dd4fc767bb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831290e93d328ca19e277a656… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Tue Jan 13 16:58:41 2009 +0100 shell32: A nicer icon for desktop. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/desktop.ico | Bin 2998 -> 15086 bytes dlls/shell32/desktop.svg | 1118 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1119 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=831290e93d328ca19e277…

1 0