August 2006 - Wine-commits - list.winehq.org

Stefan Dösinger : ddraw: Implement D3DRENDERSTATE_TEXTUREMAPBLEND.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: de5a2f3fbe708889a9fbc2fd51f94f3ce3ec5781 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de5a2f3fbe708889a9fbc2f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 9 19:30:57 2006 +0200 ddraw: Implement D3DRENDERSTATE_TEXTUREMAPBLEND. --- dlls/ddraw/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 982ec16..c9d5854 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2241,6 +2241,52 @@ IDirect3DDeviceImpl_7_SetRenderState(IDi Value); } + case D3DRENDERSTATE_TEXTUREMAPBLEND: + { + /* Old texture combine setup style, superseded by texture stage states + * in D3D7. It is safe for us to wrap it to texture stage states. + */ + switch ( (D3DTEXTUREBLEND) Value) + { + case D3DTBLEND_MODULATE: + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG2, D3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_MODULATE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + break; + + case D3DTBLEND_MODULATEALPHA: + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG2, D3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG2, D3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_MODULATE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); + break; + + case D3DTBLEND_DECAL: + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + break; + + case D3DTBLEND_DECALALPHA: + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAARG2, D3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + IWineD3DDevice_SetTextureStageState(iface, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); + break; + + default: + ERR("Unhandled texture environment %ld !\n",Value); + } + return D3D_OK; + break; + } + default: return IWineD3DDevice_SetRenderState(This->wineD3DDevice, RenderStateType,

1 0

Duane Clark : msvcrt: In text mode a ctrl-z signals EOF.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 4d3952f3dc2b54a256726d5693adabcbefcc34d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d3952f3dc2b54a256726d5… Author: Duane Clark <fpga(a)pacbell.net> Date: Tue Aug 8 16:08:05 2006 -0700 msvcrt: In text mode a ctrl-z signals EOF. Spotted by David Hagood with test suggested by Dan Kegel. --- dlls/msvcrt/file.c | 13 ++++++++++++ dlls/msvcrt/tests/file.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9fe09dd..ba5b445 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1634,6 +1634,19 @@ static int read_i(int fd, void *buf, uns */ if (ReadFile(hand, bufstart, count, &num_read, NULL)) { + if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) + { + int i; + /* in text mode, a ctrl-z signals EOF */ + for (i=0; i<num_read; i++) + { + if (bufstart[i] == 0x1a) + { + num_read = i; + break; + } + } + } if (num_read != count) { MSVCRT_fdesc[fd].wxflag |= WX_ATEOF; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0205de4..470a9e9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -372,6 +372,53 @@ #define LLEN 512 unlink(tempf); } +static void test_ctrlz( void ) +{ + char* tempf; + FILE *tempfh; + static const char mytext[]= "This is test_ctrlz"; + char buffer[256]; + int i, j; + long l; + + tempf=_tempnam(".","wne"); + tempfh = fopen(tempf,"wb"); + fputs(mytext,tempfh); + j = 0x1a; /* a ctrl-z character signals EOF in text mode */ + fputc(j,tempfh); + j = '\r'; + fputc(j,tempfh); + j = '\n'; + fputc(j,tempfh); + j = 'a'; + fputc(j,tempfh); + fclose(tempfh); + tempfh = fopen(tempf,"rt"); /* open in TEXT mode */ + ok(fgets(buffer,256,tempfh) != 0,"fgets failed unexpected\n"); + i=strlen(buffer); + j=strlen(mytext); + ok(i==j, "returned string length expected %d got %d\n", j, i); + j+=4; /* ftell should indicate the true end of file */ + l=ftell(tempfh); + ok(l==j, "ftell expected %d got %ld\n", j, l); + ok(feof(tempfh), "did not get EOF\n"); + fclose(tempfh); + + tempfh = fopen(tempf,"rb"); /* open in BINARY mode */ + ok(fgets(buffer,256,tempfh) != 0,"fgets failed unexpected\n"); + i=strlen(buffer); + j=strlen(mytext)+3; /* should get through newline */ + ok(i==j, "returned string length expected %d got %d\n", j, i); + l=ftell(tempfh); + ok(l==j, "ftell expected %d got %ld\n", j, l); + ok(fgets(buffer,256,tempfh) != 0,"fgets failed unexpected\n"); + i=strlen(buffer); + ok(i==1, "returned string length expected %d got %d\n", 1, i); + ok(feof(tempfh), "did not get EOF\n"); + fclose(tempfh); + unlink(tempf); +} + static void test_file_put_get( void ) { char* tempf; @@ -727,6 +774,7 @@ START_TEST(file) test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ test_fgetwc(); + test_ctrlz(); test_file_put_get(); test_tmpnam(); test_get_osfhandle();

1 0

Michael Kaufmann : user: CopyImage: Handle the flags LR_COPYDELETEORG, LR_CREATEDIBSECTION, and LR_MONOCHROME.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: b997cd76294ed221f49f3dfea71d3b6350442d62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b997cd76294ed221f49f3df… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Wed Aug 9 16:14:49 2006 +0200 user: CopyImage: Handle the flags LR_COPYDELETEORG, LR_CREATEDIBSECTION, and LR_MONOCHROME. --- dlls/user/cursoricon.c | 198 ++++++++++++++++++++++++++++++++-- dlls/user/tests/Makefile.in | 1 dlls/user/tests/cursoricon.c | 246 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 434 insertions(+), 11 deletions(-) create mode 100644 dlls/user/tests/cursoricon.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b997cd76294ed221f49…

1 0

Michael Kaufmann : user: Accept more flags in SetMenuItemInfo and ModifyMenu.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 9f07bcd25ff60697818c656e9189bafa70a42c39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f07bcd25ff60697818c656… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Aug 8 23:22:50 2006 +0200 user: Accept more flags in SetMenuItemInfo and ModifyMenu. - Accept MFT_MENU{BAR}BREAK, MFT_RADIOCHECK, MFT_RIGHTJUSTIFY, and MFT_RIGHTORDER in SetMenuItemInfo. - InsertMenu, AppendMenu, ModifiyMenu: Accept MF_HILITE flag (undocumented). - SetMenuItemInfo: Only use the lower word of the bitmap handle as documented in MSDN (Word 95 depends on this). - The type MFT_RADIOCHECK cannot be set if only the checkmarks are modified with SetMenuItemInfo. - New tests. --- dlls/user/menu.c | 52 +++++++++------- dlls/user/tests/menu.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 187 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9f07bcd25ff60697818…

1 0

Jacek Caban : mshtml: Use moniker in AsyncOpen if channel is NULL.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: c4dd6c68d0e708c30b6247ca0096adc0659dc62c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4dd6c68d0e708c30b6247c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 9 16:42:51 2006 +0200 mshtml: Use moniker in AsyncOpen if channel is NULL. --- dlls/mshtml/nsio.c | 74 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 57 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index cf689b7..37b3ba0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -572,6 +572,9 @@ static nsresult NSAPI nsChannel_AsyncOpe nsISupports *aContext) { nsChannel *This = NSCHANNEL_THIS(iface); + BSCallback *bscallback; + nsIWineURI *wine_uri; + IMoniker *mon; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, aListener, aContext); @@ -612,31 +615,68 @@ static nsresult NSAPI nsChannel_AsyncOpe } } - if(!This->channel) { - FIXME("channel == NULL\n"); + if(This->channel) { + 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_Init(&empty_string, ""); + + nsres = nsIUploadChannel_SetUploadStream(upload_channel, This->post_data_stream, + &empty_string, -1); + nsIUploadChannel_Release(upload_channel); + if(NS_FAILED(nsres)) + WARN("SetUploadStream failed: %08lx\n", nsres); + + nsACString_Finish(&empty_string); + } + } + + return nsIChannel_AsyncOpen(This->channel, aListener, aContext); + } + + TRACE("channel == NULL\n"); + + if(!This->original_uri) { + ERR("original_uri == NULL\n"); return NS_ERROR_UNEXPECTED; } - if(This->post_data_stream) { - nsIUploadChannel *upload_channel; + nsres = nsIURI_QueryInterface(This->original_uri, &IID_nsIWineURI, (void**)&wine_uri); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIWineURI: %08lx\n", nsres); + return NS_ERROR_UNEXPECTED; + } - nsres = nsIChannel_QueryInterface(This->channel, &IID_nsIUploadChannel, - (void**)&upload_channel); - if(NS_SUCCEEDED(nsres)) { - nsACString empty_string; - nsACString_Init(&empty_string, ""); + nsIWineURI_GetMoniker(wine_uri, &mon); + nsIWineURI_Release(wine_uri); + + if(!mon) { + WARN("mon == NULL\n"); + return NS_ERROR_UNEXPECTED; + } - nsres = nsIUploadChannel_SetUploadStream(upload_channel, This->post_data_stream, - &empty_string, -1); - nsIUploadChannel_Release(upload_channel); - if(NS_FAILED(nsres)) - WARN("SetUploadStream failed: %08lx\n", nsres); + bscallback = create_bscallback(NULL, mon); + IMoniker_Release(mon); - nsACString_Finish(&empty_string); - } + nsIChannel_AddRef(NSCHANNEL(This)); + bscallback->nschannel = This; + + nsIStreamListener_AddRef(aListener); + bscallback->nslistener = aListener; + + if(aContext) { + nsISupports_AddRef(aContext); + bscallback->nscontext = aContext; } - return nsIChannel_AsyncOpen(This->channel, aListener, aContext); + start_binding(bscallback); + IBindStatusCallback_Release(STATUSCLB(bscallback)); + + return NS_OK; } static nsresult NSAPI nsChannel_GetRequestMethod(nsIHttpChannel *iface, nsACString *aRequestMethod)

1 0

Jacek Caban : mshtml: Set nsURI's moniker in NewURI.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: f1757623407963e86eb48b0544efbae399d67a5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1757623407963e86eb48b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 9 16:42:37 2006 +0200 mshtml: Set nsURI's moniker in NewURI. --- dlls/mshtml/nsio.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index abd2e48..cf689b7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1608,6 +1608,7 @@ static nsresult NSAPI nsIOService_NewURI NSContainer *nscontainer = NULL; nsIURI *uri = NULL; PRBool is_javascript = FALSE; + IMoniker *base_mon = NULL; nsresult nsres; nsACString_GetData(aSpec, &spec, NULL); @@ -1651,6 +1652,7 @@ static nsresult NSAPI nsIOService_NewURI nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&wine_uri); if(NS_SUCCEEDED(nsres)) { nsIWineURI_GetNSContainer(wine_uri, &nscontainer); + nsIWineURI_GetMoniker(wine_uri, &base_mon); nsIWineURI_Release(wine_uri); }else { ERR("Could not get nsIWineURI: %08lx\n", nsres); @@ -1662,6 +1664,26 @@ static nsresult NSAPI nsIOService_NewURI if(nscontainer) nsIWebBrowserChrome_Release(NSWBCHROME(nscontainer)); + if(base_mon) { + LPWSTR url; + IMoniker *mon; + DWORD len; + HRESULT hres; + + len = MultiByteToWideChar(CP_ACP, 0, spec, -1, NULL, 0); + url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, spec, -1, url, -1); + + hres = CreateURLMoniker(base_mon, url, &mon); + HeapFree(GetProcessHeap(), 0, url); + if(SUCCEEDED(hres)) { + nsIWineURI_SetMoniker((nsIWineURI*)*_retval, mon); + IMoniker_Release(mon); + }else { + WARN("CreateURLMoniker failed: %08lx\n", hres); + } + } + return nsres; }

