February 2006 - Wine-Commits

Juan Lang : crypt32: Move break statement to the correct spot.
by Alexandre Julliard Feb. 10, 2006

Feb. 10, 2006

Module: wine Branch: refs/heads/master Commit: 4b689fbbb56944ca0c8011d50acfa9cc7b4c4f03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b689fbbb56944ca0c8011d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Feb 10 14:50:00 2006 +0100 crypt32: Move break statement to the correct spot. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 52cd987..787f079 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2110,8 +2110,8 @@ static BOOL WINAPI CRYPT_GetCertificateC ret = TRUE; } found = TRUE; + break; } - break; } if (!found) {

1 0

Jacek Caban : mshtml: Added test of IHlinkFrame service.
by Alexandre Julliard Feb. 10, 2006

Feb. 10, 2006

Module: wine Branch: refs/heads/master Commit: 4a34d8e6424a5174ab52c657fc9ab5d8c8995465 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a34d8e6424a5174ab52c65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 14:49:48 2006 +0100 mshtml: Added test of IHlinkFrame service. --- dlls/mshtml/tests/htmldoc.c | 180 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 172 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 45e9530..e4c638b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -43,17 +43,23 @@ DEFINE_GUID(CGID_MSHTML, 0xDE4BA900,0x59 expect_ ## func = TRUE #define CHECK_EXPECT(func) \ - ok(expect_ ##func, "unexpected call\n"); \ - expect_ ## func = FALSE; \ - called_ ## func = TRUE + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + expect_ ## func = FALSE; \ + called_ ## func = TRUE; \ + }while(0) #define CHECK_EXPECT2(func) \ - ok(expect_ ##func, "unexpected call\n"); \ - called_ ## func = TRUE + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) #define CHECK_CALLED(func) \ - ok(called_ ## func, "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; @@ -95,6 +101,7 @@ DEFINE_EXPECT(Invoke_AMBIENT_USERAGENT); DEFINE_EXPECT(Invoke_AMBIENT_PALETTE); DEFINE_EXPECT(GetDropTarget); DEFINE_EXPECT(UpdateUI); +DEFINE_EXPECT(Navigate); static BOOL expect_LockContainer_fLock; static BOOL expect_SetActiveObject_active; @@ -110,6 +117,100 @@ static LPCOLESTR expect_status_text = NU static HRESULT QueryInterface(REFIID riid, void **ppv); +static HRESULT WINAPI HlinkFrame_QueryInterface(IHlinkFrame *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI HlinkFrame_AddRef(IHlinkFrame *iface) +{ + return 2; +} + +static ULONG WINAPI HlinkFrame_Release(IHlinkFrame *iface) +{ + return 1; +} + +static HRESULT WINAPI HlinkFrame_SetBrowseContext(IHlinkFrame *iface, + IHlinkBrowseContext *pihlbc) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkFrame_GetBrowseContext(IHlinkFrame *iface, + IHlinkBrowseContext **ppihlbc) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPBC pbc, + IBindStatusCallback *pibsc, IHlink *pihlNavigate) +{ + HRESULT hres; + + CHECK_EXPECT(Navigate); + + ok(grfHLNF == 0, "grfHLNF=%ld, expected 0\n", grfHLNF); + ok(pbc != NULL, "pbc == NULL\n"); + ok(pibsc != NULL, "pubsc == NULL\n"); + ok(pihlNavigate != NULL, "puhlNavigate == NULL\n"); + + if(pihlNavigate) { + LPWSTR frame_name = (LPWSTR)0xdeadbeef; + LPWSTR location = (LPWSTR)0xdeadbeef; + IHlinkSite *site; + IMoniker *mon = NULL; + DWORD site_data = 0xdeadbeef; + + hres = IHlink_GetTargetFrameName(pihlNavigate, &frame_name); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08lx\n", hres); + ok(frame_name == NULL, "frame_name = %p\n", frame_name); + + hres = IHlink_GetMonikerReference(pihlNavigate, 1, &mon, &location); + ok(hres == S_OK, "GetMonikerReference failed: %08lx\n", hres); + ok(location == NULL, "location = %p\n", location); + ok(mon != NULL, "mon == NULL\n"); + + hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data); + ok(hres == S_OK, "GetHlinkSite failed: %08lx\n", hres); + ok(site == NULL, "site = %p\n, expected NULL", site); + ok(site_data == 0xdeadbeef, "site_data = %lx\n", site_data); + } + + return S_OK; +} + +static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, + IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, DWORD dwreserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkFrame_UpdateHlink(IHlinkFrame *iface, ULONG uHLID, + IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IHlinkFrameVtbl HlinkFrameVtbl = { + HlinkFrame_QueryInterface, + HlinkFrame_AddRef, + HlinkFrame_Release, + HlinkFrame_SetBrowseContext, + HlinkFrame_GetBrowseContext, + HlinkFrame_Navigate, + HlinkFrame_OnNavigate, + HlinkFrame_UpdateHlink +}; + +static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; + static HRESULT WINAPI OleContainer_QueryInterface(IOleContainer *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); @@ -1053,6 +1154,68 @@ static IDispatchVtbl DispatchVtbl = { static IDispatch Dispatch = { &DispatchVtbl }; +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, + REFIID riid, void **ppv) +{ + return QueryInterface(riid, ppv); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + /* + * Services used by HTMLDocument: + * + * IOleUndoManager + * IInternetSecurityManager + * ITargetFrame + * {D5F78C80-5252-11CF-90FA-00AA0042106E} + * HTMLFrameBase + * IShellObject + * {3050F312-98B5-11CF-BB82-00AA00BDCE0B} + * {53A2D5B1-D2FC-11D0-84E0-006097C9987D} + * {AD7F6C62-F6BD-11D2-959B-006097C553C8} + * DefView (?) + * {6D12FE80-7911-11CF-9534-0000C05BAE0B} + * IElementBehaviorFactory + * {3050F429-98B5-11CF-BB82-00AA00BDCE0B} + * STopLevelBrowser + * IHTMLWindow2 + * IInternetProtocol + * IWebBrowserApp + * UrlHostory + * IHTMLEditHost + * IHlinkFrame + */ + + if(IsEqualGUID(&IID_IHlinkFrame, guidService)) { + ok(IsEqualGUID(&IID_IHlinkFrame, riid), "unexpected riid\n"); + *ppv = &HlinkFrame; + return S_OK; + } + + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; + static HRESULT QueryInterface(REFIID riid, void **ppv) { *ppv = NULL; @@ -1073,9 +1236,10 @@ static HRESULT QueryInterface(REFIID rii *ppv = &OleCommandTarget; else if(IsEqualGUID(&IID_IDispatch, riid)) *ppv = &Dispatch; + else if(IsEqualGUID(&IID_IServiceProvider, riid)) + *ppv = &ServiceProvider; /* TODO: - * IServiceProvider * IOleInPlaceSiteEx * {D48A6EC6-6A4A-11CF-94A7-444553540000} * {7BB0B520-B1A7-11D2-BB23-00C04F79ABCD}

1 0

Jacek Caban : mshtml: Added nsIUploadStream implementation.
by Alexandre Julliard Feb. 10, 2006

Feb. 10, 2006

Module: wine Branch: refs/heads/master Commit: af6395774c10b4e7932e3044af5ce9dbf380b046 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af6395774c10b4e7932e304… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 14:49:41 2006 +0100 mshtml: Added nsIUploadStream implementation. --- dlls/mshtml/nsiface.idl | 28 +++++++++++++ dlls/mshtml/nsio.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 603e7d7..382e7b9 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -68,7 +68,6 @@ interface nsISupports /* Currently we don't need a full declaration of these interfaces */ typedef nsISupports nsIWeakReference; typedef nsISupports nsIDOMWindow; -typedef nsISupports nsIInputStream; typedef nsISupports nsIDOMDocument; typedef nsISupports nsISHistory; typedef nsISupports nsISimpleEnumerator; @@ -130,6 +129,22 @@ interface nsIComponentManager : nsISuppo [ object, + uuid(fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a) +] +interface nsIInputStream : nsISupports +{ + nsresult Close(); + nsresult Available(PRUint32 *_retval); + nsresult Read(char *aBuf, PRUint32 aCount, PRUint32 *_retval); + nsresult ReadSegments(nsresult (*aWriter)(nsIInputStream *aInStream, + void *aClosure, const char *aFromSegment, PRUint32 aToOffset, + PRUint32 aCount, PRUint32 *aWriteCount), + void *aClosure, PRUint32 aCount, PRUint32 *_retval); + nsresult IsNonBlocking(PRBool *_retval); +} + +[ + object, uuid(07a22cc0-0ce5-11d3-9331-00104ba0fd40) ] interface nsIURI : nsISupports @@ -233,6 +248,17 @@ interface nsIHttpChannel : nsIChannel [ object, + uuid(ddf633d8-e9a4-439d-ad88-de636fd9bb75) +] +interface nsIUploadChannel : nsISupports +{ + nsresult SetUploadStream(nsIInputStream *aStream, const nsACString *aContentType, + PRInt32 aContentLength); + nsresult GetUploadStream(nsIInputStream **aUploadStream); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b) ] interface nsIURIContentListener : nsISupports diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a13def7..70b6247 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -47,12 +47,14 @@ static nsIIOService *nsio = NULL; typedef struct { const nsIHttpChannelVtbl *lpHttpChannelVtbl; + const nsIUploadChannelVtbl *lpUploadChannelVtbl; LONG ref; nsIChannel *channel; nsIHttpChannel *http_channel; nsIWineURI *uri; + nsIInputStream *post_data_stream; } nsChannel; typedef struct { @@ -66,6 +68,7 @@ typedef struct { #define NSCHANNEL(x) ((nsIChannel*) &(x)->lpHttpChannelVtbl) #define NSHTTPCHANNEL(x) ((nsIHttpChannel*) &(x)->lpHttpChannelVtbl) +#define NSUPCHANNEL(x) ((nsIUploadChannel*) &(x)->lpUploadChannelVtbl) #define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) static BOOL exec_shldocvw_67(NSContainer *container, LPCWSTR url) @@ -158,6 +161,9 @@ static nsresult NSAPI nsChannel_QueryInt }else if(This->http_channel && IsEqualGUID(&IID_nsIHttpChannel, riid)) { TRACE("(%p)->(IID_nsIHttpChannel %p)\n", This, result); *result = NSHTTPCHANNEL(This); + }else if(IsEqualGUID(&IID_nsIUploadChannel, riid)) { + TRACE("(%p)->(IID_nsIUploadChannel %p)\n", This, result); + *result = NSUPCHANNEL(This); } if(*result) { @@ -189,6 +195,8 @@ static nsrefcnt NSAPI nsChannel_Release( nsIWineURI_Release(This->uri); if(This->http_channel) nsIHttpChannel_Release(This->http_channel); + if(This->post_data_stream) + nsIInputStream_Release(This->post_data_stream); HeapFree(GetProcessHeap(), 0, This); } @@ -384,6 +392,7 @@ static nsresult NSAPI nsChannel_AsyncOpe nsISupports *aContext) { nsChannel *This = NSCHANNEL_THIS(iface); + nsresult nsres; TRACE("(%p)->(%p %p)\n", This, aListener, aContext); @@ -392,6 +401,22 @@ static nsresult NSAPI nsChannel_AsyncOpe return NS_ERROR_UNEXPECTED; } + if(This->post_data_stream) { + nsIUploadChannel *upload_channel; + + nsres = nsIChannel_QueryInterface(This->channel, &IID_nsIUploadChannel, + (void**)&upload_channel); + if(NS_SUCCEEDED(nsres)) { + nsACString *empty_string = nsACString_Create(); + nsACString_SetData(empty_string, ""); + + nsres = nsIUploadChannel_SetUploadStream(upload_channel, This->post_data_stream, + empty_string, -1); + if(NS_FAILED(nsres)) + WARN("SetUploadStream failed: %08lx\n", nsres); + } + } + return nsIChannel_AsyncOpen(This->channel, aListener, aContext); } @@ -687,6 +712,78 @@ static const nsIHttpChannelVtbl nsChanne #define NSURI_THIS(iface) DEFINE_THIS(nsURI, WineURI, iface) +#define NSUPCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, UploadChannel, iface) + +static nsresult NSAPI nsUploadChannel_QueryInterface(nsIUploadChannel *iface, nsIIDRef riid, + nsQIResult result) +{ + nsChannel *This = NSUPCHANNEL_THIS(iface); + return nsIChannel_QueryInterface(NSCHANNEL(This), riid, result); +} + +static nsrefcnt NSAPI nsUploadChannel_AddRef(nsIUploadChannel *iface) +{ + nsChannel *This = NSUPCHANNEL_THIS(iface); + return nsIChannel_AddRef(NSCHANNEL(This)); +} + +static nsrefcnt NSAPI nsUploadChannel_Release(nsIUploadChannel *iface) +{ + nsChannel *This = NSUPCHANNEL_THIS(iface); + return nsIChannel_Release(NSCHANNEL(This)); +} + +static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, + nsIInputStream *aStream, const nsACString *aContentType, PRInt32 aContentLength) +{ + nsChannel *This = NSUPCHANNEL_THIS(iface); + const char *content_type; + + TRACE("(%p)->(%p %p %ld)\n", This, aStream, aContentType, aContentLength); + + if(This->post_data_stream) + nsIInputStream_Release(This->post_data_stream); + + if(aContentType) { + nsACString_GetData(aContentType, &content_type, NULL); + if(*content_type) + FIXME("Unsupported aContentType argument: %s\n", debugstr_a(content_type)); + } + + if(aContentLength != -1) + FIXME("Unsupported acontentLength = %ld\n", aContentLength); + + if(aStream) + nsIInputStream_AddRef(aStream); + This->post_data_stream = aStream; + + return NS_OK; +} + +static nsresult NSAPI nsUploadChannel_GetUploadStream(nsIUploadChannel *iface, + nsIInputStream **aUploadStream) +{ + nsChannel *This = NSUPCHANNEL_THIS(iface); + + TRACE("(%p)->(%p)\n", This, aUploadStream); + + if(This->post_data_stream) + nsIInputStream_AddRef(This->post_data_stream); + + *aUploadStream = This->post_data_stream; + return NS_OK; +} + +#undef NSUPCHANNEL_THIS + +static const nsIUploadChannelVtbl nsUploadChannelVtbl = { + nsUploadChannel_QueryInterface, + nsUploadChannel_AddRef, + nsUploadChannel_Release, + nsUploadChannel_SetUploadStream, + nsUploadChannel_GetUploadStream +}; + static nsresult NSAPI nsURI_QueryInterface(nsIWineURI *iface, nsIIDRef riid, nsQIResult result) { nsURI *This = NSURI_THIS(iface); @@ -1122,10 +1219,12 @@ static nsresult NSAPI nsIOService_NewCha ret = HeapAlloc(GetProcessHeap(), 0, sizeof(nsChannel)); ret->lpHttpChannelVtbl = &nsChannelVtbl; + ret->lpUploadChannelVtbl = &nsUploadChannelVtbl; ret->ref = 1; ret->channel = channel; ret->http_channel = NULL; ret->uri = wine_uri; + ret->post_data_stream = NULL; nsIChannel_QueryInterface(ret->channel, &IID_nsIHttpChannel, (void**)&ret->http_channel);

1 0

Dmitry Timoshkov : regsvr32: Call OleInitialize before registering a DLL.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: 2c59936fee254cfae4c646fccb3a6cc3f3c92f27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c59936fee254cfae4c646f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 9 17:48:12 2006 +0100 regsvr32: Call OleInitialize before registering a DLL. --- programs/regsvr32/Makefile.in | 2 +- programs/regsvr32/regsvr32.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index 472916b..916e2df 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = regsvr32.exe APPMODE = -mconsole -IMPORTS = kernel32 +IMPORTS = ole32 kernel32 C_SRCS = \ regsvr32.c diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 866c285..d284fb7 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -53,6 +53,7 @@ #include <stdio.h> #include <string.h> #include <windows.h> +#include <ole2.h> typedef HRESULT (*DLLREGISTER) (void); typedef HRESULT (*DLLUNREGISTER) (void); @@ -184,6 +185,7 @@ int main(int argc, char* argv[]) WCHAR* wsCommandLine = NULL; WCHAR EmptyLine[1] = {0}; + OleInitialize(NULL); /* Strictly, the Microsoft version processes all the flags before * the files (e.g. regsvr32 file1 /s file2 is silent even for file1. @@ -278,5 +280,7 @@ int main(int argc, char* argv[]) return -1; } + OleUninitialize(); + return 0; }

1 0

Alexandre Julliard : programs: Don't install winetest.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: e0eef69a21a7303727478fdca5c9c3d6bd225b63 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0eef69a21a7303727478fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 9 17:45:35 2006 +0100 programs: Don't install winetest. --- programs/Makefile.in | 1 - programs/make_progs | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/Makefile.in b/programs/Makefile.in index a02a1ef..04f23bb 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -69,7 +69,6 @@ INSTALLSUBDIRS = \ winemenubuilder \ winemine \ winepath \ - winetest \ winevdm \ winhelp \ winver diff --git a/programs/make_progs b/programs/make_progs index 5f77e19..685946f 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -52,6 +52,7 @@ my %dont_install = ( "cmdlgtst" => 1, "view" => 1, + "winetest" => 1, ); foreach my $i (split(/\s/,$makefiles))

1 0

Jeremy White : kernel: Fixed build with gcc 2.95.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: 45396585318468f8de469af48639bb85fb8c7190 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45396585318468f8de469af… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Feb 9 17:45:07 2006 +0100 kernel: Fixed build with gcc 2.95. --- dlls/kernel/change.c | 6 ++++-- dlls/kernel/tests/change.c | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index 7c5eb92..abf57af 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -26,6 +26,8 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -167,7 +169,7 @@ BOOL WINAPI ReadDirectoryChangesW( HANDL pov = overlapped; ios = (PIO_STATUS_BLOCK) pov; - ios->Status = STATUS_PENDING; + ios->u.Status = STATUS_PENDING; status = NtNotifyChangeDirectoryFile( handle, pov->hEvent, NULL, NULL, ios, buffer, len, filter, subtree ); @@ -180,7 +182,7 @@ BOOL WINAPI ReadDirectoryChangesW( HANDL CloseHandle( ov.hEvent ); if (returned) *returned = ios->Information; - status = ios->Status; + status = ios->u.Status; } if (status != STATUS_SUCCESS) diff --git a/dlls/kernel/tests/change.c b/dlls/kernel/tests/change.c index e21a875..3c8e245 100644 --- a/dlls/kernel/tests/change.c +++ b/dlls/kernel/tests/change.c @@ -431,8 +431,8 @@ static void test_readdirectorychanges(vo SetEvent(ov.hEvent); ov.Internal = 1; ov.InternalHigh = 1; - ov.Offset = 0; - ov.OffsetHigh = 0; + S(U(ov)).Offset = 0; + S(U(ov)).OffsetHigh = 0; memset( buffer, 0, sizeof buffer ); r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); @@ -532,8 +532,8 @@ static void test_readdirectorychanges_nu ov.Internal = 0; ov.InternalHigh = 0; - ov.Offset = 0; - ov.OffsetHigh = 0; + S(U(ov)).Offset = 0; + S(U(ov)).OffsetHigh = 0; memset( buffer, 0, sizeof buffer ); r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL);

1 0

Mike McCormack : dinput: Fix the compile for missing EV_SYN define.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: 202846739aff80789f7218c8d1efd41840a9443b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=202846739aff80789f7218c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Feb 9 17:44:38 2006 +0100 dinput: Fix the compile for missing EV_SYN define. --- dlls/dinput/joystick_linuxinput.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5f3be50..b2d9480 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -742,9 +742,11 @@ static void joy_polldev(JoystickImpl *Th This->ff_state = ie.value; break; #endif +#ifdef EV_SYN case EV_SYN: /* there is nothing to do */ break; +#endif default: FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); break;

1 0

Uwe Bonnes : gdi: Show hatch brush FIXME only once.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: ee0e13923fe5558e07dbdef4311d65e46bbf6399 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee0e13923fe5558e07dbdef… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Thu Feb 9 12:22:09 2006 +0100 gdi: Show hatch brush FIXME only once. --- dlls/gdi/pen.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/pen.c b/dlls/gdi/pen.c index 0e4d686..684a81d 100644 --- a/dlls/gdi/pen.c +++ b/dlls/gdi/pen.c @@ -154,8 +154,11 @@ HPEN WINAPI ExtCreatePen( DWORD style, D return 0; } - if (brush->lbHatch && ((brush->lbStyle == BS_SOLID) || (brush->lbStyle == BS_HOLLOW))) - FIXME("Hatches not implemented\n"); + if (brush->lbHatch && ((brush->lbStyle == BS_SOLID) || (brush->lbStyle == BS_HOLLOW))) + { + static int fixme_hatches_shown; + if (!fixme_hatches_shown++) FIXME("Hatches not implemented\n"); + } } else {

1 0

Jacek Caban : mshtml: Get rid of HTMLDocument_OnLoad and move its job to AsyncOpen.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: 990e20c9922d4b058242f4eb7b9da845af8d38de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=990e20c9922d4b058242f4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 12:19:33 2006 +0100 mshtml: Get rid of HTMLDocument_OnLoad and move its job to AsyncOpen. --- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/nsembed.c | 46 ++++++++---------------- dlls/mshtml/nsio.c | 80 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/persist.c | 41 +++------------------- 4 files changed, 102 insertions(+), 69 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a4f0e98..a4ab36f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -32,6 +32,7 @@ #define NS_NOINTERFACE ((nsresult)0x80004002L) #define NS_ERROR_NOT_IMPLEMENTED ((nsresult)0x80004001L) #define NS_ERROR_INVALID_ARG ((nsresult)0x80070057L) +#define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) #define NS_FAILED(res) ((res) & 0x80000000) #define NS_SUCCEEDED(res) (!NS_FAILED(res)) @@ -93,7 +94,7 @@ struct NSContainer { HWND hwnd; - LPOLESTR url; /* hack */ + BOOL load_call; /* hack */ }; #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) @@ -139,7 +140,6 @@ void HTMLDocument_NSContainer_Destroy(HT void HTMLDocument_LockContainer(HTMLDocument*,BOOL); void HTMLDocument_ShowContextMenu(HTMLDocument*,DWORD,POINT*); -BOOL HTMLDocument_OnLoad(HTMLDocument*,LPCWSTR); HRESULT ProtocolFactory_Create(REFCLSID,REFIID,void**); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 93533af..eaa19d2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -663,41 +663,28 @@ static nsrefcnt NSAPI nsURIContentListen return nsIWebBrowserChrome_Release(NSWBCHROME(This)); } -static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener *iface, nsIURI *aURI, - PRBool *_retval) +static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener *iface, + nsIURI *aURI, PRBool *_retval) { NSContainer *This = NSURICL_THIS(iface); - BOOL do_load = TRUE; - nsresult nsres; + nsIWineURI *wine_uri; nsACString *spec_str = nsACString_Create(); + const char *spec; + nsresult nsres; - TRACE("(%p)->(%p %p)\n", This, aURI, _retval); - - nsres = nsIURI_GetSpec(aURI, spec_str); - if(NS_SUCCEEDED(nsres)) { - const char *spec = NULL; - LPWSTR specw; - int len; - - nsACString_GetData(spec_str, &spec, NULL); - - len = MultiByteToWideChar(CP_ACP, 0, spec, -1, NULL, 0); - specw = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, spec, -1, specw, -1); - - if(strcmpW(This->url, specw)) /* hack */ - do_load = HTMLDocument_OnLoad(This->doc, specw); + nsIURI_GetSpec(aURI, spec_str); + nsACString_GetData(spec_str, &spec, NULL); - HeapFree(GetProcessHeap(), 0, specw); - }else { - ERR("GetSpec failed: %08lx\n", nsres); - } + TRACE("(%p)->(%p(%s) %p)\n", This, aURI, debugstr_a(spec), _retval); nsACString_Destroy(spec_str); - if(!do_load) { - *_retval = TRUE; - return NS_OK; + nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri); + if(NS_SUCCEEDED(nsres)) { + nsIWineURI_SetNSContainer(wine_uri, This); + nsIWineURI_Release(wine_uri); + }else { + WARN("Could not get nsIWineURI interface: %08lx\n", nsres); } return NS_ERROR_NOT_IMPLEMENTED; @@ -977,7 +964,7 @@ void HTMLDocument_NSContainer_Init(HTMLD if(NS_FAILED(nsres)) ERR("SetParentURIContentListener failed: %08lx\n", nsres); - This->nscontainer->url = NULL; + This->nscontainer->load_call = FALSE; } void HTMLDocument_NSContainer_Destroy(HTMLDocument *This) @@ -992,7 +979,4 @@ void HTMLDocument_NSContainer_Destroy(HT nsIWebBrowserStream_Release(This->nscontainer->stream); HeapFree(GetProcessHeap(), 0, This->nscontainer); - - if(This->nscontainer->url) - CoTaskMemFree(This->nscontainer->url); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e09a076..a13def7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "shlguid.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -34,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define LOAD_INITIAL_DOCUMENT_URI 0x80000 + #define NS_IOSERVICE_CLASSNAME "nsIOService" #define NS_IOSERVICE_CONTRACTID "@mozilla.org/network/io-service;1" @@ -65,6 +68,76 @@ typedef struct { #define NSHTTPCHANNEL(x) ((nsIHttpChannel*) &(x)->lpHttpChannelVtbl) #define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) +static BOOL exec_shldocvw_67(NSContainer *container, LPCWSTR url) +{ + IOleCommandTarget *cmdtrg = NULL; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(container->doc->client, &IID_IOleCommandTarget, + (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + VARIANT varUrl, varRes; + + V_VT(&varUrl) = VT_BSTR; + V_BSTR(&varUrl) = SysAllocString(url); + V_VT(&varRes) = VT_BOOL; + + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &varUrl, &varRes); + + IOleCommandTarget_Release(cmdtrg); + SysFreeString(V_BSTR(&varUrl)); + + if(SUCCEEDED(hres) && !V_BOOL(&varRes)) { + TRACE("got VARIANT_FALSE, do not load\n"); + return FALSE; + } + } + + return TRUE; +} + +static BOOL before_async_open(nsChannel *This) +{ + nsACString *uri_str; + NSContainer *container; + PRUint32 load_flags = 0; + const char *uria; + LPWSTR uri; + DWORD len; + BOOL ret = TRUE; + + nsIChannel_GetLoadFlags(This->channel, &load_flags); + TRACE("load_flags = %08lx\n", load_flags); + if(!(load_flags & LOAD_INITIAL_DOCUMENT_URI)) + return TRUE; + + nsIWineURI_GetNSContainer(This->uri, &container); + if(!container) { + WARN("container = NULL\n"); + return TRUE; + } + + if(container->load_call) { + nsIWebBrowserChrome_Release(NSWBCHROME(container)); + return TRUE; + } + + uri_str = nsACString_Create(); + nsIWineURI_GetSpec(This->uri, uri_str); + nsACString_GetData(uri_str, &uria, NULL); + len = MultiByteToWideChar(CP_ACP, 0, uria, -1, NULL, 0); + uri = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, uria, -1, uri, len); + nsACString_Destroy(uri_str); + + ret = exec_shldocvw_67(container, uri); + + nsIWebBrowserChrome_Release(NSWBCHROME(container)); + HeapFree(GetProcessHeap(), 0, uri); + + return ret; +} + #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface) static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef riid, nsQIResult result) @@ -311,7 +384,14 @@ static nsresult NSAPI nsChannel_AsyncOpe nsISupports *aContext) { nsChannel *This = NSCHANNEL_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, aListener, aContext); + + if(!before_async_open(This)) { + TRACE("canceled\n"); + return NS_ERROR_UNEXPECTED; + } + return nsIChannel_AsyncOpen(This->channel, aListener, aContext); } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 67e771e..3bef7a5 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -362,18 +362,15 @@ static HRESULT WINAPI PersistMoniker_Loa * It uses Gecko's LoadURI instead of IMoniker's BindToStorage. Should we improve * it (to do so we'd have to use not frozen interfaces)? */ - LPOLESTR old_url = This->nscontainer->url; - - This->nscontainer->url = url; + This->nscontainer->load_call = TRUE; nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, url, LOAD_FLAGS_NONE, NULL, NULL, NULL); - if(NS_SUCCEEDED(nsres)) { - CoTaskMemFree(old_url); + This->nscontainer->load_call = FALSE; + + if(NS_SUCCEEDED(nsres)) return S_OK; - }else { + else WARN("LoadURI failed: %08lx\n", nsres); - This->nscontainer->url = old_url; - } } /* FIXME: Use grfMode */ @@ -563,34 +560,6 @@ static const IPersistFileVtbl PersistFil PersistFile_GetCurFile }; -BOOL HTMLDocument_OnLoad(HTMLDocument *This, LPCWSTR url) -{ - IOleCommandTarget *cmdtrg = NULL; - HRESULT hres; - - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); - - hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&cmdtrg); - if(SUCCEEDED(hres)) { - VARIANT varUrl, varRes; - - V_VT(&varUrl) = VT_BSTR; - V_BSTR(&varUrl) = SysAllocString(url); - V_VT(&varRes) = VT_BOOL; - - hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &varUrl, &varRes); - SysFreeString(V_BSTR(&varUrl)); - - if(SUCCEEDED(hres) && !V_BOOL(&varRes)) { - TRACE("got VARIANT_FALSE, do not load\n"); - IOleCommandTarget_Release(cmdtrg); - return FALSE; - } - } - - return TRUE; -} - void HTMLDocument_Persist_Init(HTMLDocument *This) { This->lpPersistMonikerVtbl = &PersistMonikerVtbl;

1 0

Jacek Caban : mshtml: Added wrapper of nsIChannel.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: ae23f8d8cbac12d984394bfd446b0118ecdb29fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae23f8d8cbac12d984394bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 12:19:13 2006 +0100 mshtml: Added wrapper of nsIChannel. --- dlls/mshtml/nsiface.idl | 75 ++++++ dlls/mshtml/nsio.c | 585 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 657 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ae23f8d8cbac12d9843…

1 0