October 2009 - Wine-Commits

Paul Vriens : advapi32/tests: Add some GetOldestEventLogRecord tests.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: 1fe325fd1336016ae59ace9cc36aa784eb17f15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe325fd1336016ae59ace9cc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 29 09:22:42 2009 +0100 advapi32/tests: Add some GetOldestEventLogRecord tests. --- dlls/advapi32/tests/eventlog.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d394012..dab24f0 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -182,6 +182,44 @@ static void test_count(void) CloseEventLog(handle); } +static void test_oldest(void) +{ + HANDLE handle; + BOOL ret; + DWORD oldest; + + SetLastError(0xdeadbeef); + ret = GetOldestEventLogRecord(NULL, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(NULL, &oldest); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); + } + + handle = OpenEventLogA(NULL, "Application"); + + SetLastError(0xdeadbeef); + ret = GetOldestEventLogRecord(handle, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(handle, &oldest); + ok(ret, "Expected succes\n"); + ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); + + CloseEventLog(handle); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -198,4 +236,5 @@ START_TEST(eventlog) test_open_close(); test_info(); test_count(); + test_oldest(); }

1 0

Henri Verbeet : wined3d: Remove some unused GLINFO_LOCATION definitions.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: d7b087618b3fdf48d0539d82310f18530c2397b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b087618b3fdf48d0539d823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:09 2009 +0100 wined3d: Remove some unused GLINFO_LOCATION definitions. --- dlls/wined3d/baseshader.c | 3 +-- dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/texture.c | 6 ------ dlls/wined3d/vertexdeclaration.c | 2 -- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/volumetexture.c | 2 -- 8 files changed, 1 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a6bea57..bb94a5a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1391,7 +1391,6 @@ static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} -#define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { @@ -1400,7 +1399,7 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, pCaps->PixelShaderVersion = 0; pCaps->PixelShader1xMaxValue = 0.0f; } -#undef GLINFO_LOCATION + static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) { if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ade200f..f22845b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); -#define GLINFO_LOCATION (*gl_info) - static void cubetexture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource Preload method. */ @@ -141,14 +139,10 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); } -#undef GLINFO_LOCATION - /* ******************************************* IWineD3DCubeTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DCubeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index c82faa5..09fbe24 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION ((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info - static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 892ac89..2ab1fd9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -26,7 +26,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info static const DWORD pixel_states_render[] = { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eae78c0..b568005 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); -#define GLINFO_LOCATION (*gl_info) - static void texture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource PreLoad method. */ @@ -128,14 +126,10 @@ static void texture_cleanup(IWineD3DTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); } -#undef GLINFO_LOCATION - /* ******************************************* IWineD3DTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 6d617ed..88b3f27 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); -#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info - static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { TRACE(" format: %s (%#x)\n", debug_d3dformat(element->format), element->format); TRACE(" input_slot: %u\n", element->input_slot); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3712bee..14779a5 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION ((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info - static void vshader_set_limits(IWineD3DVertexShaderImpl *This) { DWORD shader_version = WINED3D_SHADER_VERSION(This->baseShader.reg_maps.shader_version.major, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index cad7360..a21211d 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -103,8 +103,6 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) IWineD3DTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DVolumeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;

1 0

