April 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11.drv: Hack to disable XInitThreads when an XIM is used.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 5c19285da6763795a78db95c5e82a5e24e345933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c19285da6763795a78db95c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 12:56:01 2007 +0200 winex11.drv: Hack to disable XInitThreads when an XIM is used. --- dlls/winex11.drv/x11drv_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8012c2d..15a3624 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -378,6 +378,7 @@ static BOOL process_attach(void) { Display *display; XVisualInfo *desktop_vi = NULL; + const char *env; setup_options(); @@ -385,7 +386,8 @@ static BOOL process_attach(void) /* Open display */ - if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); + if (!(env = getenv("XMODIFIERS")) || !*env) /* try to avoid the Xlib XIM locking bug */ + if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); if (!(display = XOpenDisplay( NULL ))) return FALSE;

1 0

Lei Zhang : comctl32: monthcal: GetMonthRange Tests.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: bf7b0b89fedd4ac3b9adfa143e6f05638cfb6838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7b0b89fedd4ac3b9adfa143… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 12 18:44:55 2007 -0700 comctl32: monthcal: GetMonthRange Tests. --- dlls/comctl32/tests/monthcal.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 8cfe5f1..48afb74 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -244,6 +244,12 @@ static const struct message monthcal_scroll_seq[] = { { 0 } }; +static const struct message monthcal_monthrange_seq[] = { + { MCM_GETMONTHRANGE, sent|wparam, GMR_VISIBLE}, + { MCM_GETMONTHRANGE, sent|wparam, GMR_DAYSTATE}, + { 0 } +}; + static const struct message monthcal_max_sel_day_seq[] = { { MCM_SETMAXSELCOUNT, sent|wparam|lparam, 5, 0}, { MCM_GETMAXSELCOUNT, sent|wparam|lparam, 0, 0}, @@ -959,6 +965,41 @@ static void test_monthcal_scroll(HWND hwnd) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_scroll_seq, "monthcal scroll", FALSE); } +static void test_monthcal_monthrange(HWND hwnd) +{ + int res; + SYSTEMTIME st_visible[2], st_daystate[2]; + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + st_visible[0].wYear = 0; + st_visible[0].wMonth = 0; + st_visible[0].wDay = 0; + st_daystate[1] = st_daystate[0] = st_visible[1] = st_visible[0]; + + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); + todo_wine { + expect(2, res); + expect(2000, st_visible[0].wYear); + expect(11, st_visible[0].wMonth); + expect(1, st_visible[0].wDay); + expect(2000, st_visible[1].wYear); + expect(12, st_visible[1].wMonth); + expect(31, st_visible[1].wDay); + } + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, (LPARAM)st_daystate); + todo_wine { + expect(4, res); + expect(2000, st_daystate[0].wYear); + expect(10, st_daystate[0].wMonth); + expect(29, st_daystate[0].wDay); + expect(2001, st_daystate[1].wYear); + expect(1, st_daystate[1].wMonth); + expect(6, st_daystate[1].wDay); + } + + ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_monthrange_seq, "monthcal monthrange", FALSE); +} + static void test_monthcal_MaxSelDay(HWND hwnd) { int res; @@ -1006,6 +1047,7 @@ START_TEST(monthcal) test_monthcal_HitTest(hwnd); test_monthcal_today(hwnd); test_monthcal_scroll(hwnd); + test_monthcal_monthrange(hwnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd);

1 0

Rob Shearman : msi: Provide UI action data for uncompressed files, not just compressed ones.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 1b0b5f56993ad9ceee2770f5d84de72cc6b03738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0b5f56993ad9ceee2770f5d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 13 02:14:48 2007 +0100 msi: Provide UI action data for uncompressed files, not just compressed ones. --- dlls/msi/files.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d1e7fe6..9b9c324 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -762,6 +762,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (!file->IsCompressed) { + msi_file_update_ui(package, file, szInstallFiles); rc = copy_install_file(file); if (rc != ERROR_SUCCESS) {

1 0

Dan Hipschman : rpcrt4: Add tests for RpcServerListen and friends.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 6c5e78fe03614f7403437dbc53f31489edd74d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5e78fe03614f7403437dbc5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Apr 12 17:12:20 2007 -0700 rpcrt4: Add tests for RpcServerListen and friends. --- dlls/rpcrt4/tests/rpc.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 023741f..3828260 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -175,17 +175,108 @@ static void TestDceErrorInqText (void) ok (0, "Cannot set up for DceErrorInqText\n"); } +static RPC_DISPATCH_FUNCTION IFoo_table[] = +{ + 0 +}; + +RPC_DISPATCH_TABLE IFoo_v0_0_DispatchTable = +{ + 0, + IFoo_table +}; + +static const RPC_SERVER_INTERFACE IFoo___RpcServerInterface = +{ + sizeof(RPC_SERVER_INTERFACE), + {{0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x34}},{0,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + &IFoo_v0_0_DispatchTable, + 0, + 0, + 0, + 0, + 0, +}; + +RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInterface; + static void test_rpc_ncacn_ip_tcp(void) { RPC_STATUS status; + unsigned char *binding; + handle_t IFoo_IfHandle; static unsigned char foo[] = "foo"; static unsigned char ncacn_ip_tcp[] = "ncacn_ip_tcp"; + static unsigned char address[] = "127.0.0.1"; + static unsigned char endpoint[] = "4114"; status = RpcNetworkIsProtseqValid(foo); ok(status == RPC_S_INVALID_RPC_PROTSEQ, "return wrong\n"); status = RpcNetworkIsProtseqValid(ncacn_ip_tcp); ok(status == RPC_S_OK, "return wrong\n"); + + status = RpcMgmtStopServerListening(NULL); +todo_wine { + ok(status == RPC_S_NOT_LISTENING, + "wrong RpcMgmtStopServerListening error (%lu)\n", status); +} + + status = RpcMgmtWaitServerListen(); + ok(status == RPC_S_NOT_LISTENING, + "wrong RpcMgmtWaitServerListen error status (%lu)\n", status); + + status = RpcServerListen(1, 20, FALSE); + ok(status == RPC_S_NO_PROTSEQS_REGISTERED, + "wrong RpcServerListen error (%lu)\n", status); + + status = RpcServerUseProtseqEp(ncacn_ip_tcp, 20, endpoint, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp failed (%lu)\n", status); + + status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "RpcServerRegisterIf failed (%lu)\n", status); + + status = RpcServerListen(1, 20, TRUE); +todo_wine { + ok(status == RPC_S_OK, "RpcServerListen failed (%lu)\n", status); +} + + status = RpcServerListen(1, 20, TRUE); +todo_wine { + ok(status == RPC_S_ALREADY_LISTENING, + "wrong RpcServerListen error (%lu)\n", status); +} + + status = RpcStringBindingCompose(NULL, ncacn_ip_tcp, address, + endpoint, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%lu)\n", status); + + status = RpcBindingFromStringBinding(binding, &IFoo_IfHandle); + ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%lu)\n", + status); + + status = RpcMgmtStopServerListening(NULL); + ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%lu)\n", + status); + + status = RpcMgmtStopServerListening(NULL); + ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%lu)\n", + status); + + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%lu)\n", status); + + status = RpcMgmtWaitServerListen(); +todo_wine { + ok(status == RPC_S_OK, "RpcMgmtWaitServerListen failed (%lu)\n", status); +} + + status = RpcStringFree(&binding); + ok(status == RPC_S_OK, "RpcStringFree failed (%lu)\n", status); + + status = RpcBindingFree(&IFoo_IfHandle); + ok(status == RPC_S_OK, "RpcBindingFree failed (%lu)\n", status); } /* this is what's generated with MS/RPC - it includes an extra 2

1 0

Stefan Dösinger : d3d9: Fix vertex decl test.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: c4eb3de8d88a2dee813b3135f7d4a945c4d45806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4eb3de8d88a2dee813b3135f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 12 22:09:19 2007 +0200 d3d9: Fix vertex decl test. --- dlls/d3d9/tests/vertexdeclaration.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 4290c57..57867f1 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -686,7 +686,7 @@ static void test_fvf_decl_management( ok(SUCCEEDED(hr), "SetFVF returned %#x, expected %#x\n", hr, D3D_OK); if (FAILED(hr)) return; - /* The contents should correspond to the second conversion */ + /* The contents should correspond to the first conversion */ VDECL_CHECK(compare_elements(result_decl1, test_elements1)); /* Get converted decl (#3) */ @@ -700,6 +700,8 @@ static void test_fvf_decl_management( /* The contents should correspond to the second conversion */ VDECL_CHECK(compare_elements(result_decl3, test_elements2)); + /* Re-Check if the first decl was overwritten by the new Get() */ + VDECL_CHECK(compare_elements(result_decl1, test_elements1)); /* The refcounts should all be 1 */ ref1 = get_refcount((IUnknown*) result_decl1);

1 0

Jacek Caban : mshtml: Added IDM_COMPOSESETTINGS and IDM_HTMLEDITMODE stub implementation.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: fa355572a264c3ab3852b32b57ccf905897ceef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa355572a264c3ab3852b32b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 12 21:27:57 2007 +0200 mshtml: Added IDM_COMPOSESETTINGS and IDM_HTMLEDITMODE stub implementation. --- dlls/mshtml/olecmd.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 75af04a..deac11e 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -911,6 +911,24 @@ static HRESULT exec_outdent(HTMLDocument *This) return S_OK; } +static HRESULT exec_htmleditmode(HTMLDocument *This) +{ + FIXME("(%p)\n", This); + return S_OK; +} + +static HRESULT exec_composesettings(HTMLDocument *This, VARIANT *in) +{ + if(!in || V_VT(in) != VT_BSTR) { + WARN("invalid arg\n"); + return E_INVALIDARG; + } + + FIXME("%s\n", debugstr_w(V_BSTR(in))); + + return S_OK; +} + static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); @@ -1206,6 +1224,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_outdent(This); + case IDM_HTMLEDITMODE: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_htmleditmode(This); + case IDM_COMPOSESETTINGS: + if(pvaOut) + FIXME("unsupported arguments\n"); + return exec_composesettings(This, pvaIn); default: FIXME("unsupported nCmdID %d of CGID_MSHTML group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED;

1 0

Jacek Caban : mshtml: Added IPersistFile::Save implementation.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 11fc8ccb6d300a3be6670669a3e850ecbb2d0b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fc8ccb6d300a3be6670669a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 12 21:26:17 2007 +0200 mshtml: Added IPersistFile::Save implementation. --- dlls/mshtml/persist.c | 102 +++++++++++++++++++++++++++++++----------------- 1 files changed, 66 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2d61432..6b9ef8d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -39,6 +39,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static HRESULT get_doc_string(HTMLDocument *This, char **str, DWORD *len) +{ + nsIDOMDocument *nsdoc; + nsIDOMNode *nsnode; + LPCWSTR strw; + nsAString nsstr; + nsresult nsres; + + if(!This->nscontainer) { + WARN("no nscontainer, returning NULL\n"); + return S_OK; + } + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNode failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&nsstr, NULL); + nsnode_to_nsstring(nsnode, &nsstr); + nsIDOMNode_Release(nsnode); + + nsAString_GetData(&nsstr, &strw, NULL); + TRACE("%s\n", debugstr_w(strw)); + + *len = WideCharToMultiByte(CP_ACP, 0, strw, -1, NULL, 0, NULL, NULL); + *str = mshtml_alloc(*len); + WideCharToMultiByte(CP_ACP, 0, strw, -1, *str, *len, NULL, NULL); + + nsAString_Finish(&nsstr); + + return S_OK; +} + /********************************************************** * IPersistMoniker implementation */ @@ -420,8 +462,27 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *iface, LPCOLESTR pszFileNam static HRESULT WINAPI PersistFile_Save(IPersistFile *iface, LPCOLESTR pszFileName, BOOL fRemember) { HTMLDocument *This = PERSISTFILE_THIS(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(pszFileName), fRemember); - return E_NOTIMPL; + char *str; + DWORD len, written=0; + HANDLE file; + HRESULT hres; + + TRACE("(%p)->(%s %x)\n", This, debugstr_w(pszFileName), fRemember); + + file = CreateFileW(pszFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(file == INVALID_HANDLE_VALUE) { + WARN("Could not create file: %u\n", GetLastError()); + return E_FAIL; + } + + hres = get_doc_string(This, &str, &len); + if(FAILED(hres)) + return hres; + + WriteFile(file, str, len, &written, NULL); + CloseHandle(file); + return S_OK; } static HRESULT WINAPI PersistFile_SaveCompleted(IPersistFile *iface, LPCOLESTR pszFileName) @@ -495,53 +556,22 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM BOOL fClearDirty) { HTMLDocument *This = PERSTRINIT_THIS(iface); - nsIDOMDocument *nsdoc; - nsIDOMNode *nsnode; - nsAString nsstr; - LPCWSTR strw; char *str; DWORD len, written=0; - nsresult nsres; HRESULT hres; WARN("(%p)->(%p %x) needs more work\n", This, pStm, fClearDirty); - if(!This->nscontainer) - return S_OK; - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); - nsIDOMDocument_Release(nsdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNode failed: %08x\n", nsres); - return E_FAIL; - } - - nsAString_Init(&nsstr, NULL); - nsnode_to_nsstring(nsnode, &nsstr); - nsIDOMNode_Release(nsnode); - - nsAString_GetData(&nsstr, &strw, NULL); - - len = WideCharToMultiByte(CP_ACP, 0, strw, -1, NULL, 0, NULL, NULL); - str = mshtml_alloc(len); - WideCharToMultiByte(CP_ACP, 0, strw, -1, str, len, NULL, NULL); - - nsAString_Finish(&nsstr); + hres = get_doc_string(This, &str, &len); + if(FAILED(hres)) + return hres; - TRACE("%s\n", debugstr_a(str)); hres = IStream_Write(pStm, str, len, &written); if(FAILED(hres)) FIXME("Write failed: %08x\n", hres); mshtml_free(str); - return S_OK; }

1 0

Jacek Caban : mshtml: Correctly handle utf-16 encoded pages.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 58a261b7d1293deefcb66242b0435ee869a6c748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a261b7d1293deefcb66242b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 12 21:25:08 2007 +0200 mshtml: Correctly handle utf-16 encoded pages. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 27 +++++++++++++++++---------- dlls/mshtml/nsio.c | 19 +++++++++++++++---- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7038c70..6d8e154 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -165,6 +165,7 @@ typedef struct { nsLoadFlags load_flags; nsIURI *original_uri; char *content; + char *charset; } nsChannel; typedef struct { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f9525e7..a30df13 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" +#define UTF16_STR "utf-16" #define NSINSTREAM(x) ((nsIInputStream*) &(x)->lpInputStreamVtbl) @@ -399,31 +400,37 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); if(This->nslistener) { - if(!This->nsstream) { + if(!This->nsstream) This->nsstream = create_nsprotocol_stream(pstgmed->u.pstm); - nsres = nsIStreamListener_OnStartRequest(This->nslistener, - (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); - if(NS_FAILED(nsres)) - FIXME("OnStartRequest failed: %08x\n", nsres); - } - do { hres = IStream_Read(pstgmed->u.pstm, This->nsstream->buf, sizeof(This->nsstream->buf), &This->nsstream->buf_size); if(!This->nsstream->buf_size) break; + if(!This->readed && This->nsstream->buf_size >= 2 && *(WORD*)This->nsstream->buf == 0xfeff) { + This->nschannel->charset = mshtml_alloc(sizeof(UTF16_STR)); + memcpy(This->nschannel->charset, UTF16_STR, sizeof(UTF16_STR)); + } + + if(!This->readed) { + nsres = nsIStreamListener_OnStartRequest(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); + if(NS_FAILED(nsres)) + FIXME("OnStartRequest failed: %08x\n", nsres); + } + + This->readed += This->nsstream->buf_size; + nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, NSINSTREAM(This->nsstream), This->readed, This->nsstream->buf_size); if(NS_FAILED(nsres)) - FIXME("OnDataAvailable failed: %08x\n", nsres); + ERR("OnDataAvailable failed: %08x\n", nsres); if(This->nsstream->buf_size) FIXME("buffer is not empty!\n"); - - This->readed += This->nsstream->buf_size; }while(hres == S_OK); }else { BYTE buf[1024]; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 06bad64..e3eba43 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -221,6 +221,7 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) if(This->original_uri) nsIURI_Release(This->original_uri); mshtml_free(This->content); + mshtml_free(This->charset); mshtml_free(This); } @@ -512,11 +513,20 @@ static nsresult NSAPI nsChannel_GetContentCharset(nsIHttpChannel *iface, TRACE("(%p)->(%p)\n", This, aContentCharset); - if(This->channel) - return nsIChannel_GetContentCharset(This->channel, aContentCharset); + if(This->charset) { + nsACString_SetData(aContentCharset, This->charset); + return NS_OK; + } - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(This->channel) { + nsresult nsres = nsIChannel_GetContentCharset(This->channel, aContentCharset); + const char *ch; + nsACString_GetData(aContentCharset, &ch, NULL); + return nsres; + } + + nsACString_SetData(aContentCharset, ""); + return NS_OK; } static nsresult NSAPI nsChannel_SetContentCharset(nsIHttpChannel *iface, @@ -1871,6 +1881,7 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI ret->notif_callback = NULL; ret->load_flags = 0; ret->content = NULL; + ret->charset = NULL; nsIURI_AddRef(aURI); ret->original_uri = aURI;

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::get_background implementation .
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: f44e289a861659593002a7d415aee9c877f00122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44e289a861659593002a7d41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 12 21:22:51 2007 +0200 mshtml: Added IHTMLBodyElement::get_background implementation. --- dlls/mshtml/htmlbody.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 542c989..6c7c48a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -145,8 +145,27 @@ static HRESULT WINAPI HTMLBodyElement_put_background(IHTMLBodyElement *iface, BS static HRESULT WINAPI HTMLBodyElement_get_background(IHTMLBodyElement *iface, BSTR *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString background_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&background_str, NULL); + + nsres = nsIDOMHTMLBodyElement_GetBackground(This->nsbody, &background_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *background; + nsAString_GetData(&background_str, &background, NULL); + *p = SysAllocString(background); + }else { + ERR("GetBackground failed: %08x\n", nsres); + *p = NULL; + } + + nsAString_Finish(&background_str); + + TRACE("*p = %s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_bgProperties(IHTMLBodyElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Change TRACE to FIXME in stubs.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 8b13f18df0d52924515525e40646777a37a89e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b13f18df0d52924515525e40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 12 21:21:49 2007 +0200 mshtml: Change TRACE to FIXME in stubs. --- dlls/mshtml/htmlbody.c | 70 ++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index f8be550..542c989 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -138,245 +138,245 @@ static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dis static HRESULT WINAPI HTMLBodyElement_put_background(IHTMLBodyElement *iface, BSTR v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_background(IHTMLBodyElement *iface, BSTR *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_bgProperties(IHTMLBodyElement *iface, BSTR v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_bgProperties(IHTMLBodyElement *iface, BSTR *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_leftMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_leftMargin(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_topMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_topMargin(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_rightMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_rightMargin(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_bottomMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_bottomMargin(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_noWrap(IHTMLBodyElement *iface, VARIANT_BOOL v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%x)\n", This, v); + FIXME("(%p)->(%x)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_noWrap(IHTMLBodyElement *iface, VARIANT_BOOL *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_vLink(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_onload(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_onunload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_onunload(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_scroll(IHTMLBodyElement *iface, BSTR v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_onselect(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_onselect(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_put_onbeforeunload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_get_onbeforeunload(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, p); + FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, IHTMLTxtRange **range) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)->(%p)\n", This, range); + FIXME("(%p)->(%p)\n", This, range); return E_NOTIMPL; }

1 0