February 2011 - Wine-commits

Alexandre Julliard : cabinet: Preserve trailing slash on directory name in Extract().
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: 130e38e0477b5df2ea9bee0d19269f04bb6427c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130e38e0477b5df2ea9bee0d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 21 18:19:11 2011 +0100 cabinet: Preserve trailing slash on directory name in Extract(). --- dlls/cabinet/cabinet_main.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 45454f4..1f0daf8 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -331,7 +331,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) { HRESULT res = S_OK; HFDI hfdi; - char *str, *path, *name; + char *str, *end, *path = NULL, *name = NULL; TRACE("(%p, %s)\n", dest, szCabName); @@ -363,13 +363,22 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) } lstrcpyA(str, szCabName); - path = str; - name = strrchr(path, '\\'); - if (name) - *name++ = 0; + if ((end = strrchr(str, '\\'))) + { + end++; + name = HeapAlloc( GetProcessHeap(), 0, strlen(end) + 1 ); + if (!name) + { + res = E_OUTOFMEMORY; + goto end; + } + strcpy( name, end ); + *end = 0; + path = str; + } else { - name = path; + name = str; path = NULL; } @@ -379,10 +388,9 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) fdi_notify_extract, NULL, dest)) res = HRESULT_FROM_WIN32(GetLastError()); - HeapFree(GetProcessHeap(), 0, str); end: - + HeapFree(GetProcessHeap(), 0, path); + HeapFree(GetProcessHeap(), 0, name); FDIDestroy(hfdi); - return res; }

1 0

