January 2012 - Wine-commits

Jacek Caban : ieframe: Added HTTP navigation and GoBack tests.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 14b790a54897749ee1b46e2c092df08f117f0c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b790a54897749ee1b46e2c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 18:26:55 2012 +0100 ieframe: Added HTTP navigation and GoBack tests. --- dlls/ieframe/tests/Makefile.in | 2 +- dlls/ieframe/tests/webbrowser.c | 132 ++++++++++++++++++++++++++++++++------- 2 files changed, 109 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14b790a54897749ee1b46…

1 0

Francois Gouget : po: Fix some typography issues and improve the Walloon translation.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: a0cb4e63552bd329f17f5afa1373a487be9123e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0cb4e63552bd329f17f5afa1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 20 00:05:02 2012 +0100 po: Fix some typography issues and improve the Walloon translation. --- po/wa.po | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/po/wa.po b/po/wa.po index 3ca2d80..d61dc52 100644 --- a/po/wa.po +++ b/po/wa.po @@ -390,7 +390,7 @@ msgstr "&No do fitchî:" #: comdlg32.rc:157 comdlg32.rc:179 msgid "&Directories:" -msgstr "&Ridants" +msgstr "&Ridants:" #: comdlg32.rc:160 comdlg32.rc:182 msgid "List Files of &Type:" @@ -785,7 +785,7 @@ msgstr "" #: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96 msgid "&Open" -msgstr "&Drovî..." +msgstr "&Drovî" #: comdlg32.rc:481 #, fuzzy @@ -1013,9 +1013,8 @@ msgid "Save" msgstr "" #: comdlg32.rc:142 -#, fuzzy msgid "Open File" -msgstr "Aidance di Wine" +msgstr "" #: comdlg32.rc:79 oleview.rc:95 msgid "Ready" @@ -3152,7 +3151,6 @@ msgid "&Window" msgstr "" #: ieframe.rc:31 view.rc:30 winhlp32.rc:29 -#, fuzzy msgid "&Open..." msgstr "&Drovî..." @@ -3834,9 +3832,8 @@ msgid "Broken pipe\n" msgstr "" #: winerror.mc:426 -#, fuzzy msgid "Open failed\n" -msgstr "Aidance di Wine" +msgstr "" #: winerror.mc:431 msgid "Buffer overflow\n" @@ -4198,9 +4195,8 @@ msgid "More data available\n" msgstr "" #: winerror.mc:886 -#, fuzzy msgid "Session canceled\n" -msgstr "Aidance di Wine" +msgstr "" #: winerror.mc:891 msgid "Invalid extended attribute name\n" @@ -5776,9 +5772,8 @@ msgid "Function could not be called\n" msgstr "" #: winerror.mc:2856 -#, fuzzy msgid "Function failed\n" -msgstr "Aidance di Wine" +msgstr "" #: winerror.mc:2861 msgid "Invalid table\n" @@ -5793,9 +5788,8 @@ msgid "Unsupported type\n" msgstr "" #: winerror.mc:2876 -#, fuzzy msgid "Creation failed\n" -msgstr "Aidance di Wine" +msgstr "" #: winerror.mc:2881 msgid "Temporary directory not writable\n" @@ -7035,9 +7029,8 @@ msgid "Create Control" msgstr "" #: oledlg.rc:62 -#, fuzzy msgid "Create From File" -msgstr "Aidance di Wine" +msgstr "" #: oledlg.rc:65 msgid "&Add Control..." @@ -7718,7 +7711,7 @@ msgstr "" #: shell32.rc:348 msgid "&Open:" -msgstr "" +msgstr "&Drovî:" #: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:136 @@ -8139,9 +8132,8 @@ msgid "" msgstr "" #: shell32.rc:266 -#, fuzzy msgid "Wine License" -msgstr "Aidance di Wine" +msgstr "" #: shell32.rc:155 msgid "Trash" @@ -9895,8 +9887,9 @@ msgid "&Wrap long lines" msgstr "Côper les ro&yes" #: notepad.rc:53 +#, fuzzy msgid "&Search...\tCtrl+F" -msgstr "Cwerî..." +msgstr "&Cwerî...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3" @@ -9977,10 +9970,9 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"Li fitchî '%s'\n" -"a candjî\n" +"Li fitchî '%s' a candjî.\n" "\n" -" El voloz schaper ?" +"El voloz schaper?" #: notepad.rc:80 msgid "'%s' could not be found." @@ -11940,7 +11932,7 @@ msgstr "" #: wineboot.rc:39 #, fuzzy msgid "Wine" -msgstr "Aidance di Wine" +msgstr "Wine" #: wineboot.rc:43 msgid "The Wine configuration in %s is being updated, please wait..." @@ -12877,7 +12869,7 @@ msgstr "&Fitchî" #: winefile.rc:147 msgid "&Directories" -msgstr "" +msgstr "&Ridants" #: winefile.rc:149 #, fuzzy @@ -13205,7 +13197,7 @@ msgstr "" #: wordpad.rc:28 #, fuzzy msgid "&New...\tCtrl+N" -msgstr "&Novea\tCtrl+N" +msgstr "&Novea...\tCtrl+N" #: wordpad.rc:42 #, fuzzy

