October 2009 - Wine-Commits

Henri Verbeet : wined3d: Destroy FBO entries from the context that created them.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 94d33d3e861d8e01b4edcb940e8ab1aa98359520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d33d3e861d8e01b4edcb940… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 20 11:05:06 2009 +0200 wined3d: Destroy FBO entries from the context that created them. EXT_framebuffer_object doesn't specify if FBOs are shareable between GL contexts, but ARB_framebuffer_object explicitly prohibits it. --- dlls/wined3d/context.c | 38 +++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a96dea4..53997c8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -440,6 +440,13 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ /* GL locking is done by the caller */ static void context_apply_fbo_state(struct wined3d_context *context) { + struct fbo_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) + { + context_destroy_fbo_entry(context, entry); + } + if (context->render_offscreen) { context->current_fbo = context_find_fbo_entry(context); @@ -586,8 +593,6 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { case WINED3DRTYPE_SURFACE: { - ActivateContext(This, NULL, CTXUSAGE_RESOURCELOAD); - for (i = 0; i < This->numContexts; ++i) { struct wined3d_context *context = This->contexts[i]; @@ -596,27 +601,27 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource if (context->current_rt == (IWineD3DSurface *)resource) context->current_rt = NULL; - ENTER_GL(); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - BOOL destroyed = FALSE; UINT j; - for (j = 0; !destroyed && j < GL_LIMITS(buffers); ++j) + if (entry->depth_stencil == (IWineD3DSurface *)resource) + { + list_remove(&entry->entry); + list_add_head(&context->fbo_destroy_list, &entry->entry); + continue; + } + + for (j = 0; j < GL_LIMITS(buffers); ++j) { if (entry->render_targets[j] == (IWineD3DSurface *)resource) { - context_destroy_fbo_entry(context, entry); - destroyed = TRUE; + list_remove(&entry->entry); + list_add_head(&context->fbo_destroy_list, &entry->entry); + break; } } - - if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) - context_destroy_fbo_entry(context, entry); } - - LEAVE_GL(); } break; @@ -653,6 +658,12 @@ static void context_destroy_gl_resources(struct wined3d_context *context) event_query->context = NULL; } + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) + { + if (!context->valid) entry->id = 0; + context_destroy_fbo_entry(context, entry); + } + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; @@ -1292,6 +1303,7 @@ struct wined3d_context *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceI TRACE("Successfully created new context %p\n", ret); list_init(&ret->fbo_list); + list_init(&ret->fbo_destroy_list); /* Set up the context defaults */ if (!context_set_current(ret)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9c4bd5e..a87d755 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1076,6 +1076,7 @@ struct wined3d_context /* FBOs */ UINT fbo_entry_count; struct list fbo_list; + struct list fbo_destroy_list; struct fbo_entry *current_fbo; GLuint src_fbo; GLuint dst_fbo;

1 0

Paul Vriens : comctl32/tests: Fix some test failures on older comctl32.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 41099b0ff7851d889cfea4b122c9e9e98f23d49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41099b0ff7851d889cfea4b12… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 20 09:42:30 2009 +0200 comctl32/tests: Fix some test failures on older comctl32. --- dlls/comctl32/tests/tooltips.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 4014322..8ca3f7b 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -444,7 +444,9 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xaaaaaaaa; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0xdeadbeef == ti.lParam, "Expected 0xdeadbeef, got %lx\n", ti.lParam); + ok(0xdeadbeef == ti.lParam || + broken(0xdeadbeef != ti.lParam), /* comctl32 < 5.81 */ + "Expected 0xdeadbeef, got %lx\n", ti.lParam); tiW.cbSize = TTTOOLINFOW_V2_SIZE; tiW.hwnd = NULL; @@ -452,18 +454,22 @@ static void test_ttm_gettoolinfo(void) tiW.lParam = 0xaaaaaaaa; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); - ok(0xdeadbeef == tiW.lParam, "Expected 0xdeadbeef, got %lx\n", tiW.lParam); + ok(0xdeadbeef == tiW.lParam || + broken(0xdeadbeef != tiW.lParam), /* comctl32 < 5.81 */ + "Expected 0xdeadbeef, got %lx\n", tiW.lParam); ti.cbSize = TTTOOLINFOA_V2_SIZE; ti.uId = 0x1234ABCD; ti.lParam = 0xaaaaaaaa; - r = SendMessageA(hwnd, TTM_SETTOOLINFOA, 0, (LPARAM)&ti); + SendMessageA(hwnd, TTM_SETTOOLINFOA, 0, (LPARAM)&ti); ti.cbSize = TTTOOLINFOA_V2_SIZE; ti.lParam = 0xdeadbeef; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0xaaaaaaaa == ti.lParam, "Expected 0xaaaaaaaa, got %lx\n", ti.lParam); + ok(0xaaaaaaaa == ti.lParam || + broken(0xaaaaaaaa != ti.lParam), /* comctl32 < 5.81 */ + "Expected 0xaaaaaaaa, got %lx\n", ti.lParam); DestroyWindow(hwnd);