Maarten Lankhorst : gdiplus: Implement in-memory font storage.
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: 8794f8f7086b46d6726d69dfe7a03974e5df48f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8794f8f7086b46d6726d69dfe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 16 19:09:15 2011 +0100 gdiplus: Implement in-memory font storage. --- dlls/gdiplus/font.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 843cfb5..242a857 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -930,17 +930,158 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection* fontCollection, return NotImplemented; } +/* Copied from msi/font.c */ + +typedef struct _tagTT_OFFSET_TABLE { + USHORT uMajorVersion; + USHORT uMinorVersion; + USHORT uNumOfTables; + USHORT uSearchRange; + USHORT uEntrySelector; + USHORT uRangeShift; +} TT_OFFSET_TABLE; + +typedef struct _tagTT_TABLE_DIRECTORY { + char szTag[4]; /* table name */ + ULONG uCheckSum; /* Check sum */ + ULONG uOffset; /* Offset from beginning of file */ + ULONG uLength; /* length of the table in bytes */ +} TT_TABLE_DIRECTORY; + +typedef struct _tagTT_NAME_TABLE_HEADER { + USHORT uFSelector; /* format selector. Always 0 */ + USHORT uNRCount; /* Name Records count */ + USHORT uStorageOffset; /* Offset for strings storage, + * from start of the table */ +} TT_NAME_TABLE_HEADER; + +#define NAME_ID_FULL_FONT_NAME 4 +#define NAME_ID_VERSION 5 + +typedef struct _tagTT_NAME_RECORD { + USHORT uPlatformID; + USHORT uEncodingID; + USHORT uLanguageID; + USHORT uNameID; + USHORT uStringLength; + USHORT uStringOffset; /* from start of storage area */ +} TT_NAME_RECORD; + +#define SWAPWORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) +#define SWAPLONG(x) MAKELONG(SWAPWORD(HIWORD(x)), SWAPWORD(LOWORD(x))) + +/* + * Code based off of code located here + * http://www.codeproject.com/gdi/fontnamefromfile.asp + */ +WCHAR *load_ttf_name_id( const char *mem, DWORD_PTR size, DWORD id, WCHAR *ret, DWORD len ) +{ + const TT_TABLE_DIRECTORY *tblDir; + TT_OFFSET_TABLE ttOffsetTable; + TT_NAME_TABLE_HEADER ttNTHeader; + TT_NAME_RECORD ttRecord; + DWORD ofs, pos; + int i; + + if (sizeof(TT_OFFSET_TABLE) > size) + return NULL; + ttOffsetTable = *(TT_OFFSET_TABLE*)mem; + ttOffsetTable.uNumOfTables = SWAPWORD(ttOffsetTable.uNumOfTables); + ttOffsetTable.uMajorVersion = SWAPWORD(ttOffsetTable.uMajorVersion); + ttOffsetTable.uMinorVersion = SWAPWORD(ttOffsetTable.uMinorVersion); + + if (ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) + return NULL; + + pos = sizeof(ttOffsetTable); + for (i = 0; i < ttOffsetTable.uNumOfTables; i++) + { + tblDir = (const TT_TABLE_DIRECTORY*)&mem[pos]; + pos += sizeof(*tblDir); + if (memcmp(tblDir->szTag,"name",4)==0) + { + ofs = SWAPLONG(tblDir->uOffset); + break; + } + } + if (i >= ttOffsetTable.uNumOfTables) + return NULL; + + pos = ofs + sizeof(ttNTHeader); + if (pos > size) + return NULL; + ttNTHeader = *(TT_NAME_TABLE_HEADER*)&mem[ofs]; + ttNTHeader.uNRCount = SWAPWORD(ttNTHeader.uNRCount); + ttNTHeader.uStorageOffset = SWAPWORD(ttNTHeader.uStorageOffset); + for(i=0; i<ttNTHeader.uNRCount; i++) + { + ttRecord = *(TT_NAME_RECORD*)&mem[pos]; + pos += sizeof(ttRecord); + if (pos > size) + return NULL; + + ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); + if (ttRecord.uNameID == id) + { + const char *buf; + + ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength); + ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset); + if (ofs + ttRecord.uStringOffset + ttNTHeader.uStorageOffset + ttRecord.uStringLength > size) + return NULL; + buf = mem + ofs + ttRecord.uStringOffset + ttNTHeader.uStorageOffset; + len = MultiByteToWideChar(CP_ACP, 0, buf, ttRecord.uStringLength, ret, len-1); + ret[len] = 0; + return ret; + } + } + return NULL; +} + +static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam); + /***************************************************************************** * GdipPrivateAddMemoryFont [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, GDIPCONST void* memory, INT length) { - FIXME("%p, %p, %d\n", fontCollection, memory, length); + WCHAR buf[32], *name; + DWORD count = 0; + HANDLE font; + TRACE("%p, %p, %d\n", fontCollection, memory, length); - if (!(fontCollection && memory && length)) + if (!fontCollection || !memory || !length) return InvalidParameter; + name = load_ttf_name_id(memory, length, NAME_ID_FULL_FONT_NAME, buf, sizeof(buf)/sizeof(*buf)); + if (!name) + return OutOfMemory; + + font = AddFontMemResourceEx((void*)memory, length, NULL, &count); + TRACE("%s: %p/%u\n", debugstr_w(name), font, count); + if (!font || !count) + return InvalidParameter; + + if (count) + { + HDC hdc; + LOGFONTW lfw; + + hdc = GetDC(0); + + lfw.lfCharSet = DEFAULT_CHARSET; + lstrcpyW(lfw.lfFaceName, name); + lfw.lfPitchAndFamily = 0; + + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) + { + ReleaseDC(0, hdc); + return OutOfMemory; + } + + ReleaseDC(0, hdc); + } return Ok; }

1 0