1 0

Jacek Caban : mshtml: Set nsURI's moniker in OnStartURILoad.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 0c11b48240414936c1a5442e3ba6dc3c3aaabbed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c11b48240414936c1a5442… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 9 16:42:24 2006 +0200 mshtml: Set nsURI's moniker in OnStartURILoad. --- dlls/mshtml/nsembed.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 77c08b0..39f454d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -771,13 +771,35 @@ static nsresult NSAPI nsURIContentListen nsACString_Finish(&spec_str); nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri); - if(NS_SUCCEEDED(nsres)) { - nsIWineURI_SetNSContainer(wine_uri, This); - nsIWineURI_Release(wine_uri); - }else { + if(NS_FAILED(nsres)) { WARN("Could not get nsIWineURI interface: %08lx\n", nsres); + return NS_ERROR_NOT_IMPLEMENTED; } + nsIWineURI_SetNSContainer(wine_uri, This); + + if(This->bscallback && This->bscallback->mon) { + LPWSTR url; + HRESULT hres; + + hres = IMoniker_GetDisplayName(This->bscallback->mon, NULL, 0, &url); + if(SUCCEEDED(hres)) { + IMoniker *mon = NULL; + + hres = CreateURLMoniker(NULL, url, &mon); + if(SUCCEEDED(hres)) { + nsIWineURI_SetMoniker(wine_uri, mon); + IMoniker_Release(mon); + }else { + WARN("CreateURLMoniker failed: %08lx\n", hres); + } + }else { + WARN("GetDisplayName failed: %08lx\n", hres); + } + } + + nsIWineURI_Release(wine_uri); + return NS_ERROR_NOT_IMPLEMENTED; }