1 0

Vitaliy Margolen : ntoskrnl: Initialize structure size.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 82379e83e3712cb70ef56d591df4b4fbc744d9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82379e83e3712cb70ef56d591… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Oct 19 23:23:13 2009 -0600 ntoskrnl: Initialize structure size. --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d95dc31..93d72a6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1237,6 +1237,7 @@ BOOLEAN WINAPI PsGetVersion(ULONG *major, ULONG *minor, ULONG *build, UNICODE_ST { RTL_OSVERSIONINFOEXW info; + info.dwOSVersionInfoSize = sizeof(info); RtlGetVersion( &info ); if (major) *major = info.dwMajorVersion; if (minor) *minor = info.dwMinorVersion;

1 0

Ken Thomases : winecoreaudio: Fix incorrect casts from float to DWORD in wodGetVolume.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: fd596b9cb80c86dcaf6bb89e3cf438131f2396fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd596b9cb80c86dcaf6bb89e3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 19 20:38:42 2009 -0500 winecoreaudio: Fix incorrect casts from float to DWORD in wodGetVolume. --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 835d1a9..91f6599 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1452,7 +1452,7 @@ static DWORD wodGetVolume(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo, LPDWORD lpdwV AudioUnit_GetVolume(wwo->audioUnit, &left, &right); - *lpdwVol = ((WORD) left * 0xFFFFl) + (((WORD) right * 0xFFFFl) << 16); + *lpdwVol = (WORD)(left * 0xFFFFl) + ((WORD)(right * 0xFFFFl) << 16); return MMSYSERR_NOERROR; }

1 0

Henri Verbeet : wined3d: Validate the D3D context in FindContext().
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 43aaaa8a4b1b92976e466c63eab1cd1c6e9c0134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43aaaa8a4b1b92976e466c63e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 20 11:05:04 2009 +0200 wined3d: Validate the D3D context in FindContext(). Apparently it's valid to use a D3D device after its window is destroyed. OpenGL isn't always so forgiving, so this patch is a first step to avoid making GL calls on a context without window. --- dlls/wined3d/context.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 701e024..16304ee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -782,6 +782,18 @@ BOOL context_set_current(struct wined3d_context *ctx) return TlsSetValue(wined3d_context_tls_idx, ctx); } +static void context_validate(struct wined3d_context *context) +{ + HWND wnd = WindowFromDC(context->hdc); + + if (wnd != context->win_handle) + { + WARN("DC %p belongs to window %p instead of %p.\n", + context->hdc, wnd, context->win_handle); + context->valid = 0; + } +} + /***************************************************************************** * Context_MarkStateDirty * @@ -1247,6 +1259,7 @@ struct wined3d_context *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceI } goto out; } + ret->valid = 1; ret->gl_info = &This->adapter->gl_info; ret->surface = (IWineD3DSurface *) target; ret->current_rt = (IWineD3DSurface *)target; @@ -1771,6 +1784,7 @@ static inline struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWin if (current_context && current_context->current_rt == target) { + context_validate(current_context); return current_context; } @@ -1858,6 +1872,8 @@ retry: context->render_offscreen = TRUE; } + context_validate(context); + if (context->render_offscreen != old_render_offscreen) { Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); @@ -2007,6 +2023,7 @@ struct wined3d_context *ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurfac TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); context = FindContext(This, target, tid); + if (!context->valid) return context; gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4b6cb4c..9c4bd5e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1055,6 +1055,7 @@ struct wined3d_context WORD num_untracked_materials : 2; /* Max value 2 */ WORD current : 1; WORD destroyed : 1; + WORD valid : 1; BYTE texShaderBumpMap; /* MAX_TEXTURES, 8 */ BYTE lastWasPow2Texture; /* MAX_TEXTURES, 8 */ DWORD numbered_array_mask;

1 0

Marcus Meissner : reg: Remove wrong and useless check (Coverity).
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 93dad930cdad9acb5ba4adbe6017459d739452d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93dad930cdad9acb5ba4adbe6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 20 09:31:15 2009 +0200 reg: Remove wrong and useless check (Coverity). --- programs/reg/reg.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a538d81..f0a8f8b 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -279,13 +279,6 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, DWORD count; LONG rc; - if (value_name) - { - RegCloseKey(subkey); - reg_message(STRING_INVALID_CMDLINE); - return 1; - } - rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &maxValue, NULL, NULL, NULL); if (rc != ERROR_SUCCESS)