Jacek Caban : jscript: Added SetScriptState(SCRIPTSTATE_UNINITIALIZED) implementation.
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: 244a6951acebbc2080a0f45e615b35e7044d8a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244a6951acebbc2080a0f45e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 21 17:49:15 2011 +0100 jscript: Added SetScriptState(SCRIPTSTATE_UNINITIALIZED) implementation. --- dlls/jscript/jscript.c | 163 +++++++++++++++++++++++++++++------------------- 1 files changed, 99 insertions(+), 64 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index e5123b4..a69b293 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "jscript.h" #include "engine.h" #include "objsafe.h" @@ -77,7 +79,8 @@ static void change_state(JScript *This, SCRIPTSTATE state) return; This->ctx->state = state; - IActiveScriptSite_OnStateChange(This->site, state); + if(This->site) + IActiveScriptSite_OnStateChange(This->site, state); } static inline BOOL is_started(script_ctx_t *ctx) @@ -153,6 +156,86 @@ static HRESULT set_ctx_site(JScript *This) return S_OK; } +static void decrease_state(JScript *This, SCRIPTSTATE state) +{ + if(This->ctx) { + switch(This->ctx->state) { + case SCRIPTSTATE_CONNECTED: + change_state(This, SCRIPTSTATE_DISCONNECTED); + if(state == SCRIPTSTATE_DISCONNECTED) + return; + + case SCRIPTSTATE_STARTED: + case SCRIPTSTATE_DISCONNECTED: + clear_script_queue(This); + + if(This->ctx->state == SCRIPTSTATE_DISCONNECTED) + change_state(This, SCRIPTSTATE_INITIALIZED); + if(state == SCRIPTSTATE_INITIALIZED) + return; + + case SCRIPTSTATE_INITIALIZED: + if(This->ctx->host_global) { + IDispatch_Release(This->ctx->host_global); + This->ctx->host_global = NULL; + } + + if(This->ctx->named_items) { + named_item_t *iter, *iter2; + + iter = This->ctx->named_items; + while(iter) { + iter2 = iter->next; + + if(iter->disp) + IDispatch_Release(iter->disp); + heap_free(iter->name); + heap_free(iter); + iter = iter2; + } + + This->ctx->named_items = NULL; + } + + if(This->ctx->secmgr) { + IInternetHostSecurityManager_Release(This->ctx->secmgr); + This->ctx->secmgr = NULL; + } + + if(This->ctx->site) { + IActiveScriptSite_Release(This->ctx->site); + This->ctx->site = NULL; + } + + if(This->ctx->global) { + jsdisp_release(This->ctx->global); + This->ctx->global = NULL; + } + + case SCRIPTSTATE_UNINITIALIZED: + change_state(This, state); + break; + default: + assert(0); + } + + change_state(This, state); + }else if(state == SCRIPTSTATE_UNINITIALIZED) { + if(This->site) + IActiveScriptSite_OnStateChange(This->site, state); + }else { + FIXME("NULL ctx\n"); + } + + if(state == SCRIPTSTATE_UNINITIALIZED) + This->thread_id = 0; + + if(This->site) { + IActiveScriptSite_Release(This->site); + This->site = NULL; + } +} + typedef struct { IServiceProvider IServiceProvider_iface; @@ -365,7 +448,18 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s TRACE("(%p)->(%d)\n", This, ss); - if(!This->ctx || GetCurrentThreadId() != This->thread_id) + if(This->thread_id && GetCurrentThreadId() != This->thread_id) + return E_UNEXPECTED; + + if(ss == SCRIPTSTATE_UNINITIALIZED) { + if(This->ctx && This->ctx->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + decrease_state(This, SCRIPTSTATE_UNINITIALIZED); + return S_OK; + } + + if(!This->ctx) return E_UNEXPECTED; switch(ss) { @@ -397,12 +491,7 @@ static HRESULT WINAPI JScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE * if(!pssState) return E_POINTER; - if(!This->thread_id) { - *pssState = SCRIPTSTATE_UNINITIALIZED; - return S_OK; - } - - if(This->thread_id != GetCurrentThreadId()) + if(This->thread_id && This->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; *pssState = This->ctx ? This->ctx->state : SCRIPTSTATE_UNINITIALIZED; @@ -415,64 +504,10 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) TRACE("(%p)->()\n", This); - if(This->thread_id != GetCurrentThreadId()) + if(This->thread_id && This->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; - 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->host_global) { - IDispatch_Release(This->ctx->host_global); - This->ctx->host_global = NULL; - } - - if(This->ctx->named_items) { - named_item_t *iter, *iter2; - - iter = This->ctx->named_items; - while(iter) { - iter2 = iter->next; - - if(iter->disp) - IDispatch_Release(iter->disp); - heap_free(iter->name); - heap_free(iter); - iter = iter2; - } - - This->ctx->named_items = NULL; - } - - if(This->ctx->secmgr) { - IInternetHostSecurityManager_Release(This->ctx->secmgr); - This->ctx->secmgr = NULL; - } - - if(This->ctx->site) { - IActiveScriptSite_Release(This->ctx->site); - This->ctx->site = NULL; - } - - if (This->site) - change_state(This, SCRIPTSTATE_CLOSED); - - if(This->ctx->global) { - jsdisp_release(This->ctx->global); - This->ctx->global = NULL; - } - } - - if(This->site) { - IActiveScriptSite_Release(This->site); - This->site = NULL; - } - + decrease_state(This, SCRIPTSTATE_CLOSED); return S_OK; }

1 0