Paul Vriens : advapi32: Add some input parameter checks to GetNumberOfEventLogRecords.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: de72f40580f35eed0abf8ee081bc8b833d0fbe0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=de72f40580f35eed0abf8ee08… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 28 19:37:06 2009 +0100 advapi32: Add some input parameter checks to GetNumberOfEventLogRecords. --- dlls/advapi32/eventlog.c | 13 ++++++++++++- dlls/advapi32/tests/eventlog.c | 5 ----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index e5c7bd7..6812cdd 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -265,7 +265,18 @@ BOOL WINAPI GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords { FIXME("(%p,%p) stub\n", hEventLog, NumberOfRecords); - if (!NumberOfRecords) return FALSE; + if (!NumberOfRecords) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + *NumberOfRecords = 0; return TRUE; diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 4840ec5..d394012 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -158,25 +158,20 @@ static void test_count(void) SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(NULL, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(NULL, &count); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(count == 0xdeadbeef, "Expected count to stay unchanged\n"); - } handle = OpenEventLogA(NULL, "Application"); SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); count = 0xdeadbeef;

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::nextSibling implementation.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: 11651f5731d9f01f3c1d2253a8606b2ae3db4919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11651f5731d9f01f3c1d2253a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 29 02:37:44 2009 +0100 mshtml: Added IHTMLDOMNode::nextSibling implementation. --- dlls/mshtml/htmlnode.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9227899..92ad74e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -729,8 +729,19 @@ static HRESULT WINAPI HTMLDOMNode_get_previousSibling(IHTMLDOMNode *iface, IHTML static HRESULT WINAPI HTMLDOMNode_get_nextSibling(IHTMLDOMNode *iface, IHTMLDOMNode **p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNode *nssibling = NULL; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetNextSibling(This->nsnode, &nssibling); + if(nssibling) { + *p = HTMLDOMNODE(get_node(This->doc, nssibling, TRUE)); + IHTMLDOMNode_AddRef(*p); + }else { + *p = NULL; + } + + return S_OK; } #undef HTMLDOMNODE_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d9642e1..be3022b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1609,6 +1609,20 @@ static IHTMLDOMNode *_test_node_get_parent(unsigned line, IUnknown *unk) return parent; } +#define node_get_next(u) _node_get_next(__LINE__,u) +static IHTMLDOMNode *_node_get_next(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *next; + HRESULT hres; + + hres = IHTMLDOMNode_get_nextSibling(node, &next); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line) (hres == S_OK, "get_nextSiblibg failed: %08x\n", hres); + + return next; +} + #define test_elem_get_parent(u) _test_elem_get_parent(__LINE__,u) static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) { @@ -5248,11 +5262,13 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_length failed: %08x\n", hres); ok(length, "length=0\n"); + node2 = NULL; node = get_child_item(child_col, 0); ok(node != NULL, "node == NULL\n"); if(node) { type = get_node_type((IUnknown*)node); ok(type == 3, "type=%d\n", type); + node2 = node_get_next((IUnknown*)node); IHTMLDOMNode_Release(node); } @@ -5263,6 +5279,8 @@ static void test_elems(IHTMLDocument2 *doc) ok(type == 8, "type=%d\n", type); test_elem_id((IUnknown*)node, NULL); + ok(iface_cmp((IUnknown*)node2, (IUnknown*)node), "node2 != node\n"); + IHTMLDOMNode_Release(node2); IHTMLDOMNode_Release(node); } @@ -5343,6 +5361,13 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_innerhtml((IUnknown*)elem, "inner html"); test_elem_set_innerhtml((IUnknown*)elem, ""); test_elem_innerhtml((IUnknown*)elem, NULL); + node = node_get_next((IUnknown*)elem); + ok(!node, "node = %p\n", node); + + elem2 = get_doc_elem_by_id(doc, "x"); + node = node_get_next((IUnknown*)elem2); + IHTMLDOMNode_Release(node); + IHTMLElement_Release(elem2); IHTMLElement_Release(elem); IHTMLDocument3_Release(doc3);

1 0

Juan Lang : crypt32: Allow the caller of checkChainPolicyStatus to specify the date to test with and additional policy parameters .
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: facd2e975a897addca4c6d07d290b85da11ff0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=facd2e975a897addca4c6d07d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 09:07:39 2009 -0700 crypt32: Allow the caller of checkChainPolicyStatus to specify the date to test with and additional policy parameters. --- dlls/crypt32/tests/chain.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 94debf4..ddc9ac5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2217,15 +2217,16 @@ static const char *num_to_str(WORD num) } static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, - DWORD testIndex) + DWORD testIndex, SYSTEMTIME *sysTime, PCERT_CHAIN_POLICY_PARA para) + { - PCCERT_CHAIN_CONTEXT chain = getChain(&check->certs, 0, TRUE, &oct2007, + PCCERT_CHAIN_CONTEXT chain = getChain(&check->certs, 0, TRUE, sysTime, check->todo, testIndex); if (chain) { CERT_CHAIN_POLICY_STATUS policyStatus = { 0 }; - BOOL ret = pCertVerifyCertificateChainPolicy(policy, chain, NULL, + BOOL ret = pCertVerifyCertificateChainPolicy(policy, chain, para, &policyStatus); if (check->todo & TODO_POLICY) @@ -2375,7 +2376,8 @@ static void testVerifyCertChainPolicy(void) for (i = 0; i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, &basePolicyCheck[i], i); + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, &basePolicyCheck[i], i, + &oct2007, NULL); /* The authenticode policy doesn't seem to check anything beyond the base * policy. It might check for chains signed by the MS test cert, but none * of these chains is. @@ -2383,12 +2385,12 @@ static void testVerifyCertChainPolicy(void) for (i = 0; i < sizeof(authenticodePolicyCheck) / sizeof(authenticodePolicyCheck[0]); i++) checkChainPolicyStatus(CERT_CHAIN_POLICY_AUTHENTICODE, - &authenticodePolicyCheck[i], i); + &authenticodePolicyCheck[i], i, &oct2007, NULL); for (i = 0; i < sizeof(basicConstraintsPolicyCheck) / sizeof(basicConstraintsPolicyCheck[0]); i++) checkChainPolicyStatus(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, - &basicConstraintsPolicyCheck[i], i); + &basicConstraintsPolicyCheck[i], i, &oct2007, NULL); } START_TEST(chain)

1 0

Juan Lang : cryptui: Fix German translation.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: b8b8ff07545b2978a44e3ecf3bc9d64e8ac7cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b8ff07545b2978a44e3ecf3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 11:33:08 2009 -0700 cryptui: Fix German translation. --- dlls/cryptui/cryptui_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index cfaf468..7174015 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -119,7 +119,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Sind Sie sicher, dass Sie dieses Zertifikat entfernen möchten?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Sind Sie sicher, dass Sie diese Zertifikate entfernen möchten?" IDS_CERT_MGR "Zertifikate" - IDS_FRIENDLY_NAME_NONE "<Keine>" + IDS_FRIENDLY_NAME_NONE "<Keiner>" IDS_PURPOSE_SERVER_AUTH "Garantiert die Identität eines entfernten Computers" IDS_PURPOSE_CLIENT_AUTH "Beweist Ihre Identität für einen entfernten Computers" IDS_PURPOSE_CODE_SIGNING "Schützt Software vor Manipulation nach der Veröffentlichung"

1 0

Jacek Caban : mshtml: Inherit scriptmode from parent window.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: d76720cc562b9122c5c04427decb1727c78bd562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76720cc562b9122c5c04427d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 22:55:26 2009 +0100 mshtml: Inherit scriptmode from parent window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9b8dda3..5b07b0f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1582,7 +1582,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->nswindow = nswindow; } - window->scriptmode = SCRIPTMODE_GECKO; + window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO; list_init(&window->script_hosts); window->task_magic = get_task_target_magic();

1 0

Jacek Caban : mshtml: Improve debug traces.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: ceb02fb0272fcf6db934039ed024f6af96523d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb02fb0272fcf6db934039ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 22:54:48 2009 +0100 mshtml: Improve debug traces. --- dlls/mshtml/script.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4ee0da0..7df0dd6 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -620,11 +620,14 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); + TRACE(">>>\n"); hres = IActiveScriptParse64_ParseScriptText(script_host->parse, text, windowW, NULL, script_endW, 0, 0, SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE, &var, &excepinfo); - if(FAILED(hres)) - WARN("ParseScriptText failed: %08x\n", hres); + if(SUCCEEDED(hres)) + TRACE("<<<\n"); + else + WARN("<<< %08x\n", hres); }

1 0

Aurimas Fišeras : cryptui: Fix Lithuanian translation.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: 878aac41e8115124eae4600d23742c2155696ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878aac41e8115124eae4600d2… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Oct 28 19:39:51 2009 +0200 cryptui: Fix Lithuanian translation. --- dlls/cryptui/cryptui_Lt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_Lt.rc b/dlls/cryptui/cryptui_Lt.rc index deb5598..ee02eab 100644 --- a/dlls/cryptui/cryptui_Lt.rc +++ b/dlls/cryptui/cryptui_Lt.rc @@ -120,7 +120,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Ar tikrai norite pašalinti šį liudijimą?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Ar tikrai norite pašalinti šiuos liudijimus?" IDS_CERT_MGR "Liudijimai" - IDS_FRIENDLY_NAME_NONE "<jokios>" + IDS_FRIENDLY_NAME_NONE "<joks>" IDS_PURPOSE_SERVER_AUTH "Garantuoja nutolusio kompiuterio tapatumą" IDS_PURPOSE_CLIENT_AUTH "Įrodo jūsų tapatumą nutolusiam kompiuteriui" IDS_PURPOSE_CODE_SIGNING "Garantuoja, kad programinė įranga yra iš šio leidėjo\nApsaugo programinę įrangą nuo pakeitimų po išleidimo"

1 0

Paul Vriens : advapi32/tests: Add some GetNumberOfEventLogRecords tests.
by Alexandre Julliard Oct. 29, 2009

Oct. 29, 2009

Module: wine Branch: master Commit: 215ca8a4d748b9fc7371a06d413ac055009616d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215ca8a4d748b9fc7371a06d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 28 19:35:30 2009 +0100 advapi32/tests: Add some GetNumberOfEventLogRecords tests. --- dlls/advapi32/tests/eventlog.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 628b08c..4840ec5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -149,6 +149,44 @@ static void test_info(void) CloseEventLog(handle); } +static void test_count(void) +{ + HANDLE handle; + BOOL ret; + DWORD count; + + SetLastError(0xdeadbeef); + ret = GetNumberOfEventLogRecords(NULL, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 0xdeadbeef; + ret = GetNumberOfEventLogRecords(NULL, &count); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(count == 0xdeadbeef, "Expected count to stay unchanged\n"); + } + + handle = OpenEventLogA(NULL, "Application"); + + SetLastError(0xdeadbeef); + ret = GetNumberOfEventLogRecords(handle, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + ret = GetNumberOfEventLogRecords(handle, &count); + ok(ret, "Expected succes\n"); + ok(count != 0xdeadbeef, "Expected the number of records\n"); + + CloseEventLog(handle); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -164,4 +202,5 @@ START_TEST(eventlog) /* Parameters only */ test_open_close(); test_info(); + test_count(); }

1 0