wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Andrew Eikum : oleaut32: Convert TLBFuncDesc to be stored as an array.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 19fca2728bcfa0a51e8ae747c97e436158ced2d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fca2728bcfa0a51e8ae747c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 4 15:53:56 2011 -0600 oleaut32: Convert TLBFuncDesc to be stored as an array. --- dlls/oleaut32/typelib.c | 481 ++++++++++++++++++++++++---------------------- 1 files changed, 251 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19fca2728bcfa0a51e8ae…

1 0

Andrew Eikum : oleaut32: Store ITypeInfoImpls in an array.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b3e61a5661cb370eeea6a62190d0fe25945b6b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e61a5661cb370eeea6a6219… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 4 15:53:51 2011 -0600 oleaut32: Store ITypeInfoImpls in an array. --- dlls/oleaut32/typelib.c | 144 ++++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3e61a5661cb370eeea6a…

1 0

Juan Lang : wininet: Rename a variable based on publicly available information.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 9d5ca542b317acdbe84decb62999bffb9734c2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5ca542b317acdbe84decb62… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:52:42 2011 -0800 wininet: Rename a variable based on publicly available information. --- dlls/wininet/urlcache.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 18ed426..ad439dd 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -142,7 +142,7 @@ typedef struct _HASH_CACHEFILE_ENTRY typedef struct _DIRECTORY_DATA { - DWORD dwUnknown; + DWORD dwNumFiles; char filename[DIR_LENGTH]; } DIRECTORY_DATA; @@ -346,12 +346,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) for (i = 0; !dwError && i < pHeader->DirectoryCount; ++i) { - /* The following values were copied from a Windows index. - * I don't know what the values are supposed to mean but - * have made them the same in the hope that this will - * be better for compatibility - */ - pHeader->directory_data[i].dwUnknown = (i > 1) ? 0xfe : 0xff; + pHeader->directory_data[i].dwNumFiles = 0; for (j = 0;; ++j) { int k;

1 0

Juan Lang : wininet: Change a type based on publicly available information.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: ad45ebf3fa7c7dc02f276bc915ccf18324e5dbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad45ebf3fa7c7dc02f276bc91… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:50:42 2011 -0800 wininet: Change a type based on publicly available information. --- dlls/wininet/urlcache.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 4614f93..18ed426 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -160,8 +160,7 @@ typedef struct _URLCACHE_HEADER DWORD dwCacheUsageHigh; DWORD dwExemptUsageLow; DWORD dwExemptUsageHigh; - BYTE DirectoryCount; /* number of directory_data's */ - BYTE Unknown8[3]; /* just padding? */ + DWORD DirectoryCount; /* number of directory_data's */ DIRECTORY_DATA directory_data[1]; /* first directory entry */ } URLCACHE_HEADER, *LPURLCACHE_HEADER; typedef const URLCACHE_HEADER *LPCURLCACHE_HEADER;

1 0

Juan Lang : wininet: Rename a couple members based on publicy available information.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 535b864d0da8f09bc22c8f10e0224679b2407766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535b864d0da8f09bc22c8f10e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:50:12 2011 -0800 wininet: Rename a couple members based on publicy available information. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index aed4654..4614f93 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -158,8 +158,8 @@ typedef struct _URLCACHE_HEADER DWORD dwCacheLimitHigh; DWORD dwCacheUsageLow; DWORD dwCacheUsageHigh; - DWORD dwUnknown6; /* possibly a flag? */ - DWORD dwUnknown7; + DWORD dwExemptUsageLow; + DWORD dwExemptUsageHigh; BYTE DirectoryCount; /* number of directory_data's */ BYTE Unknown8[3]; /* just padding? */ DIRECTORY_DATA directory_data[1]; /* first directory entry */

1 0

Juan Lang : wininet: Rename a couple members to reflect their usage, and remove redundant comments.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 47d3814c78a7dc53cd8076845a91affe3aac2eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d3814c78a7dc53cd8076845… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 09:47:10 2011 -0800 wininet: Rename a couple members to reflect their usage, and remove redundant comments. --- dlls/wininet/urlcache.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 40e4840..aed4654 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -154,10 +154,10 @@ typedef struct _URLCACHE_HEADER DWORD dwIndexCapacityInBlocks; DWORD dwBlocksInUse; DWORD dwUnknown1; - DWORD dwCacheLimitLow; /* disk space limit for cache */ - DWORD dwCacheLimitHigh; /* disk space limit for cache */ - DWORD dwUnknown4; /* current disk space usage for cache */ - DWORD dwUnknown5; /* current disk space usage for cache */ + DWORD dwCacheLimitLow; + DWORD dwCacheLimitHigh; + DWORD dwCacheUsageLow; + DWORD dwCacheUsageHigh; DWORD dwUnknown6; /* possibly a flag? */ DWORD dwUnknown7; BYTE DirectoryCount; /* number of directory_data's */

1 0

Juan Lang : wininet: Fix a comment.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b2ed9c59671b14b451bb60e61c6818a1cd3d08c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ed9c59671b14b451bb60e61… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 2 17:09:45 2011 -0800 wininet: Fix a comment. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1f9b611..841a83f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3999,8 +3999,8 @@ static void HTTP_CacheRequest(http_request_t *request) * Sends the specified request to the HTTP server * * RETURNS - * TRUE on success - * FALSE on failure + * ERROR_SUCCESS on success + * win32 error code on failure * */ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,

1 0

Juan Lang : wininet: Remove a no-op trinary expression.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 7685dad81d1b257b2c1f09c2084dcb88ab91591e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7685dad81d1b257b2c1f09c20… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 08:55:32 2011 -0800 wininet: Remove a no-op trinary expression. --- 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 9bcc420..1f9b611 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3976,7 +3976,7 @@ static void HTTP_CacheRequest(http_request_t *request) return; } - b = CreateUrlCacheEntryW(url, request->contentLength > 0 ? request->contentLength : 0, NULL, cacheFileName, 0); + b = CreateUrlCacheEntryW(url, request->contentLength, NULL, cacheFileName, 0); if(b) { HeapFree(GetProcessHeap(), 0, request->cacheFile); CloseHandle(request->hCacheFile);

1 0

Juan Lang : wininet: Store entries in url cache with valid last-modified date.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 28e92293369d3a33e5f269091864c6116e75814a URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e92293369d3a33e5f269091… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 4 11:43:54 2011 -0800 wininet: Store entries in url cache with valid last-modified date. --- dlls/wininet/http.c | 227 ++++++++++++++++++++++++++++++++++++----------- dlls/wininet/internet.h | 1 + 2 files changed, 176 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28e92293369d3a33e5f26…

1 0

Nikolay Sivov : msxml3: Implemented get_doctype() with basic tests.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: f9f431186f2f55e4b0988cf05cf9177ec120ce19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f431186f2f55e4b0988cf05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 00:53:54 2011 +0300 msxml3: Implemented get_doctype() with basic tests. --- dlls/msxml3/domdoc.c | 24 +++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c9d1c48..beec0b4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1517,11 +1517,29 @@ static HRESULT WINAPI domdoc_transformNodeToObject( static HRESULT WINAPI domdoc_get_doctype( IXMLDOMDocument3 *iface, - IXMLDOMDocumentType** documentType ) + IXMLDOMDocumentType** doctype ) { domdoc *This = impl_from_IXMLDOMDocument3(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + IXMLDOMNode *node; + xmlDtdPtr dtd; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, doctype); + + if (!doctype) return E_INVALIDARG; + + *doctype = NULL; + + dtd = xmlGetIntSubset(get_doc(This)); + if (!dtd) return S_FALSE; + + node = create_node((xmlNodePtr)dtd); + if (!node) return S_FALSE; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocumentType, (void**)doctype); + IXMLDOMNode_Release(node); + + return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 210c709..be9a430 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6009,9 +6009,9 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { static void test_nodeTypedValue(void) { const nodetypedvalue_t *entry = get_nodetypedvalue; + IXMLDOMDocumentType *doctype, *doctype2; IXMLDOMProcessingInstruction *pi; IXMLDOMDocumentFragment *frag; - IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc, *doc2; IXMLDOMCDATASection *cdata; IXMLDOMComment *comment; @@ -6142,17 +6142,28 @@ static void test_nodeTypedValue(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(b == VARIANT_TRUE, "got %d\n", b); + EXPECT_REF(doc2, 1); + hr = IXMLDOMDocument_get_doctype(doc2, &doctype); - todo_wine ok(hr == S_OK, "ret %08x\n", hr ); - if (hr == S_OK) + ok(hr == S_OK, "ret %08x\n", hr ); + + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(doctype, 2); + { V_VT(&value) = VT_EMPTY; hr = IXMLDOMDocumentType_get_nodeTypedValue(doctype, &value); ok(hr == S_FALSE, "ret %08x\n", hr ); ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); - IXMLDOMDocumentType_Release(doctype); } + hr = IXMLDOMDocument_get_doctype(doc2, &doctype2); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(doctype != doctype2, "got %p, was %p\n", doctype2, doctype); + + IXMLDOMDocumentType_Release(doctype2); + IXMLDOMDocumentType_Release(doctype); + IXMLDOMDocument_Release(doc2); while (entry->name) @@ -8383,6 +8394,25 @@ static void test_appendChild(void) IXMLDOMDocument_Release(doc2); } +static void test_get_doctype(void) +{ + IXMLDOMDocumentType *doctype; + IXMLDOMDocument *doc; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_get_doctype(doc, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + doctype = (void*)0xdeadbeef; + hr = IXMLDOMDocument_get_doctype(doc, &doctype); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(doctype == NULL, "got %p\n", doctype); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -8449,6 +8479,7 @@ START_TEST(domdoc) test_get_xml(); test_insertBefore(); test_appendChild(); + test_get_doctype(); test_xsltemplate(); CoUninitialize();

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011