1 0

Jacek Caban : mshtml: Return INET_E_USE_DEFAULT_PROTOCOLHANDLER in ResProtocolInfo::CombineUrl.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 114a1a22aa7b88a69420d582e66e8b234002babe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=114a1a22aa7b88a69420d58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 9 16:39:43 2006 +0200 mshtml: Return INET_E_USE_DEFAULT_PROTOCOLHANDLER in ResProtocolInfo::CombineUrl. --- dlls/mshtml/protocol.c | 5 +++-- dlls/mshtml/tests/protocol.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 05b4388..cf60004 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -841,9 +841,10 @@ static HRESULT WINAPI ResProtocolInfo_Co LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { - FIXME("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), + TRACE("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); - return E_NOTIMPL; + + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } static HRESULT WINAPI ResProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index dfed396..8451019 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" #include "urlmon.h" +#include "shlwapi.h" #include "initguid.h" @@ -247,6 +248,7 @@ static void test_res_protocol(void) static const WCHAR blank_url[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; + static const WCHAR test_part_url[] = {'r','e','s',':','/','/','C','S','S','/','t','e','s','t',0}; static const WCHAR wrong_url1[] = {'m','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','m','t','h',0}; static const WCHAR wrong_url2[] = @@ -334,6 +336,21 @@ #endif "ParseUrl failed: %08lx, expected INET_E_DEFAULT_ACTION\n", hres); ok(buf[0] == '?', "buf changed\n"); + size = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, + 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + + size = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, + URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + + size = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, NULL, NULL, + URL_FILE_USE_PATHURL, NULL, 0xdeadbeef, NULL, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + IInternetProtocolInfo_Release(protocol_info); }