Jacek Caban : jscript: Added more uninitialization tests.
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: 01a6286b5fc4b36bce412209270d539ea8113ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a6286b5fc4b36bce4122092… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 21 17:49:32 2011 +0100 jscript: Added more uninitialization tests. --- dlls/jscript/tests/jscript.c | 154 ++++++++++++++++++++++++++++++++---------- 1 files changed, 119 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index ce25781..6d48799 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -60,6 +60,7 @@ static const CLSID CLSID_JScript = }while(0) DEFINE_EXPECT(GetLCID); +DEFINE_EXPECT(OnStateChange_UNINITIALIZED); DEFINE_EXPECT(OnStateChange_STARTED); DEFINE_EXPECT(OnStateChange_CONNECTED); DEFINE_EXPECT(OnStateChange_DISCONNECTED); @@ -145,6 +146,9 @@ static HRESULT WINAPI ActiveScriptSite_OnScriptTerminate(IActiveScriptSite *ifac static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, SCRIPTSTATE ssScriptState) { switch(ssScriptState) { + case SCRIPTSTATE_UNINITIALIZED: + CHECK_EXPECT(OnStateChange_UNINITIALIZED); + return S_OK; case SCRIPTSTATE_STARTED: CHECK_EXPECT(OnStateChange_STARTED); return S_OK; @@ -373,34 +377,33 @@ static void test_invoke_versioning(IActiveScript *script) ok(hres == S_OK, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); } +static IActiveScript *create_jscript(void) +{ + IActiveScript *ret; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScript, (void**)&ret); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + return ret; +} + static void test_jscript(void) { IActiveScriptParse *parse; IActiveScript *script; IDispatchEx *dispex; - 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); + script = create_jscript(); - hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); - if (FAILED(hres)) - { - IActiveScript_Release(script); - return; - } test_state(script, SCRIPTSTATE_UNINITIALIZED); - test_safety(unk); + test_safety((IUnknown*)script); test_invoke_versioning(script); hres = IActiveScriptParse64_InitNew(parse); @@ -448,9 +451,8 @@ static void test_jscript(void) IDispatchEx_Release(dispex); IUnknown_Release(parse); - IActiveScript_Release(script); - ref = IUnknown_Release(unk); + ref = IActiveScript_Release(script); ok(!ref, "ref = %d\n", ref); } @@ -458,26 +460,13 @@ 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); + script = create_jscript(); - hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); - if (FAILED(hres)) - { - IActiveScript_Release(script); - return; - } test_state(script, SCRIPTSTATE_UNINITIALIZED); @@ -516,9 +505,103 @@ static void test_jscript2(void) test_no_script_dispatch(script); IUnknown_Release(parse); - IActiveScript_Release(script); - ref = IUnknown_Release(unk); + ref = IActiveScript_Release(script); + ok(!ref, "ref = %d\n", ref); +} + +static void test_jscript_uninitializing(void) +{ + IActiveScriptParse *parse; + IActiveScript *script; + IDispatchEx *dispex; + ULONG ref; + HRESULT hres; + + static const WCHAR script_textW[] = + {'f','u','n','c','t','i','o','n',' ','f','(',')',' ','{','}',0}; + + script = create_jscript(); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScriptParse64_InitNew(parse); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + test_state(script, SCRIPTSTATE_INITIALIZED); + + hres = IActiveScriptParse64_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == E_UNEXPECTED, "SetScriptSite failed: %08x, expected E_UNEXPECTED\n", hres); + + SET_EXPECT(OnStateChange_UNINITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_UNINITIALIZED); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + + test_state(script, SCRIPTSTATE_CONNECTED); + + dispex = get_script_dispatch(script); + ok(dispex != NULL, "dispex == NULL\n"); + IDispatchEx_Release(dispex); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_UNINITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_UNINITIALIZED); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + test_state(script, SCRIPTSTATE_CLOSED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x, expected E_UNEXPECTED\n", hres); + + test_state(script, SCRIPTSTATE_CLOSED); + + IUnknown_Release(parse); + + ref = IActiveScript_Release(script); ok(!ref, "ref = %d\n", ref); } @@ -542,6 +625,7 @@ START_TEST(jscript) if(check_jscript()) { test_jscript(); test_jscript2(); + test_jscript_uninitializing(); }else { win_skip("Broken engine, probably too old\n"); }

1 0

Nikolay Sivov : msxml3: Store document event handler for ready state notification.
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: df08e9b4f63064e017f6f1058cec87f1fb7a6dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df08e9b4f63064e017f6f1058… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 19 17:09:58 2011 +0300 msxml3: Store document event handler for ready state notification. --- dlls/msxml3/domdoc.c | 54 +++++++++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 51 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f5bfaa4..417b988 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -105,6 +105,13 @@ struct ConnectionPoint DWORD sinks_size; }; +typedef enum { + EVENTID_READYSTATECHANGE = 0, + EVENTID_DATAAVAILABLE, + EVENTID_TRANSFORMNODE, + EVENTID_LAST +} eventid_t; + struct domdoc { xmlnode node; @@ -136,8 +143,37 @@ struct domdoc ConnectionPoint cp_domdocevents; ConnectionPoint cp_propnotif; ConnectionPoint cp_dispatch; + + /* events */ + IDispatch *events[EVENTID_LAST]; }; +static HRESULT set_doc_event(domdoc *doc, eventid_t eid, const VARIANT *v) +{ + IDispatch *disp; + + switch (V_VT(v)) + { + case VT_UNKNOWN: + if (V_UNKNOWN(v)) + IUnknown_QueryInterface(V_UNKNOWN(v), &IID_IDispatch, (void**)&disp); + else + disp = NULL; + break; + case VT_DISPATCH: + disp = V_DISPATCH(v); + if (disp) IDispatch_AddRef(disp); + break; + default: + return DISP_E_TYPEMISMATCH; + } + + if (doc->events[eid]) IDispatch_Release(doc->events[eid]); + doc->events[eid] = disp; + + return S_OK; +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return (ConnectionPoint *)((char*)iface - FIELD_OFFSET(ConnectionPoint, lpVtblConnectionPoint)); @@ -909,6 +945,8 @@ static ULONG WINAPI domdoc_Release( if ( ref == 0 ) { + int eid; + if(This->bsc) detach_bsc(This->bsc); @@ -917,6 +955,10 @@ static ULONG WINAPI domdoc_Release( destroy_xmlnode(&This->node); if (This->stream) IStream_Release(This->stream); + + for (eid = 0; eid < EVENTID_LAST; eid++) + if (This->events[eid]) IDispatch_Release(This->events[eid]); + heap_free(This); } @@ -2470,13 +2512,14 @@ static HRESULT WINAPI domdoc_put_preserveWhiteSpace( } -static HRESULT WINAPI domdoc_put_onReadyStateChange( +static HRESULT WINAPI domdoc_put_onreadystatechange( IXMLDOMDocument3 *iface, - VARIANT readyStateChangeSink ) + VARIANT event ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("%p\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&event)); + return set_doc_event(This, EVENTID_READYSTATECHANGE, &event); } @@ -3040,7 +3083,7 @@ static const struct IXMLDOMDocument3Vtbl domdoc_vtbl = domdoc_put_resolveExternals, domdoc_get_preserveWhiteSpace, domdoc_put_preserveWhiteSpace, - domdoc_put_onReadyStateChange, + domdoc_put_onreadystatechange, domdoc_put_onDataAvailable, domdoc_put_onTransformNode, domdoc_get_namespaces, @@ -3402,6 +3445,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->safeopt = 0; doc->bsc = NULL; doc->cp_list = NULL; + memset(doc->events, 0, sizeof(doc->events)); /* events connection points */ ConnectionPoint_Init(&doc->cp_dispatch, doc, &IID_IDispatch); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e38d3b5..eee20a6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7530,6 +7530,9 @@ static void test_events(void) IConnectionPoint *point; IXMLDOMDocument *doc; HRESULT hr; + VARIANT v; + IDispatch *event; + ULONG ref; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7549,6 +7552,54 @@ static void test_events(void) IConnectionPointContainer_Release(conn); + /* ready state callback */ + VariantInit(&v); + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + + event = create_dispevent(); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)event; + + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 3, "got %d\n", ref); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = event; + + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 3, "got %d\n", ref); + + /* VT_NULL doesn't reset event handler */ + V_VT(&v) = VT_NULL; + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 3, "got %d\n", ref); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 2, "got %d\n", ref); + + V_VT(&v) = VT_UNKNOWN; + V_DISPATCH(&v) = NULL; + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDispatch_Release(event); + IXMLDOMDocument_Release(doc); }

1 0

Rico Schüller : d3dcompiler: Parse reflection types.
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: debfb06148d17504e6eb345549af81815ad45819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=debfb06148d17504e6eb34554… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 21 22:52:13 2011 +0100 d3dcompiler: Parse reflection types. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 16 ++ dlls/d3dcompiler_43/reflection.c | 248 ++++++++++++++++++++++++++++- 2 files changed, 260 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=debfb06148d17504e6eb3…

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetVariableByIndex().
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: 73f9d9f516d69145e67da660aa2b0d04eef97310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f9d9f516d69145e67da660a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 21 22:52:16 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetVariableByIndex(). --- dlls/d3dcompiler_43/reflection.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index bba25d9..473fe45 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -32,9 +32,11 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE }; const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; +const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; /* null objects - needed for invalid calls */ static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = {{&d3dcompiler_shader_reflection_constant_buffer_vtbl}}; +static struct d3dcompiler_shader_reflection_variable null_variable = {{&d3dcompiler_shader_reflection_variable_vtbl}}; static BOOL copy_name(const char *ptr, char **name) { @@ -593,9 +595,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_G static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex( ID3D11ShaderReflectionConstantBuffer *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->variable_count) + { + WARN("Invalid index specified\n"); + return &null_variable.ID3D11ShaderReflectionVariable_iface; + } + + return &This->variables[index].ID3D11ShaderReflectionVariable_iface; } static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetVariableByName().
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: a386f480be2eeea859e60a7a51e8ea066c515674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a386f480be2eeea859e60a7a5… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 21 22:52:24 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetVariableByName(). --- dlls/d3dcompiler_43/reflection.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 473fe45..7004a82 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -611,9 +611,31 @@ static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_ref static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( ID3D11ShaderReflectionConstantBuffer *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, name); + struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + unsigned int i; - return NULL; + TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified\n"); + return &null_variable.ID3D11ShaderReflectionVariable_iface; + } + + for (i = 0; i < This->variable_count; ++i) + { + struct d3dcompiler_shader_reflection_variable *v = &This->variables[i]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning ID3D11ShaderReflectionVariable %p.\n", v); + return &v->ID3D11ShaderReflectionVariable_iface; + } + } + + WARN("Invalid name specified\n"); + + return &null_variable.ID3D11ShaderReflectionVariable_iface; } const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl =

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionVariable::GetDesc().
by Alexandre Julliard 22 Feb '11

