December 2006 - Wine-Commits

Jacek Caban : itss: Added test of protocol.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 1e65d4743c394b40615ff028515f57b974a16ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e65d4743c394b40615ff0285… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 16:09:41 2006 +0100 itss: Added test of protocol. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/itss/tests/Makefile.in | 18 ++ dlls/itss/tests/protocol.c | 439 ++++++++++++++++++++++++++ dlls/itss/tests/rsrc.rc | 675 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 10 files changed, 1143 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e65d4743c394b40615ff…

1 0

Jacek Caban : mshtml.idl: Added IHTMLFrameBase2 declaration.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 3b44fb3eb74a62752b86a16e4af8ac48e1316611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b44fb3eb74a62752b86a16e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 16:07:00 2006 +0100 mshtml.idl: Added IHTMLFrameBase2 declaration. --- include/mshtmdid.h | 11 +++++++++++ include/mshtml.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 19ecbe7..d2cad91 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -118,6 +118,10 @@ #define DISPID_EVENTS (DISPID_ATTRS+1000) #define DISPID_XOBJ_EXPANDO (DISPID_EVENTS+1000) #define DISPID_XOBJ_ORDINAL (DISPID_XOBJ_EXPANDO+1000) +#define DISPID_RADIO (DISPID_CHECKBOX+1000) +#define DISPID_FRAMESITE (DISPID_SITE+1000) +#define DISPID_FRAME (DISPID_FRAMESITE+1000) +#define DISPID_IFRAME (DISPID_FRAMESITE+1000) #define DISPID_WINDOW 1 #define DISPID_HISTORY 1 @@ -1825,4 +1829,11 @@ #define DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT DISPID_TEXTSITE+5 #define DISPID_IHTMLTEXTCONTAINER_ONSCROLL DISPID_EVPROP_ONSCROLL +/* IHTMLFrameBase2 */ +#define DISPID_IHTMLFRAMEBASE2_CONTENTWINDOW DISPID_FRAMESITE+9 +#define DISPID_IHTMLFRAMEBASE2_ONLOAD DISPID_EVPROP_ONLOAD +#define DISPID_IHTMLFRAMEBASE2_ONREADYSTATECHANGE DISPID_EVPROP_ONREADYSTATECHANGE +#define DISPID_IHTMLFRAMEBASE2_READYSTATE DISPID_A_READYSTATE +#define DISPID_IHTMLFRAMEBASE2_ALLOWTRANSPARENCY DISPID_A_ALLOWTRANSPARENCY + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index ce304c2..ae8ccec 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -5137,4 +5137,40 @@ coclass HTMLDocument [source] dispinterface HTMLDocumentEvents2; } +/***************************************************************************** + * IHTMLFrameBase2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f6db-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLFrameBase2 : IDispatch +{ + [propget, id(DISPID_IHTMLFRAMEBASE2_CONTENTWINDOW)] + HRESULT contentWindow([retval, out] IHTMLWindow2 **p); + + [propput, id(DISPID_IHTMLFRAMEBASE2_ONLOAD), displaybind, bindable] + HRESULT onload([in] VARIANT v); + + [propget, id(DISPID_IHTMLFRAMEBASE2_ONLOAD), displaybind, bindable] + HRESULT onload([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLFRAMEBASE2_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([in] VARIANT v); + + [propget, id(DISPID_IHTMLFRAMEBASE2_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([retval, out] VARIANT *p); + + [propget, id(DISPID_IHTMLFRAMEBASE2_READYSTATE)] + HRESULT readyState([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLFRAMEBASE2_ALLOWTRANSPARENCY)] + HRESULT allowTransparency([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLFRAMEBASE2_ALLOWTRANSPARENCY)] + HRESULT allowTransparency([retval, out] VARIANT_BOOL *p); +} + } /* library MSHTML */

1 0

