November 2008 - Wine-Commits

Alexandre Julliard : ntdll: Store the per-page committed status in the server for anonymous file mappings .
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: cdce50f5bee8a388df51fb10d76994373449af6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdce50f5bee8a388df51fb10d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 5 12:24:05 2008 +0100 ntdll: Store the per-page committed status in the server for anonymous file mappings. --- dlls/ntdll/virtual.c | 78 +++++++++++++++----- include/wine/server_protocol.h | 37 +++++++++- server/mapping.c | 139 ++++++++++++++++++++++++++++++++++- server/protocol.def | 18 +++++ server/request.h | 4 + server/trace.c | 161 ++++++++++++++++++++++++---------------- 6 files changed, 351 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdce50f5bee8a388df51f…

1 0

Andrew Talbot : quartz: Sign-compare warnings fix.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: a19ff5f07b3b59f82d4ee0976a7310bed8cdbf3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19ff5f07b3b59f82d4ee0976… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 4 22:22:53 2008 +0000 quartz: Sign-compare warnings fix. --- dlls/quartz/enummedia.c | 2 +- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/main.c | 9 +++++---- dlls/quartz/mpegsplit.c | 4 ++-- dlls/quartz/parser.c | 4 ++-- dlls/quartz/waveparser.c | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c index ed5edb3..f18cb90 100644 --- a/dlls/quartz/enummedia.c +++ b/dlls/quartz/enummedia.c @@ -168,7 +168,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) if (!refCount) { - int i; + ULONG i; for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) if (This->enumMediaDetails.pMediaTypes[i].pbFormat) CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5837a47..eec0e44 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1025,7 +1025,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, hr = GetInternalConnections(pfilter, ppinfilter, &ppins, &nb); if (SUCCEEDED(hr)) { - int i; + unsigned int i; if (nb == 0) { IPin_Disconnect(ppinfilter); IPin_Disconnect(ppinOut); @@ -1036,7 +1036,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, { LPWSTR pinname = NULL; - TRACE("Processing pin %d\n", i); + TRACE("Processing pin %u\n", i); hr = IPin_QueryId(ppins[i], &pinname); if (SUCCEEDED(hr)) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index daefdc5..5eece59 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -24,6 +24,7 @@ #include "wine/debug.h" #include "quartz_private.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); @@ -280,7 +281,7 @@ LONG WINAPI DBToAmpFactor(LONG db) */ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) { - int len; + unsigned int len; static const char format[] = "Error: 0x%x"; char error[MAX_ERROR_TEXT_LEN]; @@ -288,7 +289,7 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) if (!buffer) return 0; wsprintfA(error, format, hr); - if ((len = lstrlenA(error)) >= maxlen) return 0; + if ((len = strlen(error)) >= maxlen) return 0; lstrcpyA(buffer, error); return len; } @@ -298,7 +299,7 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) */ DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen) { - int len; + unsigned int len; static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0}; WCHAR error[MAX_ERROR_TEXT_LEN]; @@ -306,7 +307,7 @@ DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen) if (!buffer) return 0; wsprintfW(error, format, hr); - if ((len = lstrlenW(error)) >= maxlen) return 0; + if ((len = strlenW(error)) >= maxlen) return 0; lstrcpyW(buffer, error); return len; } diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 8625277..b5b01ff 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -286,7 +286,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile || This->position >= This->Parser.mediaSeeking.llStop) { - int i; + unsigned int i; TRACE("End of file reached\n"); @@ -301,7 +301,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, IPin_Release(ppin); } if (FAILED(hr)) - WARN("Error sending EndOfStream to pin %d (%x)\n", i, hr); + WARN("Error sending EndOfStream to pin %u (%x)\n", i, hr); } /* Force the pullpin thread to stop */ diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 628eab6..59ff427 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -219,7 +219,7 @@ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) { ParserImpl *This = (ParserImpl *)iface; PullPin *pin = (PullPin *)This->ppPins[0]; - int i; + ULONG i; TRACE("()\n"); @@ -293,7 +293,7 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) ParserImpl *This = (ParserImpl *)iface; PullPin *pin = (PullPin *)This->ppPins[0]; - int i; + ULONG i; TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index dbc096c..774db98 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -142,7 +142,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR if (tStop >= This->EndOfFile || (bytepos_to_duration(This, tStop) >= This->Parser.mediaSeeking.llStop) || hr == VFW_E_NOT_CONNECTED) { - int i; + unsigned int i; TRACE("End of file reached\n"); @@ -151,7 +151,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR IPin* ppin; HRESULT hr; - TRACE("Send End Of Stream to output pin %d\n", i); + TRACE("Send End Of Stream to output pin %u\n", i); hr = IPin_ConnectedTo(This->Parser.ppPins[i+1], &ppin); if (SUCCEEDED(hr))

1 0

Michael Stefaniuc : make_requests: Do not generate code that casts zero to a pointer.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: df17fcdafb40ce789bf1821063fe80eed0b313c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df17fcdafb40ce789bf182106… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 5 10:50:38 2008 +0100 make_requests: Do not generate code that casts zero to a pointer. --- tools/make_requests | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_requests b/tools/make_requests index 2dcac16..8dd21a1 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -338,7 +338,7 @@ push @trace_lines, "};\n\n"; push @trace_lines, "static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {\n"; foreach my $req (@requests) { - push @trace_lines, " (dump_func)", $replies{$req} ? "dump_${req}_reply,\n" : "0,\n"; + push @trace_lines, " ", $replies{$req} ? "(dump_func)dump_${req}_reply,\n" : "NULL,\n"; } push @trace_lines, "};\n\n";

1 0

Michael Stefaniuc : shell32: Use FIELD_OFFSET instead of hand coding its functionality.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: 3591663ccafb3991f747b1ce8ef9e2a2a4f2465c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3591663ccafb3991f747b1ce8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 5 10:17:13 2008 +0100 shell32: Use FIELD_OFFSET instead of hand coding its functionality. --- dlls/shell32/shfldr_netplaces.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index d0e9833..c661c51 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -66,8 +66,8 @@ static const IShellFolder2Vtbl vt_ShellFolder2; static const IPersistFolder2Vtbl vt_NP_PersistFolder2; -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) -#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); +#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = \ + (class*)(((char*)name) - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)) #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) #define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl)

1 0

Michael Stefaniuc : user32: Remove superfluous casts of void pointers.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: fb11803d196e1ebe47901fdeeaaad41813227b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb11803d196e1ebe47901fdee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 4 23:35:56 2008 +0100 user32: Remove superfluous casts of void pointers. --- dlls/user32/cursoricon.c | 28 ++++++++++++++-------------- dlls/user32/dde_client.c | 4 ++-- dlls/user32/dde_misc.c | 8 ++++---- dlls/user32/dde_server.c | 4 ++-- dlls/user32/dialog.c | 8 ++++---- dlls/user32/edit.c | 2 +- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/tests/dialog.c | 2 +- dlls/user32/uitools.c | 2 +- dlls/user32/wnd16.c | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb11803d196e1ebe47901…

1 0

Michael Stefaniuc : fusion: Remove superfluous casts of void pointers.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: 311bef2a5c21269858d622827deedb830353191f URL: http://source.winehq.org/git/wine.git/?a=commit;h=311bef2a5c21269858d622827… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 4 23:35:16 2008 +0100 fusion: Remove superfluous casts of void pointers. --- dlls/fusion/assembly.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 75ca048..dfa4492 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -502,7 +502,7 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) ULONG currofs; currofs = offset; - assembly->tableshdr = (METADATATABLESHDR *)assembly_data_offset(assembly, currofs); + assembly->tableshdr = assembly_data_offset(assembly, currofs); if (!assembly->tableshdr) return E_FAIL; @@ -514,7 +514,7 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) sizeof(DWORD) : sizeof(WORD); currofs += sizeof(METADATATABLESHDR); - assembly->numrows = (DWORD *)assembly_data_offset(assembly, currofs); + assembly->numrows = assembly_data_offset(assembly, currofs); if (!assembly->numrows) return E_FAIL; @@ -628,9 +628,9 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly) return hr; } else if (!lstrcmpA(stream, "#Strings") || !lstrcmpA(stream, "Strings")) - assembly->strings = (BYTE *)assembly_data_offset(assembly, ofs); + assembly->strings = assembly_data_offset(assembly, ofs); else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) - assembly->blobs = (BYTE *)assembly_data_offset(assembly, ofs); + assembly->blobs = assembly_data_offset(assembly, ofs); ptr += lstrlenA(stream) + 1; ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ @@ -883,7 +883,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token) if (offset == -1) return E_FAIL; - asmtbl = (ASSEMBLYTABLE *)assembly_data_offset(assembly, offset); + asmtbl = assembly_data_offset(assembly, offset); if (!asmtbl) return E_FAIL;

1 0

Lei Zhang : wininet: Handle HTTP 303 redirects.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: be2570f7a061086baf4b68038337f79c1d5ebe45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2570f7a061086baf4b68038… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 4 16:44:30 2008 -0800 wininet: Handle HTTP 303 redirects. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 23686f2..05e95eb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -874,7 +874,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, { DWORD dwCode,dwCodeLength=sizeof(DWORD); if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && - (dwCode==302 || dwCode==301)) + (dwCode==302 || dwCode==301 || dwCode==303)) { WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation);

1 0

Lei Zhang : wininet: Remove redundant variables.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: 905f628c0553daf32a2e65d18cebee7c1e6abfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=905f628c0553daf32a2e65d18… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 4 10:51:44 2008 -0800 wininet: Remove redundant variables. --- dlls/wininet/http.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e088fa4..23686f2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2880,8 +2880,6 @@ static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) */ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { - static const WCHAR szContentType[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0}; - static const WCHAR szContentLength[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0}; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; @@ -3073,10 +3071,10 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) } /* Remove custom content-type/length headers on redirects. */ - index = HTTP_GetCustomHeaderIndex(lpwhr, szContentType, 0, TRUE); + index = HTTP_GetCustomHeaderIndex(lpwhr, szContent_Type, 0, TRUE); if (0 <= index) HTTP_DeleteCustomHeader(lpwhr, index); - index = HTTP_GetCustomHeaderIndex(lpwhr, szContentLength, 0, TRUE); + index = HTTP_GetCustomHeaderIndex(lpwhr, szContent_Length, 0, TRUE); if (0 <= index) HTTP_DeleteCustomHeader(lpwhr, index);

