January 2012 - Wine-Commits

Jacek Caban : mshtml: Added more travel log tests.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: d9e57da4c7eed5648eb9eba68ce1b7fb825a180b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e57da4c7eed5648eb9eba68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 15:10:54 2012 +0100 mshtml: Added more travel log tests. --- dlls/mshtml/tests/htmldoc.c | 183 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 168 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9e57da4c7eed5648eb9e…

1 0

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

Jan. 20, 2012

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 Jan. 20, 2012

Jan. 20, 2012

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

Piotr Caban : urlmon: Added IInternetProtocol:: Switch PI_FORCE_ASYNC flag test.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 601ba02b265c01ca3040f27c5b60592bf76afdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601ba02b265c01ca3040f27c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 20 14:52:50 2012 +0100 urlmon: Added IInternetProtocol::Switch PI_FORCE_ASYNC flag test. --- dlls/urlmon/tests/url.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index fe98089..787c119 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -206,6 +206,7 @@ static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static BOOL abort_start = FALSE; static BOOL abort_progress = FALSE; +static BOOL async_switch = FALSE; static LPCWSTR urls[] = { winetest_data_urlW, @@ -803,9 +804,22 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink_AddRef(pOIProtSink); protocol_sink = pOIProtSink; - CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); - return S_OK; + if(async_switch) { + PROTOCOLDATA data; + + memset(&data, 0, sizeof(data)); + data.grfFlags = PI_FORCE_ASYNC; + prot_state = 0; + hres = IInternetProtocolSink_Switch(pOIProtSink, &data); + ok(hres == S_OK, "Switch failed: %08x\n", hres); + SET_EXPECT(Continue); + SetEvent(complete_event2); + return E_PENDING; + } else { + CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); + return S_OK; + } } if(test_protocol == FILE_TEST) { @@ -936,6 +950,18 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, return S_OK; switch(prot_state) { + case 0: + hres = IInternetProtocolSink_ReportProgress(protocol_sink, + BINDSTATUS_SENDINGREQUEST, NULL); + ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); + + hres = IInternetProtocolSink_ReportProgress(protocol_sink, + BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); + ok(hres == S_OK, + "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + + bscf |= BSCF_FIRSTDATANOTIFICATION|BSCF_INTERMEDIATEDATANOTIFICATION; + break; case 1: { IServiceProvider *service_provider; IHttpNegotiate *http_negotiate; @@ -990,6 +1016,15 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, if(prot_state != 2 || !test_abort) SET_EXPECT(Read); switch(prot_state) { + case 0: + hres = IInternetProtocolSink_ReportResult(protocol_sink, S_OK, 0, NULL); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + SET_EXPECT(OnProgress_SENDINGREQUEST); + SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); + SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); + SET_EXPECT(LockRequest); + SET_EXPECT(OnStopBinding); + break; case 1: if(bind_to_object) { SET_EXPECT(Obj_OnProgress_MIMETYPEAVAILABLE); @@ -1083,6 +1118,17 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ok(cb != 0, "cb == 0\n"); ok(pcbRead != NULL, "pcbRead == NULL\n"); + if(async_switch) { + if(prot_state++ > 1) { + *pcbRead = 0; + return S_FALSE; + } else { + memset(pv, '?', cb); + *pcbRead = cb; + return S_OK; + } + } + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { HRESULT hres; @@ -2687,6 +2733,7 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_INVALID_CN 0x0200 #define BINDTEST_ABORT_START 0x0400 #define BINDTEST_ABORT_PROGRESS 0x0800 +#define BINDTEST_ASYNC_SWITCH 0x1000 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2716,7 +2763,10 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) test_abort = (flags & BINDTEST_ABORT) != 0; abort_start = (flags & BINDTEST_ABORT_START) != 0; abort_progress = (flags & BINDTEST_ABORT_PROGRESS) != 0; + async_switch = (flags & BINDTEST_ASYNC_SWITCH) != 0; is_async_prot = protocol == HTTP_TEST || protocol == HTTPS_TEST || protocol == FTP_TEST || protocol == WINETEST_TEST; + prot_state = 0; + ResetEvent(complete_event); } static void test_BindToStorage(int protocol, DWORD flags, DWORD t) @@ -2907,6 +2957,13 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) } } + if(async_switch) { + CHECK_CALLED(OnProgress_SENDINGREQUEST); + CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); + CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); + CHECK_CALLED(LockRequest); + CHECK_CALLED(OnStopBinding); + } if(!no_callback) { CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); /* IE 8 */ CHECK_CALLED(GetBindInfo); @@ -3750,6 +3807,9 @@ START_TEST(url) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + trace("winetest test (async switch)...\n"); + test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_ASYNC_SWITCH, TYMED_ISTREAM); + trace("about test (no read)...\n"); test_BindToStorage(ABOUT_TEST, BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM);

1 0

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

Jan. 20, 2012

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

Piotr Caban : urlmon/tests: Test if url reported in IInternetProtocol:: Start is valid during binding.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 259cd7933612abdef0f88f446589ec489176ce7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=259cd7933612abdef0f88f446… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 20 14:53:02 2012 +0100 urlmon/tests: Test if url reported in IInternetProtocol::Start is valid during binding. --- dlls/urlmon/tests/url.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 787c119..b9291ac 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -192,6 +192,7 @@ static const WCHAR emptyW[] = {0}; static BOOL stopped_binding = FALSE, stopped_obj_binding = FALSE, emulate_protocol = FALSE, data_available = FALSE, http_is_first = TRUE, bind_to_object = FALSE, filedwl_api; static DWORD read = 0, bindf = 0, prot_state = 0, thread_id, tymed, security_problem; +static const WCHAR *reported_url; static CHAR mime_type[512]; static IInternetProtocolSink *protocol_sink = NULL; static IBinding *current_binding; @@ -620,6 +621,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, read = 0; + reported_url = szUrl; if(!filedwl_api) /* FIXME */ ok(szUrl && !lstrcmpW(szUrl, urls[test_protocol]), "wrong url %s\n", wine_dbgstr_w(szUrl)); ok(pOIProtSink != NULL, "pOIProtSink == NULL\n"); @@ -944,6 +946,7 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, CHECK_EXPECT(Continue); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); + ok(reported_url && !lstrcmpW(reported_url, urls[test_protocol]), "wrong url %s\n", wine_dbgstr_w(reported_url)); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(!pProtocolData)

1 0

Alexandre Julliard : include: Allow using windows.h in Wine code.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

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

Piotr Caban : urlmon: Added support for PI_FORCE_ASYNC flag in IInternetProtocol:: Switch implementation.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 1559fceeeaf590e37279beed882444f09df3d2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1559fceeeaf590e37279beed8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 20 14:52:34 2012 +0100 urlmon: Added support for PI_FORCE_ASYNC flag in IInternetProtocol::Switch implementation. --- dlls/urlmon/bindprot.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index aef74fc..0941e25 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -939,7 +939,8 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface return E_OUTOFMEMORY; memcpy(data, pProtocolData, sizeof(PROTOCOLDATA)); - if(!do_direct_notif(This)) { + if((This->pi&PI_APARTMENTTHREADED && pProtocolData->grfFlags&PI_FORCE_ASYNC) + || !do_direct_notif(This)) { switch_task_t *task; task = heap_alloc(sizeof(switch_task_t));

1 0

Nikolay Sivov : mshtml: Respond to SID_SContainerDispatch service id.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

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

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

Jan. 20, 2012

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