1 0

André Hentschel : d3drm: Reorder frame creation function to avoid forward declarations.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: c5cf5f8ea8861e35c9d7b098003b3c3d5e3ba9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5cf5f8ea8861e35c9d7b0980… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 19 21:59:34 2012 +0100 d3drm: Reorder frame creation function to avoid forward declarations. --- dlls/d3drm/frame.c | 53 ++++++++++++++++++++++++--------------------------- 1 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 212f7dd..7c0d97a 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -35,9 +35,6 @@ typedef struct { LONG ref; } IDirect3DRMFrameImpl; -static const struct IDirect3DRMFrame2Vtbl Direct3DRMFrame2_Vtbl; -static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl; - static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame2_iface); @@ -48,31 +45,6 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface); } -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) -{ - IDirect3DRMFrameImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; - object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; - object->ref = 1; - - if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) - *ppObj = (IUnknown*)&object->IDirect3DRMFrame3_iface; - else - *ppObj = (IUnknown*)&object->IDirect3DRMFrame2_iface; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* iface, REFIID riid, void** object) @@ -1963,3 +1935,28 @@ static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl = IDirect3DRMFrame3Impl_SetMaterialOverride, IDirect3DRMFrame3Impl_GetMaterialOverride }; + +HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) +{ + IDirect3DRMFrameImpl* object; + + TRACE("(%p)\n", ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; + object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; + object->ref = 1; + + if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) + *ppObj = (IUnknown*)&object->IDirect3DRMFrame3_iface; + else + *ppObj = (IUnknown*)&object->IDirect3DRMFrame2_iface; + + return S_OK; +}

1 0