Dmitry Timoshkov : user32: Check lParam of the HCBT_MINMAX hook message in ShowWindow tests.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: df9eeb666926f24105027389487bd591e63958e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9eeb666926f241050273894… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 25 16:41:43 2006 +0800 user32: Check lParam of the HCBT_MINMAX hook message in ShowWindow tests. --- dlls/user32/tests/msg.c | 66 ++++++++++++++++++++++++++++++---------------- 1 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c183437..77e223b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8345,7 +8345,7 @@ static const struct message WmShow[] = { { 0 } }; static const struct message WmShowNoActivate_1[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWNOACTIVATE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|0x8000 }, { WM_MOVE, sent|defwinproc }, @@ -8353,7 +8353,7 @@ static const struct message WmShowNoActi { 0 } }; static const struct message WmShowNoActivate_2[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWNOACTIVATE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, @@ -8376,7 +8376,7 @@ static const struct message WmShowNA_2[] { 0 } }; static const struct message WmRestore_1[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { HCBT_ACTIVATE, hook }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, @@ -8393,7 +8393,7 @@ static const struct message WmRestore_2[ { 0 } }; static const struct message WmRestore_3[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { HCBT_ACTIVATE, hook }, @@ -8405,7 +8405,15 @@ static const struct message WmRestore_3[ { 0 } }; static const struct message WmRestore_4[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|0x8000 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|0x8000 }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, + { 0 } +}; +static const struct message WmRestore_5[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWNORMAL }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|0x8000 }, { WM_MOVE, sent|defwinproc }, @@ -8432,7 +8440,7 @@ static const struct message WmHide_3[] = { 0 } }; static const struct message WmShowMinimized_1[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINIMIZED }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { HCBT_ACTIVATE, hook }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, @@ -8442,7 +8450,7 @@ static const struct message WmShowMinimi { 0 } }; static const struct message WmMinimize_1[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { HCBT_SETFOCUS, hook }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, @@ -8451,7 +8459,7 @@ static const struct message WmMinimize_1 { 0 } }; static const struct message WmMinimize_2[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, @@ -8459,7 +8467,7 @@ static const struct message WmMinimize_2 { 0 } }; static const struct message WmMinimize_3[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, @@ -8467,17 +8475,29 @@ static const struct message WmMinimize_3 { 0 } }; static const struct message WmShowMinNoActivate[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINNOACTIVE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; -static const struct message WmMinMax[] = { - { HCBT_MINMAX, hook }, +static const struct message WmMinMax_1[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINIMIZED }, + { 0 } +}; +static const struct message WmMinMax_2[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, + { 0 } +}; +static const struct message WmMinMax_3[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, + { 0 } +}; +static const struct message WmMinMax_4[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINNOACTIVE }, { 0 } }; static const struct message WmShowMaximized_1[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { HCBT_ACTIVATE, hook }, @@ -8489,7 +8509,7 @@ static const struct message WmShowMaximi { 0 } }; static const struct message WmShowMaximized_2[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, @@ -8503,7 +8523,7 @@ static const struct message WmShowMaximi { 0 } }; static const struct message WmShowMaximized_3[] = { - { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|0x8000 }, @@ -8529,11 +8549,11 @@ static void test_ShowWindow(void) /* 3 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 4 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 5 */ { SW_SHOWMINIMIZED, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinimized_1, TRUE }, -/* 6 */ { SW_SHOWMINIMIZED, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax, FALSE }, +/* 6 */ { SW_SHOWMINIMIZED, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_1, FALSE }, /* 7 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_1, FALSE }, /* 8 */ { SW_HIDE, FALSE, WS_MINIMIZE, WmEmptySeq, FALSE }, /* 9 */ { SW_SHOWMAXIMIZED, FALSE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_1, TRUE }, -/* 10 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax, FALSE }, +/* 10 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, /* 11 */ { SW_HIDE, TRUE, WS_MAXIMIZE, WmHide_1, FALSE }, /* 12 */ { SW_HIDE, FALSE, WS_MAXIMIZE, WmEmptySeq, FALSE }, /* 13 */ { SW_SHOWNOACTIVATE, FALSE, WS_VISIBLE, WmShowNoActivate_1, FALSE }, @@ -8543,10 +8563,10 @@ static void test_ShowWindow(void) /* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, TRUE }, /* 18 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, -/* 20 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax, FALSE }, +/* 20 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, TRUE }, /* 22 */ { SW_SHOWMINNOACTIVE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinNoActivate, TRUE }, -/* 23 */ { SW_SHOWMINNOACTIVE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax, FALSE }, +/* 23 */ { SW_SHOWMINNOACTIVE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_4, FALSE }, /* 24 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 25 */ { SW_HIDE, FALSE, WS_MINIMIZE, WmEmptySeq, FALSE }, /* 26 */ { SW_SHOWNA, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowNA_1, FALSE }, @@ -8564,16 +8584,16 @@ static void test_ShowWindow(void) /* 38 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 39 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, TRUE }, -/* 41 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax, FALSE }, +/* 41 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 42 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_2, TRUE }, -/* 43 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax, FALSE }, +/* 43 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, /* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, -/* 45 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax, FALSE }, +/* 45 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 46 */ { SW_RESTORE, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmRestore_3, TRUE }, /* 47 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmRestore_4, FALSE }, /* 48 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_3, FALSE }, /* 49 */ { SW_SHOW, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmEmptySeq, FALSE }, -/* 50 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmRestore_4, FALSE }, +/* 50 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmRestore_5, FALSE }, /* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE },

1 0

Dmitry Timoshkov : msvcrt: Make an internal function static, avoid a prototype.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: ada9dc9d4b7a14dbd41a432887e57451fdb00385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada9dc9d4b7a14dbd41a43288… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 25 16:41:14 2006 +0800 msvcrt: Make an internal function static, avoid a prototype. --- dlls/msvcrt/main.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 50ef5de..fa6affe 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -28,7 +28,18 @@ DWORD msvcrt_tls_index; static inline BOOL msvcrt_init_tls(void); static inline BOOL msvcrt_free_tls(void); -const char* msvcrt_get_reason(DWORD reason); + +static const char* msvcrt_get_reason(DWORD reason) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: return "DLL_PROCESS_ATTACH"; + case DLL_PROCESS_DETACH: return "DLL_PROCESS_DETACH"; + case DLL_THREAD_ATTACH: return "DLL_THREAD_ATTACH"; + case DLL_THREAD_DETACH: return "DLL_THREAD_DETACH"; + } + return "UNKNOWN"; +} /********************************************************************* * Init @@ -106,19 +117,6 @@ static inline BOOL msvcrt_free_tls(void) return TRUE; } -const char* msvcrt_get_reason(DWORD reason) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: return "DLL_PROCESS_ATTACH"; - case DLL_PROCESS_DETACH: return "DLL_PROCESS_DETACH"; - case DLL_THREAD_ATTACH: return "DLL_THREAD_ATTACH"; - case DLL_THREAD_DETACH: return "DLL_THREAD_DETACH"; - } - return "UNKNOWN"; -} - - /********************************************************************* * $I10_OUTPUT (MSVCRT.@) * Function not really understood but needed to make the DLL work

1 0

Jacek Caban : itss: Added ITS protocol implementation.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 1f6c8f975d4f9c16c72cfd9147a6e6f45c2c15a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6c8f975d4f9c16c72cfd914… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 16:08:20 2006 +0100 itss: Added ITS protocol implementation. --- dlls/itss/Makefile.in | 2 +- dlls/itss/protocol.c | 155 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 143 insertions(+), 14 deletions(-) diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 65f8967..612e419 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = itss.dll -IMPORTS = ole32 user32 advapi32 kernel32 ntdll +IMPORTS = urlmon ole32 user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid EXTRADEFS = -DCOM_NO_WINDOWS_H diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 5a192af..c278954 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -26,20 +26,36 @@ #include "ole2.h" #include "urlmon.h" #include "itsstor.h" +#include "chm_lib.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(itss); typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; + LONG ref; -} ITSProtocol; -#define PROTOCOL_THIS(iface) DEFINE_THIS(ITSProtocol, InternetProtocol, iface) + ULONG offset; + struct chmFile *chm_file; + struct chmUnitInfo chm_object; +} ITSProtocol; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +static void release_chm(ITSProtocol *This) +{ + if(This->chm_file) { + chm_close(This->chm_file); + This->chm_file = NULL; + } + This->offset = 0; +} + +#define PROTOCOL_THIS(iface) DEFINE_THIS(ITSProtocol, InternetProtocol, iface) + static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { ITSProtocol *This = PROTOCOL_THIS(iface); @@ -81,21 +97,120 @@ static ULONG WINAPI ITSProtocol_Release( TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + release_chm(This); HeapFree(GetProcessHeap(), 0, This); + ITSS_UnlockModule(); } return ref; } +static LPCWSTR skip_schema(LPCWSTR url) +{ + static const WCHAR its_schema[] = {'i','t','s',':'}; + static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; + static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; + + if(!strncmpiW(its_schema, url, sizeof(its_schema)/sizeof(WCHAR))) + return url+sizeof(its_schema)/sizeof(WCHAR); + if(!strncmpiW(msits_schema, url, sizeof(msits_schema)/sizeof(WCHAR))) + return url+sizeof(msits_schema)/sizeof(WCHAR); + if(!strncmpiW(mk_schema, url, sizeof(mk_schema)/sizeof(WCHAR))) + return url+sizeof(mk_schema)/sizeof(WCHAR); + + return NULL; +} + +static HRESULT report_result(IInternetProtocolSink *sink, HRESULT hres) +{ + IInternetProtocolSink_ReportResult(sink, hres, 0, NULL); + return hres; +} + static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, DWORD dwReserved) { ITSProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + BINDINFO bindinfo; + DWORD bindf = 0, len; + LPWSTR file_name, mime; + LPCWSTR object_name, path; + struct chmFile *chm_file; + struct chmUnitInfo chm_object; + int res; + HRESULT hres; + + static const WCHAR separator[] = {':',':',0}; + + TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - return E_NOTIMPL; + + path = skip_schema(szUrl); + if(!path) + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; + + memset(&bindinfo, 0, sizeof(bindinfo)); + bindinfo.cbSize = sizeof(BINDINFO); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); + if(FAILED(hres)) { + WARN("GetBindInfo failed: %08x\n", hres); + return hres; + } + + ReleaseBindInfo(&bindinfo); + + object_name = strstrW(path, separator); + if(!object_name) { + WARN("invalid url\n"); + return report_result(pOIProtSink, STG_E_FILENOTFOUND); + } + + len = object_name-path; + file_name = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + memcpy(file_name, path, len*sizeof(WCHAR)); + file_name[len] = 0; + chm_file = chm_openW(file_name); + if(!chm_file) { + WARN("Could not open chm file\n"); + return report_result(pOIProtSink, STG_E_FILENOTFOUND); + } + + object_name += 2; + memset(&chm_object, 0, sizeof(chm_object)); + res = chm_resolve_object(chm_file, object_name, &chm_object); + if(res != CHM_RESOLVE_SUCCESS) { + WARN("Could not resolve chm object\n"); + chm_close(chm_file); + return report_result(pOIProtSink, STG_E_FILENOTFOUND); + } + + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, object_name+1); + + /* FIXME: Native doesn't use FindMimeFromData */ + hres = FindMimeFromData(NULL, szUrl, NULL, 0, NULL, 0, &mime, 0); + if(SUCCEEDED(hres)) { + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); + CoTaskMemFree(mime); + } + + hres = IInternetProtocolSink_ReportData(pOIProtSink, + BSCF_FIRSTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, + chm_object.length, chm_object.length); + if(FAILED(hres)) { + WARN("ReportData failed: %08x\n", hres); + chm_close(chm_file); + return report_result(pOIProtSink, hres); + } + + hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_BEGINDOWNLOADDATA, NULL); + + release_chm(This); /* Native leaks handle here */ + This->chm_file = chm_file; + memcpy(&This->chm_object, &chm_object, sizeof(chm_object)); + + return report_result(pOIProtSink, hres); } static HRESULT WINAPI ITSProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) @@ -116,8 +231,10 @@ static HRESULT WINAPI ITSProtocol_Abort( static HRESULT WINAPI ITSProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { ITSProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + return S_OK; } static HRESULT WINAPI ITSProtocol_Suspend(IInternetProtocol *iface) @@ -138,8 +255,16 @@ static HRESULT WINAPI ITSProtocol_Read(I ULONG cb, ULONG *pcbRead) { ITSProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + + if(!This->chm_file) + return INET_E_DATA_NOT_AVAILABLE; + + *pcbRead = chm_retrieve_object(This->chm_file, &This->chm_object, pv, This->offset, cb); + This->offset += *pcbRead; + + return *pcbRead ? S_OK : S_FALSE; } static HRESULT WINAPI ITSProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, @@ -153,15 +278,19 @@ static HRESULT WINAPI ITSProtocol_Seek(I static HRESULT WINAPI ITSProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { ITSProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + return S_OK; } static HRESULT WINAPI ITSProtocol_UnlockRequest(IInternetProtocol *iface) { ITSProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return S_OK; } #undef PROTOCOL_THIS @@ -190,7 +319,7 @@ HRESULT ITSProtocol_create(IUnknown *pUn ITSS_LockModule(); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ITSProtocol)); + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITSProtocol)); ret->lpInternetProtocolVtbl = &ITSProtocolVtbl; ret->ref = 1;

1 0

Alexandre Julliard : make_makefiles: Automatically add IDL header targets to the .gitignore file.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 365a463b1ee402a4efb91f704e3f4c1906ec530f URL: http://source.winehq.org/git/wine.git/?a=commit;h=365a463b1ee402a4efb91f704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 24 17:31:52 2006 +0100 make_makefiles: Automatically add IDL header targets to the .gitignore file. --- dlls/.gitignore | 3 +++ dlls/atl/.gitignore | 1 - dlls/mshtml/.gitignore | 1 - dlls/ole32/.gitignore | 1 - tools/make_makefiles | 21 ++++++++++++++++----- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/.gitignore b/dlls/.gitignore index 5ed75aa..8a6627c 100644 --- a/dlls/.gitignore +++ b/dlls/.gitignore @@ -57,6 +57,7 @@ activeds/libactiveds.def advapi32/libadvapi32.def advpack/libadvpack.def +atl/atliface.h atl/libatl.def avicap32/libavicap32.def avifil32/libavifil32.def @@ -107,6 +108,7 @@ msacm32/libmsacm32.def mscms/libmscms.def msdmo/libmsdmo.def mshtml/libmshtml.def +mshtml/nsiface.h msi/libmsi.def msimg32/libmsimg32.def msvcrt/libmsvcrt.def @@ -122,6 +124,7 @@ ntdll/libntdll.def ntdsapi/libntdsapi.def odbc32/libodbc32.def odbccp32/libodbccp32.def +ole32/dcom.h ole32/libole32.def oleacc/liboleacc.def oleaut32/liboleaut32.def diff --git a/dlls/atl/.gitignore b/dlls/atl/.gitignore deleted file mode 100644 index 700b45e..0000000 --- a/dlls/atl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/atliface.h diff --git a/dlls/mshtml/.gitignore b/dlls/mshtml/.gitignore deleted file mode 100644 index cfac8eb..0000000 --- a/dlls/mshtml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/nsiface.h diff --git a/dlls/ole32/.gitignore b/dlls/ole32/.gitignore deleted file mode 100644 index 7a5ae85..0000000 --- a/dlls/ole32/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/dcom.h diff --git a/tools/make_makefiles b/tools/make_makefiles index 2a52f19..1fbd104 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -142,11 +142,17 @@ sub parse_makefile($) $make{"=rules"} = $makerules{$var}; next; } - if (/^(MODULE|IMPORTLIB|IMPLIB_SRCS|SPEC_SRCS16)\s*=\s*(.*)/) + if (/^(MODULE|IMPORTLIB)\s*=\s*(.*)/) { $make{$1} = $2; next; } + if (/^(IDL_H_SRCS|IMPLIB_SRCS|SPEC_SRCS16)\s*=\s*(.*)/) + { + my @list = split(/\s+/, $2); + $make{$1} = \@list; + next; + } if (/^\#\s*MKDLL_SKIP/ || /^\#\s*MKPROG_SKIP/) { $make{"=skip"} = 1; @@ -294,15 +300,16 @@ sub update_dlls(@) next unless defined $makefile{"MODULE"}; my $module = $makefile{"MODULE"}; + (my $dir = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/; if ($module =~ /^lib.*\.a$/) { - ($staticlib_dirs{$module} = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/; + $staticlib_dirs{$module} = $dir; die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module; } else { - ($directories{$module} = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/; + $directories{$module} = $dir; } if (defined $makefile{"IMPORTLIB"}) @@ -321,10 +328,14 @@ sub update_dlls(@) if (defined $makefile{"SPEC_SRCS16"}) { - my @list = split(/\s+/, $makefile{"SPEC_SRCS16"}); - @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @list; + my @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @{$makefile{"SPEC_SRCS16"}}; $altnames{$module} = \@list; } + + if (defined $makefile{"IDL_H_SRCS"}) + { + push @ignores, map { $_ =~ s/(.*)\.idl$/$dir\/$1.h/; $_; } @{$makefile{"IDL_H_SRCS"}}; + } } # output special dlls configure definitions

1 0

Louis Lenders : shlwapi: Fix a failing test.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: dff271df3ef355fa121bbcf5175b0b99398d11cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff271df3ef355fa121bbcf51… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Dec 24 08:09:04 2006 +0000 shlwapi: Fix a failing test. --- dlls/shlwapi/tests/path.c | 2 +- dlls/shlwapi/url.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 57fcbff..95f7e3f 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -481,7 +481,7 @@ static void test_UrlEscape(void) unsigned int i; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); - ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index df8a96f..e844e6e 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -844,7 +844,7 @@ HRESULT WINAPI UrlEscapeA( *pcchEscaped = lenA; } else { *pcchEscaped = lenA + 1; - ret = E_POINTER; + ret = E_INVALIDARG; } } if(escapedW != bufW) HeapFree(GetProcessHeap(), 0, escapedW);