1 0

Henri Verbeet : wined3d: Get rid of the useless "isPBuffer" bitfield in struct wined3d_context.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 0cb6f28751b106833ed8fa9ac50e21bc825f7289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb6f28751b106833ed8fa9ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 20 11:05:03 2009 +0200 wined3d: Get rid of the useless "isPBuffer" bitfield in struct wined3d_context. --- dlls/wined3d/context.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c6d6df8..701e024 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -698,7 +698,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) ERR("Failed to disable GL context.\n"); } - if (context->isPBuffer) + if (context->pbuffer) { GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer)); @@ -1250,7 +1250,6 @@ struct wined3d_context *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceI ret->gl_info = &This->adapter->gl_info; ret->surface = (IWineD3DSurface *) target; ret->current_rt = (IWineD3DSurface *)target; - ret->isPBuffer = create_pbuffer; ret->tid = GetCurrentThreadId(); if(This->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *) This)) { /* Create the dirty constants array and initialize them to dirty */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9097cf..4b6cb4c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1051,7 +1051,6 @@ struct wined3d_context WORD last_was_blit : 1; WORD last_was_ckey : 1; WORD fog_coord : 1; - WORD isPBuffer : 1; WORD fog_enabled : 1; WORD num_untracked_materials : 2; /* Max value 2 */ WORD current : 1;

1 0

Henri Verbeet : d3d9: Add traces.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 4dbf1c49007fc5ebcf79cff71a8512ac4182987a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbf1c49007fc5ebcf79cff71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 20 11:05:02 2009 +0200 d3d9: Add traces. --- dlls/d3d9/cubetexture.c | 65 +++++--- dlls/d3d9/device.c | 387 +++++++++++++++++++++++++++-------------- dlls/d3d9/directx.c | 104 ++++++++---- dlls/d3d9/indexbuffer.c | 45 ++++-- dlls/d3d9/pixelshader.c | 42 +++-- dlls/d3d9/query.c | 25 ++- dlls/d3d9/stateblock.c | 22 ++- dlls/d3d9/surface.c | 57 ++++-- dlls/d3d9/swapchain.c | 34 +++-- dlls/d3d9/texture.c | 64 +++++--- dlls/d3d9/vertexbuffer.c | 44 +++-- dlls/d3d9/vertexdeclaration.c | 14 +- dlls/d3d9/vertexshader.c | 41 +++-- dlls/d3d9/volume.c | 31 ++-- dlls/d3d9/volumetexture.c | 47 +++--- 15 files changed, 679 insertions(+), 343 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dbf1c49007fc5ebcf79c…

1 0

Juan Lang : crypt32: Implement CryptFindCertificateInStore for unicode strings.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 1e424138feead8b70d4d406af92acb079f2304c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e424138feead8b70d4d406af… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 16 16:32:46 2009 -0700 crypt32: Implement CryptFindCertificateInStore for unicode strings. --- dlls/crypt32/cert.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/cert.c | 3 -- 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b92aee9..5b3b6e3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1422,6 +1422,69 @@ static PCCERT_CONTEXT find_cert_by_issuer(HCERTSTORE store, DWORD dwType, return found; } +static BOOL compare_cert_by_name_str(PCCERT_CONTEXT pCertContext, + DWORD dwType, DWORD dwFlags, const void *pvPara) +{ + PCERT_NAME_BLOB name; + DWORD len; + BOOL ret = FALSE; + + if (dwType & CERT_INFO_SUBJECT_FLAG) + name = &pCertContext->pCertInfo->Subject; + else + name = &pCertContext->pCertInfo->Issuer; + len = CertNameToStrW(pCertContext->dwCertEncodingType, name, + CERT_SIMPLE_NAME_STR, NULL, 0); + if (len) + { + LPWSTR str = CryptMemAlloc(len * sizeof(WCHAR)); + + if (str) + { + LPWSTR ptr; + + CertNameToStrW(pCertContext->dwCertEncodingType, name, + CERT_SIMPLE_NAME_STR, str, len); + for (ptr = str; *ptr; ptr++) + *ptr = tolowerW(*ptr); + if (strstrW(str, pvPara)) + ret = TRUE; + CryptMemFree(str); + } + } + return ret; +} + +static PCCERT_CONTEXT find_cert_by_name_str(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) +{ + PCCERT_CONTEXT found = NULL; + + TRACE("%s\n", debugstr_w(pvPara)); + + if (pvPara) + { + DWORD len = strlenW(pvPara); + LPWSTR str = CryptMemAlloc((len + 1) * sizeof(WCHAR)); + + if (str) + { + LPCWSTR src; + LPWSTR dst; + + for (src = pvPara, dst = str; *src; src++, dst++) + *dst = tolowerW(*src); + *dst = 0; + found = cert_compare_certs_in_store(store, prev, + compare_cert_by_name_str, dwType, dwFlags, str); + CryptMemFree(str); + } + } + else + found = find_cert_any(store, dwType, dwFlags, NULL, prev); + return found; +} + PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType, const void *pvPara, PCCERT_CONTEXT pPrevCertContext) @@ -1450,6 +1513,9 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_PUBLIC_KEY: compare = compare_cert_by_public_key; break; + case CERT_COMPARE_NAME_STR_W: + find = find_cert_by_name_str; + break; case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break; diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 8a00509..685a564 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1148,7 +1148,6 @@ static void testFindCert(void) if (context) count++; } while (context); - todo_wine ok(count == 3, "expected 3 contexts\n"); count = 0; context = NULL; @@ -1158,7 +1157,6 @@ static void testFindCert(void) if (context) count++; } while (context); - todo_wine ok(count == 2, "expected 2 contexts\n"); count = 0; context = NULL; @@ -1168,7 +1166,6 @@ static void testFindCert(void) if (context) count++; } while (context); - todo_wine ok(count == 3, "expected 3 contexts\n"); SetLastError(0xdeadbeef); context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0,