André Hentschel : d3drm: Reorder meshbuilder creation function to avoid forward declarations.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 2e3e62b6aa47a5a560a2e4778f5433846c52fc97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3e62b6aa47a5a560a2e4778… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 19 22:03:12 2012 +0100 d3drm: Reorder meshbuilder creation function to avoid forward declarations. --- dlls/d3drm/meshbuilder.c | 53 +++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 7ad7a38..72218ba 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -58,9 +58,6 @@ typedef struct { DWORD flags; } Header; -static const struct IDirect3DRMMeshBuilder2Vtbl Direct3DRMMeshBuilder2_Vtbl; -static const struct IDirect3DRMMeshBuilder3Vtbl Direct3DRMMeshBuilder3_Vtbl; - static char templates[] = { "xof 0302txt 0064" "template Header" @@ -292,31 +289,6 @@ static inline IDirect3DRMMeshBuilderImpl *impl_from_IDirect3DRMMeshBuilder3(IDir return CONTAINING_RECORD(iface, IDirect3DRMMeshBuilderImpl, IDirect3DRMMeshBuilder3_iface); } -HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) -{ - IDirect3DRMMeshBuilderImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshBuilderImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &Direct3DRMMeshBuilder2_Vtbl; - object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &Direct3DRMMeshBuilder3_Vtbl; - object->ref = 1; - - if (IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder3)) - *ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder3_iface; - else - *ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder2_iface; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMeshBuilder2* iface, REFIID riid, void** ppvObject) @@ -1968,3 +1940,28 @@ static const struct IDirect3DRMMeshBuilder3Vtbl Direct3DRMMeshBuilder3_Vtbl = IDirect3DRMMeshBuilder3Impl_GetNormals, IDirect3DRMMeshBuilder3Impl_GetNormalCount }; + +HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) +{ + IDirect3DRMMeshBuilderImpl* object; + + TRACE("(%p)\n", ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshBuilderImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &Direct3DRMMeshBuilder2_Vtbl; + object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &Direct3DRMMeshBuilder3_Vtbl; + object->ref = 1; + + if (IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder3)) + *ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder3_iface; + else + *ppObj = (IUnknown*)&object->IDirect3DRMMeshBuilder2_iface; + + return S_OK; +}

1 0

André Hentschel : d3drm: Forward all IUnknown methods from IDirect3DRMMeshBuilder3.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 9defecb013fba03c9eeef2d74eecde02e5c68082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9defecb013fba03c9eeef2d74… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 19 22:04:11 2012 +0100 d3drm: Forward all IUnknown methods from IDirect3DRMMeshBuilder3. --- dlls/d3drm/meshbuilder.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 72218ba..cea7da0 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -927,28 +927,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_QueryInterface(IDirect3DRMMesh static ULONG WINAPI IDirect3DRMMeshBuilder3Impl_AddRef(IDirect3DRMMeshBuilder3* iface) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - TRACE("(%p)\n", This); - - return InterlockedIncrement(&This->ref); + return IDirect3DRMMeshBuilder2_AddRef(&This->IDirect3DRMMeshBuilder2_iface); } static ULONG WINAPI IDirect3DRMMeshBuilder3Impl_Release(IDirect3DRMMeshBuilder3* iface) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)\n", This); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This->pVertices); - HeapFree(GetProcessHeap(), 0, This->pNormals); - HeapFree(GetProcessHeap(), 0, This->pFaceData); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; + return IDirect3DRMMeshBuilder2_Release(&This->IDirect3DRMMeshBuilder2_iface); } /*** IDirect3DRMObject methods ***/

1 0