1 0

Chris Robinson : wined3d: Clarify OpenGL error codes.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: e37755b60c2cc6ec1d539d39498fcb0480a3b7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37755b60c2cc6ec1d539d394… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Dec 23 18:05:51 2006 -0800 wined3d: Clarify OpenGL error codes. --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f569e8..0efe89b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -248,8 +248,8 @@ extern int num_lock; TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ \ } else do { \ - FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", \ - err, A, __FILE__, __LINE__); \ + FIXME(">>>>>>>>>>>>>>>>> %#x from %s @ %s / %d\n", \ + err, A, __FILE__, __LINE__); \ err = glGetError(); \ } while (err != GL_NO_ERROR); \ } @@ -332,7 +332,7 @@ extern const float identity[16]; VTRACE(("%s call ok %s / %d\n", A, __FILE__, __LINE__)); \ \ } else do { \ - FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", \ + FIXME(">>>>>>>>>>>>>>>>> %#x from %s @ %s / %d\n", \ err, A, __FILE__, __LINE__); \ err = glGetError(); \ } while (err != GL_NO_ERROR); \

1 0

Patrik Stridvall : user32: Show the GCL{, P}_* constant names in debug messages.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: 4189a89d41caa63df756c4c8c596c7fd01019527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4189a89d41caa63df756c4c8c… Author: Patrik Stridvall <patrik(a)stridvall.se> Date: Sat Dec 23 20:38:13 2006 +0100 user32: Show the GCL{,P}_* constant names in debug messages. --- dlls/user32/class.c | 3 ++- dlls/user32/spy.c | 35 +++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + 3 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 61edcc6..9817735 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -673,7 +673,8 @@ static ULONG_PTR CLASS_GetClassLong( HWN case GCLP_HICONSM: case GCLP_WNDPROC: case GCLP_MENUNAME: - FIXME( "offset %d not supported on other process window %p\n", offset, hwnd ); + FIXME( "offset %d (%s) not supported on other process window %p\n", + offset, SPY_GetClassLongOffsetName(offset), hwnd ); SetLastError( ERROR_INVALID_HANDLE ); break; case GCL_STYLE: diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 451b0b2..164101e 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -44,6 +44,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(message); #define DEBUG_SPY 0 +static const char * const ClassLongOffsetNames[] = +{ + "GCLP_MENUNAME", /* -8 */ + "GCLP_HBRBACKGROUND", /* -10 */ + "GCLP_HCURSOR", /* -12 */ + "GCLP_HICON", /* -14 */ + "GCLP_HMODULE", /* -16 */ + "GCL_CBWNDEXTRA", /* -18 */ + "GCL_CBCLSEXTRA", /* -20 */ + "?", + "GCLP_WNDPROC", /* -24 */ + "GCL_STYLE", /* -26 */ + "?", + "?", + "GCW_ATOM", /* -32 */ + "GCLP_HICONSM", /* -34 */ +}; + static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = { "WM_NULL", /* 0x00 */ @@ -2026,6 +2044,23 @@ static const USER_MSG *SPY_Bsearch_Msg( } /*********************************************************************** + * SPY_GetClassLongOffsetName + * + * Gets the name of a class long offset. + */ +const char *SPY_GetClassLongOffsetName( INT offset ) +{ + INT index; + if (offset < 0 && offset % 2 == 0 && ((index = -(offset + 8) / 2) < + sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) + { + return ClassLongOffsetNames[index]; + } + + return "?"; +} + +/*********************************************************************** * SPY_GetClassName * * Sets the value of "wnd_class" member of the instance structure. diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index ae27884..f939e4e 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -239,6 +239,7 @@ extern BOOL USER_SetWindowPos( WINDOWPOS #define SPY_RESULT_DEFWND16 0x0004 #define SPY_RESULT_DEFWND 0x0005 +extern const char *SPY_GetClassLongOffsetName( INT offset ); extern const char *SPY_GetMsgName( UINT msg, HWND hWnd ); extern const char *SPY_GetVKeyName(WPARAM wParam); extern void SPY_EnterMessage( INT iFlag, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );

1 0

Patrik Stridvall : secur32: Use constants instead of hardcoded values.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: f46da1f985753fbbfcb443c77c3a86c6cd9a4034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46da1f985753fbbfcb443c77… Author: Patrik Stridvall <patrik(a)stridvall.se> Date: Sat Dec 23 18:56:37 2006 +0100 secur32: Use constants instead of hardcoded values. --- dlls/secur32/ntlm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 853edd1..1c22342 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1769,8 +1769,11 @@ void SECUR32_initNTLMSP(void) else { ERR("%s was not found or is outdated. " - "Make sure that ntlm_auth >= 3.0.24 is in your path.\n", - ntlm_auth); + "Make sure that ntlm_auth >= %d.%d.%d is in your path.\n", + ntlm_auth, + MIN_NTLM_AUTH_MAJOR_VERSION, + MIN_NTLM_AUTH_MINOR_VERSION, + MIN_NTLM_AUTH_MICRO_VERSION); } cleanup_helper(helper); }

1 0