1 0

Jacek Caban : jscript: Added Error. toString implementation for invoke version >= 2.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 86e7beae82e4234dd5537f580f51820d65d76775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e7beae82e4234dd5537f580… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:41:02 2009 +0200 jscript: Added Error.toString implementation for invoke version >= 2. --- dlls/jscript/error.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 2b193ef..6c89d70 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -36,6 +36,7 @@ typedef struct { static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; +static const WCHAR nameW[] = {'n','a','m','e',0}; static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -44,6 +45,11 @@ static inline ErrorInstance *error_from_vdisp(vdisp_t *vdisp) return (ErrorInstance*)vdisp->u.jsdisp; } +static inline ErrorInstance *error_this(vdisp_t *jsthis) +{ + return is_vclass(jsthis, JSCLASS_ERROR) ? error_from_vdisp(jsthis) : NULL; +} + static HRESULT Error_number(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -101,17 +107,77 @@ static HRESULT Error_message(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, /* ECMA-262 3rd Edition 15.11.4.4 */ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { + ErrorInstance *error; + BSTR name, msg = NULL, ret = NULL; + VARIANT v; + HRESULT hres; + static const WCHAR str[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; TRACE("\n"); + error = error_this(jsthis); + if(ctx->version < 2 || !error) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(str); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + hres = jsdisp_propget_name(&error->dispex, nameW, &v, ei, caller); + if(FAILED(hres)) + return hres; + + hres = to_string(ctx, &v, ei, &name); + VariantClear(&v); + if(FAILED(hres)) + return hres; + + if(V_VT(&error->message) != VT_EMPTY) { + hres = to_string(ctx, &error->message, ei, &msg); + if(SUCCEEDED(hres) && !*msg) { + SysFreeString(msg); + msg = NULL; + } + } + + if(SUCCEEDED(hres)) { + if(msg) { + DWORD name_len, msg_len; + + name_len = SysStringLen(name); + msg_len = SysStringLen(msg); + + ret = SysAllocStringLen(NULL, name_len + msg_len + 2); + if(ret) { + memcpy(ret, name, name_len*sizeof(WCHAR)); + ret[name_len] = ':'; + ret[name_len+1] = ' '; + memcpy(ret+name_len+2, msg, msg_len*sizeof(WCHAR)); + } + }else { + ret = name; + name = NULL; + } + } + + SysFreeString(msg); + SysFreeString(name); + if(FAILED(hres)) + return hres; + if(!ret) + return E_OUTOFMEMORY; + if(retv) { V_VT(retv) = VT_BSTR; - V_BSTR(retv) = SysAllocString(str); - if(!V_BSTR(retv)) - return E_OUTOFMEMORY; + V_BSTR(retv) = ret; + }else { + SysFreeString(ret); } return S_OK; @@ -341,7 +407,6 @@ static HRESULT URIErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype) { - static const WCHAR nameW[] = {'n','a','m','e',0}; static const WCHAR ErrorW[] = {'E','r','r','o','r',0}; static const WCHAR EvalErrorW[] = {'E','v','a','l','E','r','r','o','r',0}; static const WCHAR RangeErrorW[] = {'R','a','n','g','e','E','r','r','o','r',0};

1 0