André Hentschel : d3drm: Reorder d3drm creation function to avoid forward declarations.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: dfd7c70d37e13cb9c6fe79b02b7e10a57b2e9191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd7c70d37e13cb9c6fe79b02… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 19 22:05:06 2012 +0100 d3drm: Reorder d3drm creation function to avoid forward declarations. --- dlls/d3drm/d3drm.c | 50 +++++++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 02a7c55..2850c7f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -37,10 +37,6 @@ typedef struct { LONG ref; } IDirect3DRMImpl; -static const struct IDirect3DRMVtbl Direct3DRM_Vtbl; -static const struct IDirect3DRM2Vtbl Direct3DRM2_Vtbl; -static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl; - static inline IDirect3DRMImpl *impl_from_IDirect3DRM(IDirect3DRM *iface) { return CONTAINING_RECORD(iface, IDirect3DRMImpl, IDirect3DRM_iface); @@ -56,29 +52,6 @@ static inline IDirect3DRMImpl *impl_from_IDirect3DRM3(IDirect3DRM3 *iface) return CONTAINING_RECORD(iface, IDirect3DRMImpl, IDirect3DRM3_iface); } -HRESULT Direct3DRM_create(IUnknown** ppObj) -{ - IDirect3DRMImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; - object->IDirect3DRM2_iface.lpVtbl = &Direct3DRM2_Vtbl; - object->IDirect3DRM3_iface.lpVtbl = &Direct3DRM3_Vtbl; - object->ref = 1; - - *ppObj = (IUnknown*)&object->IDirect3DRM_iface; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMImpl_QueryInterface(IDirect3DRM* iface, REFIID riid, void** ppvObject) { @@ -1378,3 +1351,26 @@ static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl = IDirect3DRM3Impl_SetOptions, IDirect3DRM3Impl_GetOptions }; + +HRESULT Direct3DRM_create(IUnknown** ppObj) +{ + IDirect3DRMImpl* object; + + TRACE("(%p)\n", ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; + object->IDirect3DRM2_iface.lpVtbl = &Direct3DRM2_Vtbl; + object->IDirect3DRM3_iface.lpVtbl = &Direct3DRM3_Vtbl; + object->ref = 1; + + *ppObj = (IUnknown*)&object->IDirect3DRM_iface; + + return S_OK; +}

1 0

André Hentschel : d3drm: Forward all IUnknown methods to IDirect3DRM.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 0c0b6a10965eef238ce6a7aaabdff80bec2365d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0b6a10965eef238ce6a7aaa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 19 22:06:08 2012 +0100 d3drm: Forward all IUnknown methods to IDirect3DRM. --- dlls/d3drm/d3drm.c | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 2850c7f..879d8b0 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -452,23 +452,13 @@ static HRESULT WINAPI IDirect3DRM2Impl_QueryInterface(IDirect3DRM2* iface, REFII static ULONG WINAPI IDirect3DRM2Impl_AddRef(IDirect3DRM2* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - TRACE("(%p/%p)\n", iface, This); - - return InterlockedIncrement(&This->ref); + return IDirect3DRM_AddRef(&This->IDirect3DRM_iface); } static ULONG WINAPI IDirect3DRM2Impl_Release(IDirect3DRM2* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p/%p)\n", iface, This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IDirect3DRM_Release(&This->IDirect3DRM_iface); } /*** IDirect3DRM2 methods ***/ @@ -883,23 +873,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_QueryInterface(IDirect3DRM3* iface, REFII static ULONG WINAPI IDirect3DRM3Impl_AddRef(IDirect3DRM3* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - TRACE("(%p/%p)\n", iface, This); - - return InterlockedIncrement(&This->ref); + return IDirect3DRM_AddRef(&This->IDirect3DRM_iface); } static ULONG WINAPI IDirect3DRM3Impl_Release(IDirect3DRM3* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p/%p)\n", iface, This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IDirect3DRM_Release(&This->IDirect3DRM_iface); } /*** IDirect3DRM3 methods ***/

1 0

Alexandre Julliard : include: Allow using windows.h in Wine code.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 25441f40f8c9e719b201caf7ad98b30b44c8e55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25441f40f8c9e719b201caf7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 15:14:31 2012 +0100 include: Allow using windows.h in Wine code. --- dlls/windowscodecs/icnsformat.c | 24 ++++++++++++++++++++++++ include/aclapi.h | 4 +--- include/d3d8.h | 6 +----- include/d3d9.h | 6 +----- include/d3dtypes.h | 5 +---- include/dmplugin.h | 2 -- include/dmusicc.h | 2 -- include/dmusicf.h | 2 -- include/dmusici.h | 4 ---- include/dshow.h | 6 +----- include/mapidefs.h | 5 +---- include/oledlg.h | 4 +--- include/pdh.h | 6 +----- include/rpc.h | 10 +--------- include/sddl.h | 4 ++-- include/snmp.h | 6 +----- include/tapi.h | 4 +--- include/usp10.h | 4 +--- include/windows.h | 8 ++++---- include/winsock.h | 6 +----- 20 files changed, 43 insertions(+), 75 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index de38715..c777581 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -25,6 +25,18 @@ #define GetCurrentProcess GetCurrentProcess_Mac #define GetCurrentThread GetCurrentThread_Mac #define LoadResource LoadResource_Mac +#define AnimatePalette AnimatePalette_Mac +#define EqualRgn EqualRgn_Mac +#define FillRgn FillRgn_Mac +#define FrameRgn FrameRgn_Mac +#define GetPixel GetPixel_Mac +#define InvertRgn InvertRgn_Mac +#define LineTo LineTo_Mac +#define OffsetRgn OffsetRgn_Mac +#define PaintRgn PaintRgn_Mac +#define Polygon Polygon_Mac +#define ResizePalette ResizePalette_Mac +#define SetRectRgn SetRectRgn_Mac #define EqualRect EqualRect_Mac #define FillRect FillRect_Mac #define FrameRect FrameRect_Mac @@ -40,6 +52,18 @@ #undef GetCurrentProcess #undef GetCurrentThread #undef LoadResource +#undef AnimatePalette +#undef EqualRgn +#undef FillRgn +#undef FrameRgn +#undef GetPixel +#undef InvertRgn +#undef LineTo +#undef OffsetRgn +#undef PaintRgn +#undef Polygon +#undef ResizePalette +#undef SetRectRgn #undef EqualRect #undef FillRect #undef FrameRect diff --git a/include/aclapi.h b/include/aclapi.h index 249cd03..cd818bc 100644 --- a/include/aclapi.h +++ b/include/aclapi.h @@ -19,9 +19,7 @@ #ifndef __WINE_ACLAPI_H #define __WINE_ACLAPI_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> #include <accctrl.h> #ifdef __cplusplus diff --git a/include/d3d8.h b/include/d3d8.h index e98c369..010ab83 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -27,11 +27,7 @@ #define COM_NO_WINDOWS_H #include <objbase.h> - -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <d3d8types.h> #include <d3d8caps.h> diff --git a/include/d3d9.h b/include/d3d9.h index 0ceb23f..e7636e5 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -28,11 +28,7 @@ #define COM_NO_WINDOWS_H #include <objbase.h> - -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <d3d9types.h> #include <d3d9caps.h> diff --git a/include/d3dtypes.h b/include/d3dtypes.h index a4030e6..256d99a 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -25,10 +25,7 @@ #ifndef __WINE_D3DTYPES_H #define __WINE_D3DTYPES_H -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <float.h> #include <ddraw.h> diff --git a/include/dmplugin.h b/include/dmplugin.h index 6cf3114..ccd9f6b 100644 --- a/include/dmplugin.h +++ b/include/dmplugin.h @@ -21,9 +21,7 @@ #ifndef __WINE_DMUSIC_PLUGIN_H #define __WINE_DMUSIC_PLUGIN_H -#ifndef __WINESRC__ #include <windows.h> -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dmusicc.h b/include/dmusicc.h index 7aac00b..9c07737 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -20,9 +20,7 @@ #ifndef __WINE_DMUSIC_CORE_H #define __WINE_DMUSIC_CORE_H -#ifndef __WINESRC__ #include <windows.h> -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dmusicf.h b/include/dmusicf.h index 6906ecc..bf488e5 100644 --- a/include/dmusicf.h +++ b/include/dmusicf.h @@ -21,9 +21,7 @@ #ifndef __WINE_DMUSIC_FILEFORMATS_H #define __WINE_DMUSIC_FILEFORMATS_H -#ifndef __WINESRC__ #include <windows.h> -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dmusici.h b/include/dmusici.h index 82a137b..81fc3f8 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -21,11 +21,7 @@ #ifndef __WINE_DMUSIC_PERFORMANCE_H #define __WINE_DMUSIC_PERFORMANCE_H -#ifndef __WINESRC__ #include <windows.h> -#else -#include <oleauto.h> /* VARIANT */ -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dshow.h b/include/dshow.h index 3451609..50e581c 100644 --- a/include/dshow.h +++ b/include/dshow.h @@ -21,13 +21,9 @@ #define AM_NOVTABLE +#include <windows.h> #ifndef __WINESRC__ -# include <windows.h> # include <windowsx.h> -#else -# include <windef.h> -# include <wingdi.h> -# include <objbase.h> #endif #include <olectl.h> #include <ddraw.h> diff --git a/include/mapidefs.h b/include/mapidefs.h index cd6d8b0..2206e70 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -20,10 +20,7 @@ #ifndef MAPIDEFS_H #define MAPIDEFS_H -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <winerror.h> #include <objbase.h> #include <stddef.h> diff --git a/include/oledlg.h b/include/oledlg.h index 29f842f..f009d76 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -21,9 +21,7 @@ #ifndef __WINE_OLEDLG_H #define __WINE_OLEDLG_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> #include <shellapi.h> #include <commdlg.h> #include <ole2.h> diff --git a/include/pdh.h b/include/pdh.h index 30591ac..a25eb2e 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -21,11 +21,7 @@ #ifndef _PDH_H_ #define _PDH_H_ -#ifdef __WINESRC__ -# include <windef.h> -#else -# include <windows.h> -#endif +#include <windows.h> #include <winperf.h> #ifdef __cplusplus diff --git a/include/rpc.h b/include/rpc.h index 3e7e129..eb7d041 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -19,15 +19,7 @@ */ #ifndef RPC_NO_WINDOWS_H -# ifdef __WINESRC__ -# ifndef RC_INVOKED -# include <stdarg.h> -# endif -# include <windef.h> -# include <winbase.h> -# else -# include <windows.h> -# endif +# include <windows.h> #endif #ifndef __WINE_RPC_H diff --git a/include/sddl.h b/include/sddl.h index 866b699..badd6fa 100644 --- a/include/sddl.h +++ b/include/sddl.h @@ -26,7 +26,7 @@ extern "C" { #define SDDL_REVISION_1 1 #define SDDL_REVISION SDDL_REVISION_1 -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS /* Component tags */ #ifndef UNICODE # define SDDL_OWNER "O" @@ -91,7 +91,7 @@ extern "C" { static const WCHAR SDDL_ACE_END[] = { ')',0 }; # endif #endif /* UNICODE */ -#endif /* __WINESRC__ */ +#endif /* WINE_NO_UNICODE_MACROS */ BOOL WINAPI ConvertSidToStringSidA( PSID, LPSTR* ); BOOL WINAPI ConvertSidToStringSidW( PSID, LPWSTR* ); diff --git a/include/snmp.h b/include/snmp.h index cedf7b0..0530fc6 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -18,11 +18,7 @@ #ifndef _WINE_SNMP_H #define _WINE_SNMP_H -#ifndef __WINESRC__ -# include <windows.h> -#else -# include <windef.h> -#endif +#include <windows.h> #include <pshpack4.h> diff --git a/include/tapi.h b/include/tapi.h index 564b118..9af7ea5 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -21,9 +21,7 @@ #ifndef __WINE_TAPI_H #define __WINE_TAPI_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> #include <basetsd.h> #include <oaidl.h> diff --git a/include/usp10.h b/include/usp10.h index e84eeb7..09416ae 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -20,9 +20,7 @@ #ifndef __USP10_H #define __USP10_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> /* FIXME: #include <specstrings.h> */ #ifdef __cplusplus diff --git a/include/windows.h b/include/windows.h index 14f6ce9..ec5c6a2 100644 --- a/include/windows.h +++ b/include/windows.h @@ -19,10 +19,6 @@ #ifndef __WINE_WINDOWS_H #define __WINE_WINDOWS_H -#ifdef __WINESRC__ -#error Wine should not include windows.h internally -#endif - #if defined(_MSC_VER) && (_MSC_VER >= 800) && !defined(__cplusplus) /* TYPE_ALIGNMENT generates this - move it outside the warning push/pop scope. */ # pragma warning(disable:4116) @@ -49,6 +45,8 @@ #include <winnetwk.h> /* Not so essential ones */ +#ifndef __WINESRC__ + #ifndef WIN32_LEAN_AND_MEAN #include <cderr.h> @@ -102,6 +100,8 @@ #include <imm.h> #endif /* !NOIMM */ +#endif /* __WINESRC__ */ + #endif /* RC_INVOKED && !NOWINRES */ #endif /* _INC_WINDOWS */ #endif /* __WINE_WINDOWS_H */ diff --git a/include/winsock.h b/include/winsock.h index a938d59..06e6309 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -107,11 +107,7 @@ #endif /* __WINE_WINSOCKAPI_STDLIB_H */ -#ifndef __WINESRC__ -# include <windows.h> -#else -# include <windef.h> -#endif +#include <windows.h> #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_

1 0

Alexandre Julliard : widl: We no longer need to avoid windows. h in generated headers.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 42e583f1f6b2c0c9f963251495661ea8c11be005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e583f1f6b2c0c9f96325149… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 15:59:02 2012 +0100 widl: We no longer need to avoid windows.h in generated headers. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index fc9cbf1..00d6e76 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1366,7 +1366,7 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" ); - fprintf(header, "#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)\n"); + fprintf(header, "#ifndef COM_NO_WINDOWS_H\n"); fprintf(header, "#include <windows.h>\n"); fprintf(header, "#include <ole2.h>\n"); fprintf(header, "#endif\n\n");

1 0

Nikolay Sivov : mshtml: Respond to SID_SContainerDispatch service id.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 478ddf7b6c6a2532e1aaab1467ac717ebc1e2685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478ddf7b6c6a2532e1aaab146… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 15:12:13 2012 +0300 mshtml: Respond to SID_SContainerDispatch service id. --- dlls/mshtml/service.c | 5 +++++ dlls/mshtml/tests/htmldoc.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index ed95f49..9cafbf0 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -249,6 +249,11 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IOleUndoManager_QueryInterface(This->doc_obj->undomgr, riid, ppv); } + if(IsEqualGUID(&SID_SContainerDispatch, guidService)) { + TRACE("SID_SContainerDispatch\n"); + return IHTMLDocument2_QueryInterface(&This->IHTMLDocument2_iface, riid, ppv); + } + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); if(This->doc_obj->client) { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a79e50e..85fbd9b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -47,6 +47,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -7135,6 +7136,46 @@ static BOOL check_ie(void) return SUCCEEDED(hres); } +static void test_ServiceProvider(void) +{ + IHTMLDocument3 *doc3, *doc3_2; + IServiceProvider *provider; + IHTMLDocument2 *doc, *doc2; + IUnknown *unk; + HRESULT hres; + + doc = create_document(); + if(!doc) + return; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IServiceProvider, (void**)&provider); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc2, (IUnknown*)doc), "got wrong pointer\n"); + IHTMLDocument2_Release(doc2); + + hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc3, (IUnknown*)doc), "got wrong pointer\n"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3_2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc3_2, (IUnknown*)doc), "got wrong pointer\n"); + ok(iface_cmp((IUnknown*)doc3_2, (IUnknown*)doc3), "got wrong pointer\n"); + IHTMLDocument3_Release(doc3); + IHTMLDocument3_Release(doc3_2); + + hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc, unk), "got wrong pointer\n"); + + IUnknown_Release(unk); + IServiceProvider_Release(provider); + release_document(doc); +} + START_TEST(htmldoc) { CoInitialize(NULL); @@ -7169,6 +7210,7 @@ START_TEST(htmldoc) test_UIActivate(TRUE, TRUE, TRUE); test_HTMLDoc_ISupportErrorInfo(); test_IPersistHistory(); + test_ServiceProvider(); DestroyWindow(container_hwnd); CoUninitialize();

1 0