22 Feb '11

Module: wine Branch: master Commit: 49651c105e7efb1a4ee1726c362fc77a4330c91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49651c105e7efb1a4ee1726c3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 21 22:52:27 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionVariable::GetDesc(). --- dlls/d3dcompiler_43/reflection.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7004a82..1165976 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -648,12 +648,37 @@ const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflect /* ID3D11ShaderReflectionVariable methods */ +static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable(ID3D11ShaderReflectionVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, ID3D11ShaderReflectionVariable_iface); +} + static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if (This == &null_variable) + { + WARN("Null variable specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_FAIL; + } + + desc->Name = This->name; + desc->StartOffset = This->start_offset; + desc->Size = This->size; + desc->uFlags = This->flags; + desc->DefaultValue = This->default_value; + + return S_OK; } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType(

1 0

Frédéric Delanoy : French translation for release 1.3.14
by Jeremy Newman 22 Feb '11

22 Feb '11

Module: website Branch: master Commit: 49602950084143aeba5acd5fb366fbb4db1e11cc URL: http://source.winehq.org/git/website.git/?a=commit;h=49602950084143aeba5acd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 18 22:45:08 2011 +0100 French translation for release 1.3.14 --- news/fr/2011021801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/fr/2011021801.xml b/news/fr/2011021801.xml new file mode 100644 index 0000000..452f7df --- /dev/null +++ b/news/fr/2011021801.xml @@ -0,0 +1,18 @@ +<news> +<date>18 février 2011</date> +<title>Sortie de Wine 1.3.14</title> +<body> + La version de développement 1.3.14 de Wine est disponible. + <a href="{$root}/announce/1.3.14">Nouveautés</a> de cette version : +<ul> + <li>Un tas de nettoyages pour traiter les avertissements émis par Valgrind et Clang.</li> + <li>Prise en charge de la création de fichier CAB compressés.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.14.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0