1 0

Jacek Caban : mshtml: Added default GetSpec implementation.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 6a6f9158b1a69cac8323399a2f21e0e3cdfdb66f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a6f9158b1a69cac8323399… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 9 16:40:50 2006 +0200 mshtml: Added default GetSpec implementation. --- dlls/mshtml/nsio.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 67207bb..d315028 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -53,6 +53,7 @@ typedef struct { nsIURI *uri; NSContainer *container; IMoniker *mon; + LPSTR spec; } nsURI; #define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) @@ -1050,6 +1051,9 @@ static nsrefcnt NSAPI nsURI_Release(nsIW nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); if(This->uri) nsIURI_Release(This->uri); + if(This->mon) + IMoniker_Release(This->mon); + mshtml_free(This->spec); mshtml_free(This); } @@ -1065,7 +1069,12 @@ static nsresult NSAPI nsURI_GetSpec(nsIW if(This->uri) return nsIURI_GetSpec(This->uri, aSpec); - FIXME("default action not implemented\n"); + if(This->spec) { + nsACString_Init(aSpec, This->spec); + return NS_OK; + } + + WARN("mon and uri are NULL\n"); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1459,10 +1468,31 @@ static nsresult NSAPI nsURI_SetMoniker(n if(This->mon) { WARN("Moniker already set: %p\n", This->container); IMoniker_Release(This->mon); + + mshtml_free(This->spec); + This->spec = NULL; } - if(aMoniker) + if(aMoniker) { + LPWSTR url = NULL; + HRESULT hres; + + hres = IMoniker_GetDisplayName(aMoniker, NULL, NULL, &url); + if(SUCCEEDED(hres)) { + DWORD len; + + len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL); + This->spec = mshtml_alloc(len*sizeof(WCHAR)); + WideCharToMultiByte(CP_ACP, 0, url, -1, This->spec, -1, NULL, NULL); + CoTaskMemFree(url); + + TRACE("spec %s\n", debugstr_a(This->spec)); + }else { + ERR("GetDisplayName failed: %08lx\n", hres); + } + IMoniker_AddRef(aMoniker); + } This->mon = aMoniker; return NS_OK; @@ -1515,6 +1545,7 @@ static nsresult create_uri(nsIURI *uri, ret->uri = uri; ret->container = container; ret->mon = NULL; + ret->spec = NULL; if(container) nsIWebBrowserChrome_AddRef(NSWBCHROME(container));

1 0

Jacek Caban : mshtml: Don't crash in QueryInterface if uri is NULL.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: ca595cd7991473adedeb45895baac50d1df9cffc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca595cd7991473adedeb458… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 9 16:41:47 2006 +0200 mshtml: Don't crash in QueryInterface if uri is NULL. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d315028..abd2e48 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1026,7 +1026,7 @@ static nsresult NSAPI nsURI_QueryInterfa } TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); - return nsIURI_QueryInterface(This->uri, riid, result); + return This->uri ? nsIURI_QueryInterface(This->uri, riid, result) : NS_NOINTERFACE; } static nsrefcnt NSAPI nsURI_AddRef(nsIWineURI *iface)

1 0