1 0

Jacek Caban : jscript: Added SCRIPTSTATE_CONNECTED implementation.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: 73658a8bc02304e7c876725dfb4b6ae45c68c429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73658a8bc02304e7c876725df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 5 01:03:19 2008 +0100 jscript: Added SCRIPTSTATE_CONNECTED implementation. --- dlls/jscript/jscript.c | 11 +++++++++-- dlls/jscript/tests/jscript.c | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 938b64e..c4bd890 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -264,6 +264,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: + case SCRIPTSTATE_CONNECTED: /* FIXME */ if(This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; @@ -308,9 +309,15 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) if(This->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; - clear_script_queue(This); - if(This->ctx) { + if(This->ctx->state == SCRIPTSTATE_CONNECTED) + change_state(This, SCRIPTSTATE_DISCONNECTED); + + clear_script_queue(This); + + if(This->ctx->state == SCRIPTSTATE_DISCONNECTED) + change_state(This, SCRIPTSTATE_INITIALIZED); + if(This->ctx->named_items) { named_item_t *iter, *iter2; diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 35818cc..4cc01c9 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -61,6 +61,8 @@ static const CLSID CLSID_JScript = DEFINE_EXPECT(GetLCID); DEFINE_EXPECT(OnStateChange_STARTED); +DEFINE_EXPECT(OnStateChange_CONNECTED); +DEFINE_EXPECT(OnStateChange_DISCONNECTED); DEFINE_EXPECT(OnStateChange_CLOSED); DEFINE_EXPECT(OnStateChange_INITIALIZED); DEFINE_EXPECT(OnEnterScript); @@ -134,6 +136,12 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S case SCRIPTSTATE_STARTED: CHECK_EXPECT(OnStateChange_STARTED); return S_OK; + case SCRIPTSTATE_CONNECTED: + CHECK_EXPECT(OnStateChange_CONNECTED); + return S_OK; + case SCRIPTSTATE_DISCONNECTED: + CHECK_EXPECT(OnStateChange_DISCONNECTED); + return S_OK; case SCRIPTSTATE_CLOSED: CHECK_EXPECT(OnStateChange_CLOSED); return S_OK; @@ -376,9 +384,20 @@ static void test_jscript2(void) hres = IActiveScriptParse_InitNew(parse); ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + test_state(script, SCRIPTSTATE_CONNECTED); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(script); ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); CHECK_CALLED(OnStateChange_CLOSED); test_state(script, SCRIPTSTATE_CLOSED);

1 0

Jacek Caban : jscript: Fixed SetScriptSite called before InitNew handling.
by Alexandre Julliard Nov. 5, 2008

Nov. 5, 2008

Module: wine Branch: master Commit: 89327655807842586589c185664360de221de940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89327655807842586589c1856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 5 01:03:03 2008 +0100 jscript: Fixed SetScriptSite called before InitNew handling. --- dlls/jscript/jscript.c | 42 ++++++++++++++++++--------------- dlls/jscript/tests/jscript.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 081f468..938b64e 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -36,6 +36,7 @@ typedef struct { DWORD safeopt; script_ctx_t *ctx; LONG thread_id; + LCID lcid; IActiveScriptSite *site; @@ -127,6 +128,26 @@ static void exec_queued_code(JScript *This) clear_script_queue(This); } +static HRESULT set_ctx_site(JScript *This) +{ + HRESULT hres; + + This->ctx->lcid = This->lcid; + + if(!This->ctx->script_disp) { + hres = create_dispex(This->ctx, NULL, NULL, &This->ctx->script_disp); + if(FAILED(hres)) + return hres; + } + + hres = init_global(This->ctx); + if(FAILED(hres)) + return hres; + + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; +} + #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, void **ppv) @@ -211,22 +232,6 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, if(This->site) return E_UNEXPECTED; - if(!This->ctx) { - hres = IActiveScriptParse_InitNew(ASPARSE(This)); - if(FAILED(hres)) - return hres; - } - - if(!This->ctx->script_disp) { - hres = create_dispex(This->ctx, NULL, NULL, &This->ctx->script_disp); - if(FAILED(hres)) - return hres; - } - - hres = init_global(This->ctx); - if(FAILED(hres)) - return hres; - if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) return E_UNEXPECTED; @@ -237,8 +242,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, if(hres == S_OK) This->ctx->lcid = lcid; - change_state(This, SCRIPTSTATE_INITIALIZED); - return S_OK; + return This->ctx ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI JScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -517,7 +521,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; } - return S_OK; + return This->site ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI JScriptParse_AddScriptlet(IActiveScriptParse *iface, diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index b0c532f..35818cc 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -339,11 +339,64 @@ static void test_jscript(void) ok(!ref, "ref = %d\n", ref); } +static void test_jscript2(void) +{ + IActiveScriptParse *parse; + IActiveScript *script; + IUnknown *unk; + ULONG ref; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScript, (void**)&script); + ok(hres == S_OK, "Could not get IActiveScript: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + SET_EXPECT(GetLCID); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScriptParse_InitNew(parse); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_INITIALIZED); + + hres = IActiveScriptParse_InitNew(parse); + ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); + + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + test_script_dispatch(script, FALSE); + + IActiveScriptParse_Release(parse); + IActiveScript_Release(script); + + ref = IUnknown_Release(unk); + ok(!ref, "ref = %d\n", ref); +} + START_TEST(jscript) { CoInitialize(NULL); test_jscript(); + test_jscript2(); CoUninitialize(); }

1 0