March 2011 - Wine-Commits - list.winehq.org

Erich Hoover : user32: Implement semi-stub of GetCursorFrameInfo.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: e776f3ccf75d404b4f532a0937b4a81293bac5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e776f3ccf75d404b4f532a093… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Mar 5 22:42:19 2011 -0700 user32: Implement semi-stub of GetCursorFrameInfo. --- dlls/user32/cursoricon.c | 43 ++++++- dlls/user32/tests/cursoricon.c | 266 +++++++++++++++++++++++++++++++++++++++- dlls/user32/user32.spec | 2 +- include/winuser.h | 1 + 4 files changed, 305 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e776f3ccf75d404b4f532…

1 0

Alexandre Julliard : winex11: Don' t unmap off-screen windows on PropertyNotify events.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: b1af55d551cce6bc2690c37b95646cf89827c8d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1af55d551cce6bc2690c37b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 15:11:10 2011 +0100 winex11: Don't unmap off-screen windows on PropertyNotify events. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 50b2ec0..0e55619 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2501,7 +2501,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (data->mapped && event_type != ReparentNotify) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (event_type != ConfigureNotify && + (!event_type && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) unmap_window( display, data ); }

1 0

Jörg Höhle : mciwave: Fix precondition to avoid having 2 simultaneous players.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: fc1e8e79c207a4eadc9832e188fc7471e30517ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1e8e79c207a4eadc9832e18… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 5 16:32:23 2011 +0100 mciwave: Fix precondition to avoid having 2 simultaneous players. --- dlls/mciwave/mciwave.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 9a62f8f..effecf4 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -756,8 +756,8 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, return MCIERR_FILE_NOT_FOUND; } - if (wmw->dwStatus == MCI_MODE_PAUSE && !wmw->fInput) { - /* FIXME: parameters (start/end) in lpParams may not be used */ + if (wmw->dwStatus == MCI_MODE_PAUSE && !wmw->fInput && !(dwFlags & (MCI_FROM | MCI_TO))) { + /* FIXME: notification is different with Resume than Play */ return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); } @@ -765,8 +765,12 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, * We have to set MCI_MODE_PLAY before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread. */ - if ((wmw->dwStatus != MCI_MODE_STOP) && ((wmw->dwStatus != MCI_MODE_PLAY) && (dwFlags & MCI_WAIT))) { - return MCIERR_INTERNAL; + if ( !(wmw->dwStatus == MCI_MODE_STOP) && + !((wmw->dwStatus == MCI_MODE_PLAY) && (dwFlags & MCI_WAIT) && !wmw->hWave)) { + /* FIXME: Check FROM/TO parameters first. */ + /* FIXME: Play; Play [notify|wait] must hook into the running player. */ + dwRet = WAVE_mciStop(wDevID, MCI_WAIT, NULL); + if (dwRet) return dwRet; } if (wmw->lpWaveFormat->wFormatTag == WAVE_FORMAT_PCM) { @@ -1011,7 +1015,8 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt * We have to set MCI_MODE_RECORD before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread. */ - if ((wmw->dwStatus != MCI_MODE_STOP) && ((wmw->dwStatus != MCI_MODE_RECORD) && (dwFlags & MCI_WAIT))) { + if ( !(wmw->dwStatus == MCI_MODE_STOP) && + !((wmw->dwStatus == MCI_MODE_RECORD) && (dwFlags & MCI_WAIT) && !wmw->hWave)) { return MCIERR_INTERNAL; }

1 0

Andrew Eikum : oleaut32: Store ITypeInfoImpls in an array.
by Alexandre Julliard March 7, 2011

March 7, 2011

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

Nikolay Sivov : msxml3: Properly update xmldoc refcounts on insertBefore().
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 0f3c247e46dbc7935bf6e2d563ce16f01cada9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3c247e46dbc7935bf6e2d56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 6 22:28:29 2011 +0300 msxml3: Properly update xmldoc refcounts on insertBefore(). insertBefore() is able to work on nodes from different documents, so on adding child or sibling it's possible that libxml2 switches doc pointer for a node, we need to update refcounts to cover that case. --- dlls/msxml3/node.c | 7 ++++ dlls/msxml3/tests/domdoc.c | 66 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fc15a5d..18b3db2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -295,6 +295,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT xmlNodePtr new_child_node; IXMLDOMNode *before = NULL; xmlnode *node_obj; + xmlDocPtr doc; HRESULT hr; if(!new_child) @@ -336,7 +337,10 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT /* unlink from current parent first */ if(node_obj->parent) IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + doc = new_child_node->doc; + xmldoc_add_ref(before_node_obj->node->doc); xmlAddPrevSibling(before_node_obj->node, new_child_node); + xmldoc_release(doc); node_obj->parent = This->parent; } else @@ -344,7 +348,10 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT /* unlink from current parent first */ if(node_obj->parent) IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + doc = new_child_node->doc; + xmldoc_add_ref(This->node->doc); xmlAddChild(This->node, new_child_node); + xmldoc_release(doc); node_obj->parent = This->iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 439207f..9dca668 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2064,6 +2064,7 @@ static void test_refs(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; + EXPECT_REF(doc, 1); ref = IXMLDOMDocument_Release(doc); ok( ref == 0, "ref %d\n", ref); @@ -2076,6 +2077,7 @@ static void test_refs(void) ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); + EXPECT_REF(doc, 1); IXMLDOMDocument_AddRef( doc ); EXPECT_REF(doc, 2); IXMLDOMDocument_AddRef( doc ); @@ -2089,19 +2091,27 @@ static void test_refs(void) ok( element != NULL, "should be an element\n"); EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(element, 2); + + IXMLDOMElement_AddRef(element); + todo_wine EXPECT_REF(element, 3); + IXMLDOMElement_Release(element); r = IXMLDOMElement_get_childNodes( element, &node_list ); ok( r == S_OK, "rets %08x\n", r); + todo_wine EXPECT_REF(element, 2); EXPECT_REF(node_list, 1); IXMLDOMNodeList_get_item( node_list, 0, &node ); ok( r == S_OK, "rets %08x\n", r); + EXPECT_REF(node_list, 1); + EXPECT_REF(node, 1); IXMLDOMNodeList_get_item( node_list, 0, &node2 ); ok( r == S_OK, "rets %08x\n", r); - - EXPECT_REF(node, 1); + EXPECT_REF(node_list, 1); + EXPECT_REF(node2, 1); ref = IXMLDOMNode_Release( node ); ok( ref == 0, "ref %d\n", ref ); @@ -2121,18 +2131,22 @@ static void test_refs(void) /* IUnknown must be unique however we obtain it */ r = IXMLDOMElement_QueryInterface( element, &IID_IUnknown, (void**)&unk ); ok( r == S_OK, "rets %08x\n", r ); + EXPECT_REF(element, 2); r = IXMLDOMElement_QueryInterface( element, &IID_IXMLDOMNode, (void**)&node ); ok( r == S_OK, "rets %08x\n", r ); + todo_wine EXPECT_REF(element, 2); r = IXMLDOMNode_QueryInterface( node, &IID_IUnknown, (void**)&unk2 ); ok( r == S_OK, "rets %08x\n", r ); + todo_wine EXPECT_REF(element, 2); ok( unk == unk2, "unk %p unk2 %p\n", unk, unk2 ); + todo_wine ok( element != (void*)node, "node %p element %p\n", node, element ); IUnknown_Release( unk2 ); IUnknown_Release( unk ); IXMLDOMNode_Release( node ); + todo_wine EXPECT_REF(element, 2); IXMLDOMElement_Release( element ); - } static void test_create(void) @@ -2156,6 +2170,8 @@ static void test_create(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; + EXPECT_REF(doc, 1); + /* types not supported for creation */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_DOCUMENT; @@ -2452,9 +2468,12 @@ static void test_create(void) V_I4(&var) = NODE_ELEMENT; r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); + + EXPECT_REF(doc, 1); r = IXMLDOMDocument_appendChild( doc, node, &root ); ok( r == S_OK, "returns %08x\n", r ); ok( node == root, "%p %p\n", node, root ); + EXPECT_REF(doc, 1); EXPECT_REF(node, 2); @@ -8250,7 +8269,45 @@ static void test_insertBefore(void) SysFreeString(p); IXMLDOMDocument_Release(doc); - free_bstrs(); +} + +static void test_appendChild(void) +{ + IXMLDOMDocument *doc, *doc2; + IXMLDOMElement *elem, *elem2; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_createElement(doc2, _bstr_("elem2"), &elem2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(elem, 2); + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(elem2, 2); + EXPECT_NO_CHILDREN(doc); + EXPECT_NO_CHILDREN(doc2); + + /* append from another document */ + hr = IXMLDOMDocument_appendChild(doc2, (IXMLDOMNode*)elem, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(elem, 2); + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(elem2, 2); + EXPECT_NO_CHILDREN(doc); + EXPECT_CHILDREN(doc2); + + IXMLDOMElement_Release(elem); + IXMLDOMElement_Release(elem2); + IXMLDOMDocument_Release(doc); + IXMLDOMDocument_Release(doc2); } START_TEST(domdoc) @@ -8318,6 +8375,7 @@ START_TEST(domdoc) test_put_nodeTypedValue(); test_get_xml(); test_insertBefore(); + test_appendChild(); test_xsltemplate(); CoUninitialize();

1 0

Nikolay Sivov : msvcrt: Added partially complete _wcsupr_s_l ( without locale support).
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 46ae113e7128956a4a77eac60e6019d640a92f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ae113e7128956a4a77eac60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 02:28:28 2011 +0300 msvcrt: Added partially complete _wcsupr_s_l (without locale support). --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 16 +++++++++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 42d8310..d732d69 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1318,7 +1318,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f9eaaf0..1631fdb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1171,7 +1171,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b7288da..8148caf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1158,7 +1158,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d45094a..93aa0f0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -103,10 +103,10 @@ MSVCRT_wchar_t* CDECL _wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c ) } /****************************************************************** - * _wcsupr_s (MSVCRT.@) - * + * _wcsupr_s_l (MSVCRT.@) */ -INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, + MSVCRT__locale_t locale ) { MSVCRT_wchar_t* ptr = str; @@ -120,6 +120,7 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) while (n--) { if (!*ptr) return 0; + /* FIXME: add locale support */ *ptr = toupperW(*ptr); ptr++; } @@ -132,6 +133,15 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /****************************************************************** + * _wcsupr_s (MSVCRT.@) + * + */ +INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +{ + return MSVCRT__wcsupr_s_l( str, n, NULL ); +} + +/****************************************************************** * _wcslwr_s (MSVCRT.@) */ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n )

1 0

Nikolay Sivov : msxml3: Implemented get_doctype() with basic tests.
by Alexandre Julliard March 7, 2011

March 7, 2011

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

Juan Lang : wininet: Rename a couple members based on publicy available information.
by Alexandre Julliard March 7, 2011

March 7, 2011

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 March 7, 2011

March 7, 2011

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: Remove a no-op trinary expression.
by Alexandre Julliard March 7, 2011

March 7, 2011

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