March 2011 - wine-commits

Alexandre Julliard : gdi32: Add initial support for a null graphics driver.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: c82cb23bc2d6afea639e1013643df5e42bc33844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82cb23bc2d6afea639e10136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 19:37:08 2011 +0100 gdi32: Add initial support for a null graphics driver. --- dlls/gdi32/dc.c | 2 + dlls/gdi32/driver.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 4 ++ 3 files changed, 142 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c82cb23bc2d6afea639e1…

1 0

Alexandre Julliard : gdi32: Add a common header to the physdev structure.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 5f5c7020f398b2017a6f0d964f8151741787971d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c7020f398b2017a6f0d964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 19:25:09 2011 +0100 gdi32: Add a common header to the physdev structure. --- dlls/gdi32/dc.c | 4 ++++ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 2 ++ dlls/gdi32/gdi_private.h | 6 +++++- dlls/gdi32/mfdrv/init.c | 2 ++ dlls/gdi32/mfdrv/metafiledrv.h | 1 + dlls/wineps.drv/psdrv.h | 4 +++- dlls/winex11.drv/x11drv.h | 1 + 8 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 04f02be..4388deb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -667,6 +667,8 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, goto error; } + dc->physDev->funcs = funcs; + dc->physDev->hdc = hdc; dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); @@ -791,6 +793,8 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) goto error; } + dc->physDev->funcs = funcs; + dc->physDev->hdc = hdc; DC_InitDC( dc ); release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 9a0f556..7a33237 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -32,6 +32,7 @@ typedef struct { + struct gdi_physdev dev; HDC hdc; ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ UINT handles_size, cur_handles; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index db04f50..efa91ee 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -320,6 +320,8 @@ HDC WINAPI CreateEnhMetaFileW( return 0; } dc->physDev = (PHYSDEV)physDev; + physDev->dev.funcs = &EMFDRV_Funcs; + physDev->dev.hdc = dc->hSelf; physDev->hdc = dc->hSelf; if(description) { /* App name\0Title\0\0 */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 015660f..5b241cd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -72,7 +72,11 @@ typedef struct tagGDIOBJHDR /* Device functions for the Wine driver interface */ -typedef struct { int opaque; } *PHYSDEV; /* PHYSDEV is an opaque pointer */ +typedef struct gdi_physdev +{ + const struct tagDC_FUNCS *funcs; + HDC hdc; +} *PHYSDEV; typedef struct tagDC_FUNCS { diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 436d8ec..4659e73 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -172,6 +172,8 @@ static DC *MFDRV_AllocMetaFile(void) return NULL; } dc->physDev = (PHYSDEV)physDev; + physDev->dev.funcs = &MFDRV_Funcs; + physDev->dev.hdc = dc->hSelf; physDev->hdc = dc->hSelf; if (!(physDev->mh = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev->mh) ))) diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b15864c..326192d 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -32,6 +32,7 @@ typedef struct { + struct gdi_physdev dev; HDC hdc; METAHEADER *mh; /* Pointer to metafile header */ UINT handles_size, cur_handles; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 4ca6e70..62f9ccc 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -351,7 +351,9 @@ typedef struct { BOOL had_passthrough_rect; /* See the comment in PSDRV_Rectangle */ } JOB; -typedef struct { +typedef struct +{ + void *reserved[2]; /* reserved for gdi */ HDC hdc; PSFONT font; /* Current PS font */ DOWNLOAD *downloaded_fonts; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c973675..da59d7e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -144,6 +144,7 @@ struct xrender_info; /* X physical device */ typedef struct { + void *reserved[2]; /* reserved for gdi */ HDC hdc; GC gc; /* X Window GC */ Drawable drawable;

1 0

Frédéric Delanoy : Fix 1.3. 15 release French translation
by Jeremy Newman 08 Mar '11

08 Mar '11

Module: website Branch: master Commit: 2e0af31e2cfb064bf02d23f94116bfc8527cd094 URL: http://source.winehq.org/git/website.git/?a=commit;h=2e0af31e2cfb064bf02d23… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 8 20:05:47 2011 +0100 Fix 1.3.15 release French translation --- news/fr/2011030401.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/fr/2011030401.xml b/news/fr/2011030401.xml index 2a2410a..3ce601f 100644 --- a/news/fr/2011030401.xml +++ b/news/fr/2011030401.xml @@ -7,7 +7,7 @@ <ul> <li>Possibilité de modifier les mots de passe réseau.</li> <li>Prise en charge de la réflexion dans le compilateur de shaders.</li> - <li>Les tests n'essaient plus s'accommoder du comportement Win9x.</li> + <li>Les tests n'essaient plus de s'accommoder du comportement Win9x.</li> <li>Plusieurs améliorations MSHTML et MSXML.</li> <li>Diverses corrections de bogues.</li> </ul></p>

1 0

André Hentschel : Wine 1.3.15 freigegeben
by Jeremy Newman 08 Mar '11

08 Mar '11

Module: website Branch: master Commit: 0d3e7d5c5bd8dc6451b51a3391e703ae226916ab URL: http://source.winehq.org/git/website.git/?a=commit;h=0d3e7d5c5bd8dc6451b51a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 8 19:42:11 2011 +0100 Wine 1.3.15 freigegeben --- news/de/2011030401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2011030401.xml b/news/de/2011030401.xml new file mode 100644 index 0000000..b8eeee2 --- /dev/null +++ b/news/de/2011030401.xml @@ -0,0 +1,16 @@ +<news> +<date>4. März 2011</date> +<title>Wine 1.3.15 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.3.15 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.3.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Änderbarkeit von Netzwerk Kennwörtern.</li> + <li>Unterstützung für Reflektionen im Shader Compiler.</li> + <li>Tests versuchen nicht mehr dem Win9x Verhalten gerecht zu werden.</li> + <li>Einige MSHTML und MSXML Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul></p> +<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.15.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</p></body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.2 and 1.3.15
by Jeremy Newman 08 Mar '11

08 Mar '11

Module: website Branch: master Commit: c7c941410a0760b1f717b9acd9d76cc383f70356 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7c941410a0760b1f717b9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 6 10:42:13 2011 +0100 Polish translation for release 1.3.2 and 1.3.15 --- news/pl/2010090301.xml | 15 +++++++++++++++ news/pl/2011030401.xml | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/news/pl/2010090301.xml b/news/pl/2010090301.xml new file mode 100644 index 0000000..8fe0ed4 --- /dev/null +++ b/news/pl/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>Wrzesień 3, 2010</date> +<title>Wydano Wine 1.3.2</title> +<body> +<p> Wydanie rozwojowe Wine 1.3.2 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.3.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Aktualizacja silnika Gecko, teraz zawiera również wersję 64-bitową.</li> + <li>Nowa implementacja konsoli na terminalach Uniksowych.</li> + <li>Wiele nowych funkcji w bibliotekach uruchomieniowych dll napisanych w C.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news> diff --git a/news/pl/2011030401.xml b/news/pl/2011030401.xml new file mode 100644 index 0000000..eb9bc7a --- /dev/null +++ b/news/pl/2011030401.xml @@ -0,0 +1,16 @@ +<news> +<date>Marzec 4, 2011</date> +<title>Wydano Wine 1.3.15</title> +<body> +<p> Wydanie rozwojowe Wine 1.3.15 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.3.15">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla zmiany haseł sieciowych.</li> + <li>Wsparcie dla mechanizmu refleksji w kompilatorze cieniowania.</li> + <li>Testy już nie uwzględniają zachowania Win9x.</li> + <li>Kilka ulepszeń w MSHTML i MSXML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.15.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Nikolay Sivov : msxml3: Orphan a node removed with removeChild().
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 76645c5e6d3dcceb95ae17a6d0944040e8c48908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76645c5e6d3dcceb95ae17a6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 17:45:20 2011 +0300 msxml3: Orphan a node removed with removeChild(). --- dlls/msxml3/node.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 18b3db2..50cb481 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -292,7 +292,6 @@ HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { - xmlNodePtr new_child_node; IXMLDOMNode *before = NULL; xmlnode *node_obj; xmlDocPtr doc; @@ -321,12 +320,11 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT return E_FAIL; } - new_child_node = node_obj->node; - TRACE("new_child_node %p This->node %p\n", new_child_node, This->node); + TRACE("new child %p, This->node %p\n", node_obj->node, This->node); - if(!new_child_node->parent) - if(xmldoc_remove_orphan(new_child_node->doc, new_child_node) != S_OK) - WARN("%p is not an orphan of %p\n", new_child_node, new_child_node->doc); + if(!node_obj->node->parent) + if(xmldoc_remove_orphan(node_obj->node->doc, node_obj->node) != S_OK) + WARN("%p is not an orphan of %p\n", node_obj->node, node_obj->node->doc); if(before) { @@ -336,10 +334,13 @@ 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; + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; xmldoc_add_ref(before_node_obj->node->doc); - xmlAddPrevSibling(before_node_obj->node, new_child_node); + xmlAddPrevSibling(before_node_obj->node, node_obj->node); xmldoc_release(doc); node_obj->parent = This->parent; } @@ -347,10 +348,13 @@ 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; + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; xmldoc_add_ref(This->node->doc); - xmlAddChild(This->node, new_child_node); + xmlAddChild(This->node, node_obj->node); xmldoc_release(doc); node_obj->parent = This->iface; } @@ -445,6 +449,7 @@ HRESULT node_remove_child(xmlnode *This, IXMLDOMNode* child, IXMLDOMNode** oldCh xmlUnlinkNode(child_node->node); child_node->parent = NULL; + xmldoc_add_orphan(child_node->node->doc, child_node->node); if(oldChild) { @@ -507,6 +512,8 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) if (!node) { ERR("Copy failed\n"); + xmldoc_remove_orphan(clone->doc, clone); + xmlFreeNode(clone); return E_FAIL; }

1 0

Nikolay Sivov : msxml3: Fix some leaks in tests.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 0ecc9201c33c85d0b1b1edd1dcaac24e4fab1f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecc9201c33c85d0b1b1edd1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 14:55:39 2011 +0300 msxml3: Fix some leaks in tests. --- dlls/msxml3/tests/domdoc.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index be9a430..41a2b85 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2956,18 +2956,23 @@ static void test_removeChild(void) r = IXMLDOMDocument_get_documentElement( doc, &element ); ok( r == S_OK, "ret %08x\n", r); + todo_wine EXPECT_REF(element, 2); r = IXMLDOMElement_get_childNodes( element, &root_list ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(root_list, 1); r = IXMLDOMNodeList_get_item( root_list, 3, &fo_node ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(fo_node, 1); r = IXMLDOMNode_get_childNodes( fo_node, &fo_list ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(fo_list, 1); r = IXMLDOMNodeList_get_item( fo_list, 0, &ba_node ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(ba_node, 1); /* invalid parameter: NULL ptr */ removed_node = (void*)0xdeadbeef; @@ -2978,15 +2983,19 @@ static void test_removeChild(void) /* ba_node is a descendant of element, but not a direct child. */ removed_node = (void*)0xdeadbeef; EXPECT_REF(ba_node, 1); + EXPECT_CHILDREN(fo_node); r = IXMLDOMElement_removeChild( element, ba_node, &removed_node ); ok( r == E_INVALIDARG, "ret %08x\n", r ); ok( removed_node == NULL, "%p\n", removed_node ); EXPECT_REF(ba_node, 1); + EXPECT_CHILDREN(fo_node); EXPECT_REF(ba_node, 1); + EXPECT_REF(fo_node, 1); r = IXMLDOMElement_removeChild( element, fo_node, &removed_node ); ok( r == S_OK, "ret %08x\n", r); ok( fo_node == removed_node, "node %p node2 %p\n", fo_node, removed_node ); + EXPECT_REF(fo_node, 2); EXPECT_REF(ba_node, 1); /* try removing already removed child */ @@ -3016,6 +3025,7 @@ static void test_removeChild(void) ok( r == S_OK, "ret %08x\n", r); IXMLDOMElement_Release( lc_element ); + temp_node = (void*)0xdeadbeef; r = IXMLDOMNode_get_parentNode( lc_node, &temp_node ); ok( r == S_FALSE, "ret %08x\n", r); ok( temp_node == NULL, "%p\n", temp_node ); @@ -3117,9 +3127,13 @@ static void test_replaceChild(void) /* MS quirk: replaceChild also accepts elements instead of nodes */ r = IXMLDOMNode_QueryInterface( ba_node, &IID_IXMLDOMElement, (void**)&ba_element); ok( r == S_OK, "ret %08x\n", r ); + EXPECT_REF(ba_element, 2); + removed_node = NULL; r = IXMLDOMElement_replaceChild( element, ba_node, (IXMLDOMNode*)ba_element, &removed_node ); ok( r == S_OK, "ret %08x\n", r ); + ok( removed_node != NULL, "got %p\n", removed_node); + EXPECT_REF(ba_element, 3); IXMLDOMElement_Release( ba_element ); r = IXMLDOMNodeList_get_length( fo_list, &len); @@ -6099,6 +6113,7 @@ static void test_nodeTypedValue(void) ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), _bstr_("value")), "got wrong value\n"); IXMLDOMProcessingInstruction_Release(pi); + VariantClear(&value); } hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("[1]*2=3; &gee thats not right!"), &cdata); @@ -6111,6 +6126,7 @@ static void test_nodeTypedValue(void) ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee thats not right!")), "got wrong value\n"); IXMLDOMCDATASection_Release(cdata); + VariantClear(&value); } hr = IXMLDOMDocument_createComment(doc, _bstr_("comment"), &comment); @@ -6123,6 +6139,7 @@ static void test_nodeTypedValue(void) ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), _bstr_("comment")), "got wrong value\n"); IXMLDOMComment_Release(comment); + VariantClear(&value); } hr = IXMLDOMDocument_createDocumentFragment(doc, &frag); @@ -7523,6 +7540,7 @@ todo_wine { todo_wine EXPECT_REF(elem, 2); IXMLDOMDocument_Release(doc); todo_wine EXPECT_REF(elem, 2); + IXMLDOMElement_Release(elem); doc = create_document(&IID_IXMLDOMDocument); @@ -8064,6 +8082,7 @@ todo_wine { /* we currently output one '\n' instead of empty string */ todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); IXMLDOMDocument_Release(doc2); + VariantClear(&v); IXSLProcessor_Release(processor); @@ -8181,6 +8200,7 @@ static void test_insertBefore(void) ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(node == NULL, "got %p\n", node); IXMLDOMNode_Release(newnode); + IXMLDOMAttribute_Release(attr); /* insertBefore for elements */ hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem1); @@ -8206,6 +8226,7 @@ static void test_insertBefore(void) EXPECT_CHILDREN(elem1); todo_wine EXPECT_REF(elem2, 3); + IXMLDOMNode_Release(node); /* again for already linked node */ V_VT(&v) = VT_NULL; @@ -8217,7 +8238,8 @@ static void test_insertBefore(void) EXPECT_CHILDREN(elem1); /* increments each time */ - todo_wine EXPECT_REF(elem2, 4); + todo_wine EXPECT_REF(elem2, 3); + IXMLDOMNode_Release(node); /* try to add to another element */ V_VT(&v) = VT_NULL; @@ -8229,6 +8251,8 @@ static void test_insertBefore(void) EXPECT_CHILDREN(elem3); EXPECT_NO_CHILDREN(elem1); + IXMLDOMNode_Release(node); + /* cross document case - try to add as child to a node created with other doc */ doc2 = create_document(&IID_IXMLDOMDocument); @@ -8249,14 +8273,16 @@ static void test_insertBefore(void) ok(node == (void*)elem4, "got %p\n", node); todo_wine EXPECT_REF(elem4, 3); todo_wine EXPECT_REF(elem3, 2); + IXMLDOMNode_Release(node); V_VT(&v) = VT_NULL; node = NULL; hr = IXMLDOMElement_insertBefore(elem3, (IXMLDOMNode*)elem5, v, &node); ok(hr == S_OK, "got 0x%08x\n", hr); ok(node == (void*)elem5, "got %p\n", node); - todo_wine EXPECT_REF(elem4, 3); + todo_wine EXPECT_REF(elem4, 2); todo_wine EXPECT_REF(elem5, 3); + IXMLDOMNode_Release(node); IXMLDOMDocument_Release(doc2); @@ -8352,6 +8378,8 @@ static void test_insertBefore(void) ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); + IXMLDOMElement_Release(elem1); + IXMLDOMElement_Release(elem2); IXMLDOMDocument_Release(doc); }

1 0

Maarten Lankhorst : ntdll: Fix time units for SystemPerformanceProcessorInformation, and steal idle time for kernel time.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 67755d2593c372539005fab2aaf01fa1c61fffbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=67755d2593c372539005fab2a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Mar 6 18:17:06 2011 +0100 ntdll: Fix time units for SystemPerformanceProcessorInformation, and steal idle time for kernel time. --- dlls/ntdll/nt.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8b4f09c..fb89a42 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1310,6 +1310,25 @@ void fill_cpu_info(void) cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); } +static void fill_in_sppi(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi, DWORD64 idle, DWORD64 sys, DWORD64 usr) +{ + DWORD64 steal; + sppi->IdleTime.QuadPart = idle * 10000000 / sysconf(_SC_CLK_TCK); + sppi->KernelTime.QuadPart = sys * 10000000 / sysconf(_SC_CLK_TCK); + sppi->UserTime.QuadPart = usr * 10000000 / sysconf(_SC_CLK_TCK); + + /* Add 1% from idle time to kernel time, to make .NET happy */ + steal = sppi->IdleTime.QuadPart / 100; + sppi->IdleTime.QuadPart -= steal; + sppi->KernelTime.QuadPart += steal; + + /* DPC time */ + sppi->Reserved1[0].QuadPart = 0; + /* Interrupt time */ + sppi->Reserved1[1].QuadPart = 0; + sppi->Reserved2 = 0; +} + /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -1610,11 +1629,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( usr += nice; sppi = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - sppi->IdleTime.QuadPart = idle; - sppi->KernelTime.QuadPart = sys; - sppi->UserTime.QuadPart = usr+nice; - sppi->Reserved1[0].QuadPart = 0; - sppi->Reserved1[1].QuadPart = 0; + fill_in_sppi(sppi, idle, sys, usr); cpus = 1; len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); } @@ -1638,20 +1653,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( usr += nice; out_cpus --; if (name[3]=='0') /* first cpu */ - { - sppi->IdleTime.QuadPart = idle; - sppi->KernelTime.QuadPart = sys; - sppi->UserTime.QuadPart = usr; - } + fill_in_sppi(sppi, idle, sys, usr); else /* new cpu */ { len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * (cpus+1); sppi = RtlReAllocateHeap(GetProcessHeap(), 0, sppi, len); - sppi[cpus].IdleTime.QuadPart = idle; - sppi[cpus].KernelTime.QuadPart = sys; - sppi[cpus].UserTime.QuadPart = usr; - sppi[cpus].Reserved1[0].QuadPart = 0; - sppi[cpus].Reserved1[1].QuadPart = 0; + fill_in_sppi(sppi + cpus, idle, sys, usr); cpus++; } }

1 0

Andy Norris : winealsa: Add support for alsa cards without a PCM mixer ( only Line).
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 254b8f85b5f05e6fa6e688f453520f800086c2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=254b8f85b5f05e6fa6e688f45… Author: Andy Norris <bk-git(a)usrlocalsbin.com> Date: Sat Mar 5 16:03:55 2011 -0500 winealsa: Add support for alsa cards without a PCM mixer (only Line). --- dlls/winealsa.drv/alsa.c | 153 ++++++++++++++++++++++++--------------------- dlls/winealsa.drv/mixer.c | 10 +++- 2 files changed, 90 insertions(+), 73 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b242cfa..0b244fa 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -421,6 +421,8 @@ int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, snd_ctl_elem_info_t * eleminfop = NULL; snd_ctl_elem_value_t * elemvaluep = NULL; snd_ctl_elem_id_t * elemidp = NULL; + const char *names[] = {"PCM Playback Volume", "Line Playback Volume", NULL}; + const char **name; #define EXIT_ON_ERROR(f,txt,exitcode) do \ @@ -447,81 +449,88 @@ int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, /* Setup and find an element id that exactly matches the characteristic we want ** FIXME: It is probably short sighted to hard code and fixate on PCM Playback Volume */ - snd_ctl_elem_id_set_name(elemidp, "PCM Playback Volume"); - snd_ctl_elem_id_set_interface(elemidp, SND_CTL_ELEM_IFACE_MIXER); - elem = snd_hctl_find_elem(hctl, elemidp); - if (elem) - { - /* Read and return volume information */ - EXIT_ON_ERROR(snd_hctl_elem_info(elem, eleminfop), "snd_hctl_elem_info", MMSYSERR_NOTSUPPORTED); - value_count = snd_ctl_elem_info_get_count(eleminfop); - if (out_min || out_max || out_step) - { - if (!snd_ctl_elem_info_is_readable(eleminfop)) - { - ERR("snd_ctl_elem_info_is_readable returned false; cannot return info\n"); - rc = MMSYSERR_NOTSUPPORTED; - goto out; - } - - if (out_min) - *out_min = snd_ctl_elem_info_get_min(eleminfop); - - if (out_max) - *out_max = snd_ctl_elem_info_get_max(eleminfop); - - if (out_step) - *out_step = snd_ctl_elem_info_get_step(eleminfop); - } - - if (out_left || out_right) - { - EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); - - if (out_left) - *out_left = snd_ctl_elem_value_get_integer(elemvaluep, 0); - - if (out_right) - { - if (value_count == 1) - *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 0); - else if (value_count == 2) - *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 1); - else - { - ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while getting volume info\n", value_count); - rc = -1; - goto out; - } - } - } - /* Set the volume */ - if (new_left || new_right) - { - EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); - if (new_left) - snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_left); - if (new_right) - { - if (value_count == 1) - snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_right); - else if (value_count == 2) - snd_ctl_elem_value_set_integer(elemvaluep, 1, *new_right); - else - { - ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while setting volume info\n", value_count); - rc = -1; - goto out; - } - } - - EXIT_ON_ERROR(snd_hctl_elem_write(elem, elemvaluep), "snd_hctl_elem_write", MMSYSERR_NOTSUPPORTED); - } + for( name = names; *name; name++ ) + { + snd_ctl_elem_id_set_name(elemidp, *name); + snd_ctl_elem_id_set_interface(elemidp, SND_CTL_ELEM_IFACE_MIXER); + elem = snd_hctl_find_elem(hctl, elemidp); + if (elem) + { + /* Read and return volume information */ + EXIT_ON_ERROR(snd_hctl_elem_info(elem, eleminfop), "snd_hctl_elem_info", MMSYSERR_NOTSUPPORTED); + value_count = snd_ctl_elem_info_get_count(eleminfop); + if (out_min || out_max || out_step) + { + if (!snd_ctl_elem_info_is_readable(eleminfop)) + { + ERR("snd_ctl_elem_info_is_readable returned false; cannot return info\n"); + rc = MMSYSERR_NOTSUPPORTED; + goto out; + } + + if (out_min) + *out_min = snd_ctl_elem_info_get_min(eleminfop); + + if (out_max) + *out_max = snd_ctl_elem_info_get_max(eleminfop); + + if (out_step) + *out_step = snd_ctl_elem_info_get_step(eleminfop); + } + + if (out_left || out_right) + { + EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); + + if (out_left) + *out_left = snd_ctl_elem_value_get_integer(elemvaluep, 0); + + if (out_right) + { + if (value_count == 1) + *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 0); + else if (value_count == 2) + *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 1); + else + { + ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while getting volume info\n", value_count); + rc = -1; + goto out; + } + } + } + + /* Set the volume */ + if (new_left || new_right) + { + EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); + if (new_left) + snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_left); + if (new_right) + { + if (value_count == 1) + snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_right); + else if (value_count == 2) + snd_ctl_elem_value_set_integer(elemvaluep, 1, *new_right); + else + { + ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while setting volume info\n", value_count); + rc = -1; + goto out; + } + } + + EXIT_ON_ERROR(snd_hctl_elem_write(elem, elemvaluep), "snd_hctl_elem_write", MMSYSERR_NOTSUPPORTED); + } + + break; + } } - else + + if( !*name ) { - ERR("Could not find 'PCM Playback Volume' element\n"); + ERR("Could not find '{PCM,Line} Playback Volume' element\n"); rc = MMSYSERR_NOTSUPPORTED; } diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 90760eb..7d5b452 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -435,7 +435,7 @@ static void ALSA_MixerInit(void) char cardind[6], cardname[10]; snd_ctl_t *ctl; - snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL, *micelem = NULL; + snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL, *lineelem = NULL, *micelem = NULL; memset(info, 0, snd_ctl_card_info_sizeof()); memset(&mixdev[mixnum], 0, sizeof(*mixdev)); @@ -520,6 +520,8 @@ static void ALSA_MixerInit(void) headelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "PCM") && !pcmelem) pcmelem = elem; + else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Line") && !lineelem) + lineelem = elem; ++(mixdev[mixnum].chans); } } @@ -548,6 +550,12 @@ static void ALSA_MixerInit(void) mastelem = pcmelem; capcontrols -= !!snd_mixer_selem_has_capture_switch(mastelem); } + else if (lineelem && !mastelem) + { + /* Use 'Line' as master device */ + mastelem = lineelem; + capcontrols -= !!snd_mixer_selem_has_capture_switch(mastelem); + } else if (!mastelem && !captelem && !micelem) { /* If there is nothing sensible that can act as 'Master' control, something is wrong */

1 0

Alexandre Julliard : gdi32: GetDIBColorTable doesn' t need to be part of the DC driver interface.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: fcfbb46d2eedcb7b7059262fa1f7bf80ac02e230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcfbb46d2eedcb7b7059262fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 16:47:22 2011 +0100 gdi32: GetDIBColorTable doesn't need to be part of the DC driver interface. --- dlls/gdi32/dib.c | 23 +++++++++-------------- dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0abd833..0fc2197 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -453,29 +453,24 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUA UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) { DC * dc; + BITMAPOBJ *bitmap; UINT result = 0; if (!(dc = get_dc_ptr( hdc ))) return 0; - if (dc->funcs->pGetDIBColorTable) - result = dc->funcs->pGetDIBColorTable(dc->physDev, startpos, entries, colors); - else + if ((bitmap = GDI_GetObjPtr( dc->hBitmap, OBJ_BITMAP ))) { - BITMAPOBJ *bitmap = GDI_GetObjPtr( dc->hBitmap, OBJ_BITMAP ); - if (bitmap) + /* Check if currently selected bitmap is a DIB */ + if (bitmap->color_table) { - /* Check if currently selected bitmap is a DIB */ - if (bitmap->color_table) + if (startpos < bitmap->nb_colors) { - if (startpos < bitmap->nb_colors) - { - if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; - memcpy(colors, bitmap->color_table + startpos, entries * sizeof(RGBQUAD)); - result = entries; - } + if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; + memcpy(colors, bitmap->color_table + startpos, entries * sizeof(RGBQUAD)); + result = entries; } - GDI_ReleaseObj( dc->hBitmap ); } + GDI_ReleaseObj( dc->hBitmap ); } release_dc_ptr( dc ); return result; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 38c4942..7966c64 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -110,7 +110,6 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(GdiComment); GET_FUNC(GetBitmapBits); GET_FUNC(GetCharWidth); - GET_FUNC(GetDIBColorTable); GET_FUNC(GetDIBits); GET_FUNC(GetDeviceCaps); GET_FUNC(GetDeviceGammaRamp); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 8f0b932..db04f50 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -72,7 +72,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 504b120..015660f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -114,7 +114,6 @@ typedef struct tagDC_FUNCS BOOL (CDECL *pGdiComment)(PHYSDEV,UINT,CONST BYTE*); LONG (CDECL *pGetBitmapBits)(HBITMAP,void*,LONG); BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); - UINT (CDECL *pGetDIBColorTable)(PHYSDEV,UINT,UINT,RGBQUAD*); INT (CDECL *pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); BOOL (CDECL *pGetDeviceGammaRamp)(PHYSDEV,LPVOID); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 553c363..436d8ec 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -70,7 +70,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = NULL, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */

1 0

Alexandre Julliard : gdi32: Fix parameter type in the ModifyWorldTransform driver entry point.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: e6d9486453868f491d8226215c48291a2ccfa322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d9486453868f491d8226215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 15:21:52 2011 +0100 gdi32: Fix parameter type in the ModifyWorldTransform driver entry point. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/mapping.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 55d9b75..9a0f556 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -90,7 +90,7 @@ extern INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode ) DECLSPEC_HIDDEN; +extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/mapping.c b/dlls/gdi32/enhmfdrv/mapping.c index b72e0fc..5e3e971 100644 --- a/dlls/gdi32/enhmfdrv/mapping.c +++ b/dlls/gdi32/enhmfdrv/mapping.c @@ -119,7 +119,7 @@ BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode) +BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode) { EMRMODIFYWORLDTRANSFORM emr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f6c971d..504b120 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -128,7 +128,7 @@ typedef struct tagDC_FUNCS INT (CDECL *pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT); - BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,INT); + BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,DWORD); BOOL (CDECL *pMoveTo)(PHYSDEV,INT,INT); INT (CDECL *pOffsetClipRgn)(PHYSDEV,INT,INT); INT (CDECL *pOffsetViewportOrg)(PHYSDEV,INT,INT);

1 0

Alexandre Julliard : user32: No longer export HOOK_CallHooks.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 383bda91cfb920171b3a0082bbb59551f00cf5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=383bda91cfb920171b3a0082b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 14:50:47 2011 +0100 user32: No longer export HOOK_CallHooks. --- dlls/user32/user32.spec | 5 ----- dlls/winex11.drv/x11drv.h | 3 --- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index be54f77..c89b710 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -780,8 +780,3 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # @ cdecl __wine_send_input(long ptr) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl HOOK_CallHooks(long long long long long) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6f0c8db..c973675 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -858,9 +858,6 @@ extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDE extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen); -/* FIXME: private functions imported from user32 */ -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); - #define XEMBED_MAPPED (1 << 0) #endif /* __WINE_X11DRV_H */

1 0

Alexandre Julliard : user.exe: Call the 16-bit hook directly in SendMessage16.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: eda60796817fcda152d9988966ef2b91cb7dd012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda60796817fcda152d998896… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 14:50:18 2011 +0100 user.exe: Call the 16-bit hook directly in SendMessage16. --- dlls/user.exe16/hook.c | 17 +++++++++++++++++ dlls/user.exe16/message.c | 15 +-------------- dlls/user.exe16/user_private.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/user.exe16/hook.c b/dlls/user.exe16/hook.c index 640899e..105254e 100644 --- a/dlls/user.exe16/hook.c +++ b/dlls/user.exe16/hook.c @@ -186,6 +186,23 @@ static LRESULT wndproc_hook_callback16( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LP return ret; } +/* helper for SendMessage16 */ +void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) +{ + CWPSTRUCT16 cwp; + struct hook16_queue_info *info = get_hook_info( FALSE ); + + if (!info->proc[WH_CALLWNDPROC - WH_MINHOOK]) return; + + cwp.hwnd = hwnd; + cwp.message = msg; + cwp.wParam = wp; + cwp.lParam = lp; + + lp = MapLS( &cwp ); + call_hook_16( WH_CALLWNDPROC, HC_ACTION, 1, lp ); + UnMapLS( lp ); +} /*********************************************************************** * call_WH_MSGFILTER diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b10b761..bc81d45 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -39,19 +39,6 @@ DWORD USER16_AlertableWait = 0; struct wow_handlers32 wow_handlers32; -static LRESULT cwp_hook_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ) -{ - CWPSTRUCT cwp; - - cwp.hwnd = hwnd; - cwp.message = msg; - cwp.wParam = wp; - cwp.lParam = lp; - *result = 0; - return HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp, FALSE ); -} - static LRESULT send_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { @@ -1498,7 +1485,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM WNDPROC16 winproc; /* first the WH_CALLWNDPROC hook */ - WINPROC_CallProc16To32A( cwp_hook_callback, hwnd16, msg, wparam, lparam, &result, NULL ); + call_WH_CALLWNDPROC_hook( hwnd16, msg, wparam, lparam ); if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index d202bfe..7c91afb 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -93,7 +93,7 @@ extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; +extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) DECLSPEC_HIDDEN; #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))

1 0

Juan Lang : wininet: Fully initialize time variable (valgrind).
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: b9673bcc4d5ed07fb8461726b7ee1750e75e0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9673bcc4d5ed07fb8461726b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 13:13:11 2011 -0800 wininet: Fully initialize time variable (valgrind). --- 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 841a83f..2fb2a2e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3769,7 +3769,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) WCHAR *nextPtr, day[4], month[4], *monthPtr; LPCWSTR ptr; unsigned long num; - SYSTEMTIME st; + SYSTEMTIME st = { 0 }; ptr = strchrW(value, ','); if (!ptr)

1 0

Juan Lang : wininet: Decrement file use count when deleting a cache entry.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 601b4fa589edb1c290432a1153c8b93f1978ce32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601b4fa589edb1c290432a115… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Mar 6 10:05:45 2011 -0800 wininet: Decrement file use count when deleting a cache entry. --- dlls/wininet/urlcache.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index de31ff6..ca7f880 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2924,6 +2924,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; DWORD error; TRACE("(%s)\n", debugstr_a(lpszUrlName)); @@ -2954,6 +2955,21 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) } pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to delete entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + { + if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry); @@ -2973,6 +2989,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; LPSTR urlA; DWORD error; @@ -3017,6 +3034,21 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) } pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to delete entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + { + if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry);

1 0

Juan Lang : wininet: Increment file use count when committing a URL cache entry.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 6e713b3946b292f5da42a966b3aa65a78afae034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e713b3946b292f5da42a966b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Mar 6 10:07:17 2011 -0800 wininet: Increment file use count when committing a URL cache entry. --- dlls/wininet/urlcache.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ad439dd..de31ff6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2633,6 +2633,11 @@ static BOOL CommitUrlCacheEntryInternal( (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader)); if (error != ERROR_SUCCESS) URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); + else + { + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; + } cleanup: URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Hans Leidekker : msi: Assume a file is present if the target exists with the same size and there 's no file version or hash to verify.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 429407cfb6418d64592326d21aa19a25656f2ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429407cfb6418d64592326d21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:09:01 2011 +0100 msi: Assume a file is present if the target exists with the same size and there's no file version or hash to verify. --- dlls/msi/files.c | 31 +++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 493baed..4736fce 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -119,12 +119,21 @@ static msi_file_state calculate_install_state( MSIFILE *file ) { return msifs_overwrite; } - if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + if (file->hash.dwFileHashInfoSize) { - TRACE("file hashes match, not overwriting\n"); - return msifs_present; + if (msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_hashmatch; + } + else + { + TRACE("file hashes do not match, overwriting\n"); + return msifs_overwrite; + } } - return msifs_overwrite; + /* assume present */ + return msifs_present; } static void schedule_install_files(MSIPACKAGE *package) @@ -299,6 +308,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); return ERROR_FUNCTION_FAILED; } + if (!file->Component->Enabled) continue; + + if (file->state != msifs_hashmatch && (rc = ready_media( package, file, mi ))) + { + ERR("Failed to ready media for %s\n", debugstr_w(file->File)); + goto done; + } if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; @@ -308,13 +324,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSICABDATA data; - rc = ready_media(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to ready media for %s\n", debugstr_w(file->File)); - goto done; - } - data.mi = mi; data.package = package; data.cb = installfiles_cb; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10f51de..096678c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -499,6 +499,7 @@ typedef enum _msi_file_state { msifs_present, msifs_installed, msifs_skipped, + msifs_hashmatch } msi_file_state; typedef struct tagMSIFILE diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ae6be76..deff5f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -713,7 +713,8 @@ static const CHAR mc_component_dat[] = "Component\tComponentId\tDirectory_\tAttr "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n" - "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n"; + "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n" + "tiberius\t\tMSITESTDIR\t0\t\ttiberius\n"; static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -721,7 +722,8 @@ static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" "augustus\taugustus\taugustus\t500\t\t\t0\t2\n" "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3\n" - "gaius\tgaius\tgaius\t500\t\t\t16384\t4"; + "gaius\tgaius\tgaius\t500\t\t\t16384\t4\n" + "tiberius\ttiberius\ttiberius\t500\t\t\t0\t5\n"; static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -729,7 +731,8 @@ static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV "1\t1\t\ttest1.cab\tDISK1\t\n" "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t3\t\ttest3.cab\tDISK3\t\n" - "4\t4\t\ttest3.cab\tDISK3\t\n"; + "4\t4\t\ttest3.cab\tDISK3\t\n" + "5\t5\t\ttest4.cab\tDISK4\t\n"; static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" "s72\ti2\ti4\ti4\ti4\ti4\n" @@ -2295,6 +2298,29 @@ static BOOL delete_cf(const CHAR *rel_path, BOOL is_file) return RemoveDirectoryA(path); } +static BOOL compare_pf_data(const char *filename, const char *data, DWORD size) +{ + DWORD read; + HANDLE handle; + BOOL ret = FALSE; + char *buffer, path[MAX_PATH]; + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, filename); + + handle = CreateFileA(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (buffer) + { + ReadFile(handle, buffer, size, &read, NULL); + if (read == size && !memcmp(data, buffer, size)) ret = TRUE; + HeapFree(GetProcessHeap(), 0, buffer); + } + CloseHandle(handle); + return ret; +} + static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -4068,15 +4094,18 @@ static void test_missingcab(void) CreateDirectoryA("msitest", NULL); create_file("msitest\\augustus", 500); create_file("maximus", 500); + create_file("tiberius", 500); create_database(msifile, mc_tables, sizeof(mc_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + create_cab_file("test4.cab", MEDIA_SIZE, "tiberius\0"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4093,11 +4122,14 @@ static void test_missingcab(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); create_pf("msitest\\gaius", TRUE); r = MsiInstallProductA(msifile, "GAIUS=1"); @@ -4108,16 +4140,19 @@ static void test_missingcab(void) ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File removed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File removed\n"); ok(delete_pf("msitest\\gaius", TRUE), "File removed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_pf("msitest\\caesar", TRUE); delete_pf("msitest", FALSE); DeleteFile("msitest\\augustus"); RemoveDirectory("msitest"); DeleteFile("maximus"); + DeleteFile("tiberius"); DeleteFile("test1.cab"); + DeleteFile("test4.cab"); DeleteFile(msifile); }

1 0

Hans Leidekker : msi: Load media info even if there's no file to install.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: be790cb0adec3a41297d2a51bdcee4e46544341c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be790cb0adec3a41297d2a51b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:39 2011 +0100 msi: Load media info even if there's no file to install. --- dlls/msi/files.c | 7 +++++++ dlls/msi/media.c | 9 +-------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 9 --------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e88a0c6..493baed 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -293,6 +293,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + rc = msi_load_media_info( package, file, mi ); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); + return ERROR_FUNCTION_FAILED; + } + if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 8b5a8c6..8c4b0f7 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -656,7 +656,7 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } -static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR source_dir; @@ -803,13 +803,6 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) if (mi->is_continuous) return ERROR_SUCCESS; - rc = msi_load_media_info(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Unable to load media info %u\n", rc); - return ERROR_FUNCTION_FAILED; - } - /* cabinet is internal, no checks needed */ if (!mi->cabinet || mi->cabinet[0] == '#') return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9ddcaeb..10f51de 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -987,6 +987,7 @@ typedef struct } MSICABDATA; extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); +extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ea5431a..ae6be76 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3339,11 +3339,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3368,11 +3365,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3396,11 +3390,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Hans Leidekker : msi: Make a second pass to determine which files to install in the InstallFiles action .
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 4a6c63e24a5a9ab22dc4e2145db16d86fe8f1895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6c63e24a5a9ab22dc4e2145… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:16 2011 +0100 msi: Make a second pass to determine which files to install in the InstallFiles action. This is needed because the target path can still change after CostFinalize is executed. This happens in the .NET 1.1 Service Pack 1 installer where a custom action calls SetTargetPath. --- dlls/msi/action.c | 52 +++++++-------------------------- dlls/msi/files.c | 81 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msipriv.h | 4 ++- 3 files changed, 84 insertions(+), 53 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 86aa33f..a003f5e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2178,7 +2178,7 @@ int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) return 0; } -static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) +int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) { DWORD ms1, ms2; @@ -2190,7 +2190,7 @@ static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) return 0; } -static DWORD get_disk_file_size( LPCWSTR filename ) +DWORD msi_get_disk_file_size( LPCWSTR filename ) { HANDLE file; DWORD size; @@ -2206,7 +2206,7 @@ static DWORD get_disk_file_size( LPCWSTR filename ) return size; } -static BOOL hash_matches( MSIFILE *file ) +BOOL msi_file_hash_matches( MSIFILE *file ) { UINT r; MSIFILEHASHINFO hash; @@ -2256,7 +2256,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) TRACE("resolves to %s\n", debugstr_w(file->TargetPath)); } -static UINT set_file_install_states( MSIPACKAGE *package ) +static UINT calculate_file_cost( MSIPACKAGE *package ) { VS_FIXEDFILEINFO *file_version; WCHAR *font_version; @@ -2277,67 +2277,37 @@ static UINT set_file_install_states( MSIPACKAGE *package ) if ((comp->assembly && !comp->assembly->installed) || GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { - file->state = msifs_missing; comp->Cost += file->FileSize; continue; } + file_size = msi_get_disk_file_size( file->TargetPath ); + if (file->Version) { if ((file_version = msi_get_disk_file_version( file->TargetPath ))) { - TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), - LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), - LOWORD(file_version->dwFileVersionLS)); - if (msi_compare_file_versions( file_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( file_version ); continue; } else if ((font_version = font_version_from_file( file->TargetPath ))) { - TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); - if (msi_compare_font_versions( font_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( font_version ); continue; } } - if ((file_size = get_disk_file_size( file->TargetPath )) != file->FileSize) + if (file_size != file->FileSize) { - file->state = msifs_overwrite; comp->Cost += file->FileSize - file_size; - continue; } - if (file->hash.dwFileHashInfoSize && hash_matches( file )) - { - TRACE("File hashes match, not overwriting\n"); - file->state = msifs_present; - continue; - } - file->state = msifs_overwrite; - comp->Cost += file->FileSize - file_size; } - return ERROR_SUCCESS; } @@ -2404,8 +2374,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) } } - TRACE("Calculating file install states\n"); - set_file_install_states( package ); + TRACE("Calculating file cost\n"); + calculate_file_cost( package ); msi_set_property( package->db, szCosting, szOne ); /* set default run level if not set */ diff --git a/dlls/msi/files.c b/dlls/msi/files.c index df765e5..e88a0c6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -60,6 +60,73 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac ui_progress( package, 2, f->FileSize, 0, 0 ); } +static msi_file_state calculate_install_state( MSIFILE *file ) +{ + MSICOMPONENT *comp = file->Component; + VS_FIXEDFILEINFO *file_version; + WCHAR *font_version; + msi_file_state state; + DWORD file_size; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || + (comp->assembly && comp->assembly->installed)) + { + TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); + return msifs_skipped; + } + if ((comp->assembly && !comp->assembly->installed) || + GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + { + TRACE("file %s is missing\n", debugstr_w(file->File)); + return msifs_missing; + } + if (file->Version) + { + if ((file_version = msi_get_disk_file_version( file->TargetPath ))) + { + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); + + if (msi_compare_file_versions( file_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( file_version ); + return state; + } + else if ((font_version = font_version_from_file( file->TargetPath ))) + { + TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); + + if (msi_compare_font_versions( font_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( font_version ); + return state; + } + } + if ((file_size = msi_get_disk_file_size( file->TargetPath )) != file->FileSize) + { + return msifs_overwrite; + } + if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_present; + } + return msifs_overwrite; +} + static void schedule_install_files(MSIPACKAGE *package) { MSIFILE *file; @@ -68,22 +135,14 @@ static void schedule_install_files(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || - (comp->assembly && comp->assembly->installed)) + file->state = calculate_install_state( file ); + if (file->state == msifs_overwrite && (comp->Attributes & msidbComponentAttributesNeverOverwrite)) { - TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); + TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); file->state = msifs_skipped; - continue; } comp->Action = INSTALLSTATE_LOCAL; ui_progress( package, 2, file->FileSize, 0, 0 ); - - if (file->state == msifs_overwrite && - (comp->Attributes & msidbComponentAttributesNeverOverwrite)) - { - TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); - file->state = msifs_skipped; - } } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7c25ec9..9ddcaeb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -856,7 +856,9 @@ extern DWORD msi_version_str_to_dword(LPCWSTR p); extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD); extern VS_FIXEDFILEINFO *msi_get_disk_file_version(LPCWSTR); extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *); - +extern int msi_compare_font_versions(const WCHAR *, const WCHAR *); +extern DWORD msi_get_disk_file_size(LPCWSTR); +extern BOOL msi_file_hash_matches(MSIFILE *); extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value );

1 0

Dmitry Timoshkov : gdi32: Add some additional tests for negative axes extents.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: afcfb51055751882f6b854b4b5c40a1aad3823da URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcfb51055751882f6b854b4b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 8 16:55:24 2011 +0800 gdi32: Add some additional tests for negative axes extents. --- dlls/gdi32/tests/mapping.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index fba0abf..b0688a7 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -210,15 +210,43 @@ static void test_world_transform(void) expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + ret = SetMapMode(hdc, MM_ANISOTROPIC); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, -1, -1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, -20000, -20000); + ret = SetGraphicsMode(hdc, GM_COMPATIBLE); ok(ret, "SetGraphicsMode(GM_COMPATIBLE) should not fail if DC has't an identity transform\n"); ret = GetGraphicsMode(hdc); ok(ret == GM_COMPATIBLE, "expected GM_COMPATIBLE, got %d\n", ret); - expect_viewport_ext(hdc, 1, 1); + expect_viewport_ext(hdc, -1, -1); expect_window_ext(hdc, 1, 1); expect_world_transform(hdc, 20.0, 20.0); - expect_LPtoDP(hdc, 20000, 20000); + expect_LPtoDP(hdc, -20000, -20000); DeleteDC(hdc); }

1 0

Eric Pouech : winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: cf7120b8cce712bdd450d19585427633b7033544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7120b8cce712bdd450d1958… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:09 2011 +0100 winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one. --- programs/winedbg/break.c | 60 +++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index debc0c7..e156a40 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -270,6 +270,7 @@ void break_add_break_from_id(const char *name, int lineno, BOOL swbp) struct cb_break_lineno { + const char* filename; int lineno; ADDRESS64 addr; }; @@ -287,6 +288,17 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) return TRUE; } +static BOOL CALLBACK mcb(PCWSTR module, DWORD64 base, void* user) +{ + struct cb_break_lineno* bkln = user; + + SymEnumLines(dbg_curr_process->handle, base, NULL, bkln->filename, line_cb, bkln); + /* continue module enum if no addr found + * FIXME: we don't report when several addresses match the same filename/lineno pair + */ + return !bkln->addr.Offset; +} + /*********************************************************************** * break_add_break_from_lineno * @@ -295,38 +307,38 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp) { struct cb_break_lineno bkln; + bkln.addr.Offset = 0; + bkln.lineno = lineno; - memory_get_current_pc(&bkln.addr); - - if (lineno != -1) + if (!filename) { + DWORD disp; + ADDRESS64 curr; IMAGEHLP_LINE64 il; - DWORD_PTR linear = (DWORD_PTR)memory_to_linear_addr(&bkln.addr); + DWORD_PTR linear; - if (!filename) + memory_get_current_pc(&curr); + linear = (DWORD_PTR)memory_to_linear_addr(&curr); + il.SizeOfStruct = sizeof(il); + if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) { - DWORD disp; - - il.SizeOfStruct = sizeof(il); - if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) - { - dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); - return; - } - filename = il.FileName; - } - bkln.addr.Offset = 0; - bkln.lineno = lineno; - SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); - if (!bkln.addr.Offset) - { - dbg_printf("Unknown line number\n" - "(either out of file, or no code at given line number)\n"); + dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); return; } + filename = il.FileName; + SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); } - - break_add_break(&bkln.addr, TRUE, swbp); + else + { + /* we have to enumerate across modules */ + bkln.filename = filename; + SymEnumerateModulesW64(dbg_curr_process->handle, mcb, &bkln); + } + if (bkln.addr.Offset) + break_add_break(&bkln.addr, TRUE, swbp); + else + dbg_printf("Unknown line number\n" + "(either out of file, or no code at given line number)\n"); } /***********************************************************************

1 0

Eric Pouech : dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form).
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 2d570921dc37a9cec36a9a1bf4e71205bf199c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d570921dc37a9cec36a9a1bf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:02 2011 +0100 dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form). --- dlls/dbghelp/symbol.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 07e62e2..78b0b2c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -220,6 +220,10 @@ static BOOL compile_file_regex(regex_t* re, const char* srcfile) *p++ = '\\'; *p++ = '.'; break; + case '*': + *p++ = '.'; + *p++ = '*'; + break; default: *p++ = *srcfile; break; @@ -2029,8 +2033,8 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (dli->is_source_file) { file = source_get(pair.effective, dli->u.source_file); - if (!match_regexp(&re, file)) file = ""; - strcpy(sci.FileName, file); + if (!match_regexp(&re, file)) sci.FileName[0] = '\0'; + else strcpy(sci.FileName, file); } else if (sci.FileName[0]) {

1 0

Nikolay Sivov : msxml3: Merge obsolete interfaces tests in a single file.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 1b1c4c014021a99811154bdb0caef1d862d699ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1c4c014021a99811154bdb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 00:39:24 2011 +0300 msxml3: Merge obsolete interfaces tests in a single file. --- dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmldoc.c | 534 ++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlelem.c | 598 ----------------------------------------- 3 files changed, 535 insertions(+), 600 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1c4c014021a99811154…

1 0

Henri Verbeet : winex11.drv: Allow disabling vertical sync using EXT_swap_control.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 727ecc17145b98e8cfcbc85cdb7a7a5374615b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727ecc17145b98e8cfcbc85cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:27 2011 +0100 winex11.drv: Allow disabling vertical sync using EXT_swap_control. EXT_swap_control redefines glXSwapIntervalSGI() as glXSwapIntervalEXT() on the current drawable (if any), and glXSwapIntervalEXT() supports disabling vsync. --- dlls/winex11.drv/opengl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4b56c3f..a9cc178 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -150,6 +150,7 @@ static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; static int use_render_texture_ati = 0; +static BOOL has_swap_control; static int swap_interval = 1; #define MAX_EXTENSIONS 16 @@ -3424,7 +3425,7 @@ static BOOL WINAPI X11DRV_wglSwapIntervalEXT(int interval) { SetLastError(ERROR_INVALID_DATA); return FALSE; } - else if (interval == 0) + else if (!has_swap_control && interval == 0) { /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a @@ -3738,6 +3739,9 @@ static void X11DRV_WineGL_LoadExtensions(void) if(glxRequireExtension("GLX_EXT_fbconfig_packed_float")) register_extension_string("WGL_EXT_pixel_format_packed_float"); + if (glxRequireExtension("GLX_EXT_swap_control")) + has_swap_control = TRUE; + /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) register_extension(&WGL_NV_vertex_array_range);

1 0

Henri Verbeet : ddraw: Just pass NULL as swapchain parent.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 015ad93d47d9b3ea281979f18f0600836442bde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015ad93d47d9b3ea281979f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:26 2011 +0100 ddraw: Just pass NULL as swapchain parent. The swapchain was the last place using IParent, so this allows us to kill IParent completely. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/ddraw.c | 24 +------- dlls/ddraw/ddraw_private.h | 45 --------------- dlls/ddraw/parent.c | 135 -------------------------------------------- 4 files changed, 4 insertions(+), 201 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 1d49e79..bc232f0 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -11,7 +11,6 @@ C_SRCS = \ main.c \ material.c \ palette.c \ - parent.c \ surface.c \ utils.c \ vertexbuffer.c \ diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e1d5c62..aeabe59 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2628,14 +2628,11 @@ static HRESULT ddraw_recreate_surfaces(IDirectDrawImpl *This) ddraw_recreate_surfaces_cb); } -ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) +ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *swapchain) { - IUnknown *swapChainParent; + TRACE("swapchain %p.\n", swapchain); - TRACE("swapchain %p.\n", pSwapChain); - - swapChainParent = IWineD3DSwapChain_GetParent(pSwapChain); - return IUnknown_Release(swapChainParent); + return IWineD3DSwapChain_Release(swapchain); } /***************************************************************************** @@ -5919,32 +5916,19 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); IDirectDrawSurfaceImpl *iterator; - IParentImpl *object; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IParentImpl)); - if (!object) - { - FIXME("Allocation of memory failed\n"); - *swapchain = NULL; - return DDERR_OUTOFVIDEOMEMORY; - } - - ddraw_parent_init(object); - hr = IWineD3DDevice_CreateSwapChain(This->wineD3DDevice, present_parameters, - This->ImplType, object, swapchain); + This->ImplType, NULL, swapchain); if (FAILED(hr)) { FIXME("(%p) CreateSwapChain failed, returning %#x\n", iface, hr); - HeapFree(GetProcessHeap(), 0 , object); *swapchain = NULL; return hr; } - object->child = (IUnknown *)*swapchain; This->d3d_target->wineD3DSwapChain = *swapchain; iterator = This->d3d_target->complex_array[0]; while (iterator) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7899deb..7df059f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -39,30 +39,6 @@ extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; -/***************************************************************************** - * IParent - a helper interface - *****************************************************************************/ -DEFINE_GUID(IID_IParent, 0xc20e4c88, 0x74e7, 0x4940, 0xba, 0x9f, 0x2e, 0x32, 0x3f, 0x9d, 0xc9, 0x81); -typedef struct IParent *LPPARENT, *PPARENT; - -#define INTERFACE IParent -DECLARE_INTERFACE_(IParent,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -}; -#undef INTERFACE - -#if !defined(__cplusplus) || defined(CINTERFACE) -/*** IUnknown methods ***/ -#define IParent_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IParent_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IParent_Release(p) (p)->lpVtbl->Release(p) -#endif - - /* Typdef the interfaces */ typedef struct IDirectDrawImpl IDirectDrawImpl; typedef struct IDirectDrawSurfaceImpl IDirectDrawSurfaceImpl; @@ -74,7 +50,6 @@ typedef struct IDirect3DViewportImpl IDirect3DViewportImpl; typedef struct IDirect3DMaterialImpl IDirect3DMaterialImpl; typedef struct IDirect3DExecuteBufferImpl IDirect3DExecuteBufferImpl; typedef struct IDirect3DVertexBufferImpl IDirect3DVertexBufferImpl; -typedef struct IParentImpl IParentImpl; /* Callbacks for implicit object destruction */ extern ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; @@ -270,26 +245,6 @@ static inline IDirectDrawSurfaceImpl *surface_from_surface3(IDirectDrawSurface3 #define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) #define GET_BPP(desc) PFGET_BPP(desc.ddpfPixelFormat) -/***************************************************************************** - * IParent Implementation - *****************************************************************************/ -struct IParentImpl -{ - /* IUnknown fields */ - const IParentVtbl *lpVtbl; - LONG ref; - - /* IParentImpl fields */ - IUnknown *child; - -}; - -void ddraw_parent_init(IParentImpl *parent) DECLSPEC_HIDDEN; - -/***************************************************************************** - * IDirect3DDevice implementation - *****************************************************************************/ - #define DDRAW_INVALID_HANDLE ~0U enum ddraw_handle_type diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c deleted file mode 100644 index 871f066..0000000 --- a/dlls/ddraw/parent.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * IParent implementation - * - * Copyright (c) 2006 Stefan Dösinger - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * A universal parent interface for everything in WineD3D that doesn't have - * a DDraw counterpart - */ - -#include "config.h" -#include "wine/port.h" - -#include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); - -/***************************************************************************** - * IUnknown methods - *****************************************************************************/ - -/***************************************************************************** - * IParent::Queryinterface - * - * It can't query any interfaces, and it's not used for anything. So - * it just returns E_NOINTERFACE - * - * Params: - * riid: guid of queried interface - * obj: returns a pointer to the interface - * - * Return values - * This implementation always returns E_NOINTERFACE and NULL - * - *****************************************************************************/ -static HRESULT WINAPI -IParentImpl_QueryInterface(IParent *iface, - REFIID riid, - void **obj) -{ - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); - - *obj = NULL; - if ( IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IParent, riid ) ) - { - *obj = iface; - IParent_AddRef(iface); - return DD_OK; - } - return E_NOINTERFACE; -} - -/***************************************************************************** - * IParent::AddRef - * - * Increases the refcount - * - * Params: - * - * Return values - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI -IParentImpl_AddRef(IParent *iface) -{ - IParentImpl *This = (IParentImpl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("%p increasing refcount to %u.\n", This, ref); - - return ref; -} - - -/***************************************************************************** - * IParent::Release - * - * Releases the refcount, and destroys the object if the refcount falls to 0 - * Also releases the child object, if destroyed. That's almost the whole sense - * of this interface. - * - * Params: - * - * Return values - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI IParentImpl_Release(IParent *iface) -{ - IParentImpl *This = (IParentImpl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("%p decreasing refcount to %u.\n", This, ref); - - if (ref == 0) - { - TRACE("(%p) Releasing child at %p\n", This, This->child); - if(This->child) - IUnknown_Release(This->child); - HeapFree(GetProcessHeap(), 0, This); - TRACE("Released\n"); - } - return ref; -} - -/***************************************************************************** - * The VTable - *****************************************************************************/ -static const struct IParentVtbl ddraw_parent_vtbl = -{ - IParentImpl_QueryInterface, - IParentImpl_AddRef, - IParentImpl_Release, -}; - -void ddraw_parent_init(IParentImpl *parent) -{ - parent->lpVtbl = &ddraw_parent_vtbl; - parent->ref = 1; -}

1 0

Henri Verbeet : wined3d: Don' t require container parents for IWineD3DDeviceParent methods to be COM objects .
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: b9fae5e9a8a142195aeb5dbe738101d0cd893d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fae5e9a8a142195aeb5dbe7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:25 2011 +0100 wined3d: Don't require container parents for IWineD3DDeviceParent methods to be COM objects. --- dlls/d3d10core/device.c | 18 +++++++++--------- dlls/d3d8/device.c | 26 +++++++++++++------------- dlls/d3d9/device.c | 28 ++++++++++++++-------------- dlls/ddraw/ddraw.c | 18 +++++++++--------- include/wine/wined3d.idl | 6 +++--- 5 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9fae5e9a8a142195aeb5…

1 0

Henri Verbeet : wined3d: Pass gl_info to volume_bind_and_dirtify().
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: aa420ced0e6483e0c622b150064d738ebbf14a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa420ced0e6483e0c622b1500… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:24 2011 +0100 wined3d: Pass gl_info to volume_bind_and_dirtify(). --- dlls/wined3d/volume.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 03bc5e6..e6f7687 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* Context activation is done by the caller. */ -static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume) +static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info; IWineD3DBaseTextureImpl *container = (IWineD3DBaseTextureImpl *)volume->container; DWORD active_sampler; @@ -102,7 +101,7 @@ void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) TRACE("volume %p, level %u, srgb %#x, format %s (%#x).\n", volume, level, srgb_mode, debug_d3dformat(format->id), format->id); - volume_bind_and_dirtify(volume); + volume_bind_and_dirtify(volume, gl_info); ENTER_GL(); GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, level, format->glInternal,

1 0

Thomas Mullaly : mshtml: Correctly forward IHTMLWindow's IHTMLDocument' s ConnectionPointContainer.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: a46e0c617b84226fba0fc70fd4030b20f91d9940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46e0c617b84226fba0fc70fd… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Feb 26 23:55:16 2011 -0500 mshtml: Correctly forward IHTMLWindow's IHTMLDocument's ConnectionPointContainer. --- dlls/mshtml/conpoint.c | 2 +- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/tests/events.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index df6c5cf..ca45524 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -266,7 +266,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo TRACE("(%p)->(%s %p)\n", This, debugstr_cp_guid(riid), ppCP); if(This->forward_container) - return IConnectionPointContainer_FindConnectionPoint(&This->IConnectionPointContainer_iface, + return IConnectionPointContainer_FindConnectionPoint(&This->forward_container->IConnectionPointContainer_iface, riid, ppCP); *ppCP = NULL; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d0d378f..a4fa1be 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -40,6 +40,8 @@ static struct list window_list = LIST_INIT(window_list); static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) { if(window->doc) { + if(window->doc_obj && window == window->doc_obj->basedoc.window) + window->doc->basedoc.cp_container.forward_container = NULL; abort_document_bindings(window->doc); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); @@ -2245,6 +2247,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_init(&window->script_hosts); window->task_magic = get_task_target_magic(); + *ret = window; update_window_doc(window); list_init(&window->children); @@ -2257,7 +2260,6 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_add_tail(&parent->children, &window->sibling_entry); } - *ret = window; return S_OK; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index b1d1423..bdb8460 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2407,7 +2407,7 @@ static void test_empty_document(void) cp = get_cp((IUnknown*)doc, &IID_IDispatch); hres = IConnectionPoint_Unadvise(cp, cookie); IConnectionPoint_Release(cp); - todo_wine ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); IHTMLDocument2_Release(windows_doc); }

1 0

Thomas Mullaly : mshtml/tests: Added more ConnectionPoint tests for IHTMLDocument.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 1571097ed354f70931daeb06c6f3f56d1f869f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1571097ed354f70931daeb06c… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Feb 26 23:14:59 2011 -0500 mshtml/tests: Added more ConnectionPoint tests for IHTMLDocument. --- dlls/mshtml/tests/events.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 65cf886..b1d1423 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -109,6 +109,9 @@ static const char img_doc_str[] = static const char input_doc_str[] = "<html><body><input id=\"inputid\"></input></body></html>"; +static const char iframe_doc_str[] = + "<html><body><iframe id=\"ifr\">Testing</iframe></body></html>"; + static const char form_doc_str[] = "<html><body><form id=\"formid\" method=\"post\" action=\"about:blank\">" "<input type=\"text\" value=\"test\" name=\"i\"/>" @@ -1717,6 +1720,77 @@ static void test_timeout(IHTMLDocument2 *doc) IHTMLWindow3_Release(win3); } +static IHTMLElement* find_element_by_id(IHTMLDocument2 *doc, const char *id) +{ + HRESULT hres; + IHTMLDocument3 *doc3; + IHTMLElement *result; + BSTR idW = a2bstr(id); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + + hres = IHTMLDocument3_getElementById(doc3, idW, &result); + ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + SysFreeString(idW); + + IHTMLDocument3_Release(doc3); + return result; +} + +static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) +{ + HRESULT hres; + IHTMLFrameBase2 *base; + IHTMLDocument2 *result = NULL; + + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); + ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); + if(hres == S_OK) { + IHTMLWindow2 *window; + + hres = IHTMLFrameBase2_get_contentWindow(base, &window); + ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(window != NULL, "window == NULL\n"); + if(window) { + hres = IHTMLWindow2_get_document(window, &result); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + IHTMLWindow2_Release(window); + } + } + if(base) IHTMLFrameBase2_Release(base); + + return result; +} + +static void test_iframe_connections(IHTMLDocument2 *doc) +{ + HRESULT hres; + IHTMLIFrameElement *iframe; + IHTMLDocument2 *iframes_doc; + DWORD cookie; + IConnectionPoint *cp; + IHTMLElement *element = find_element_by_id(doc, "ifr"); + + hres = IHTMLElement_QueryInterface(element, &IID_IHTMLIFrameElement, (void**)&iframe); + IHTMLElement_Release(element); + ok(hres == S_OK, "QueryInterface(IID_IHTMLIFrameElement) failed: %08x\n", hres); + + iframes_doc = get_iframe_doc(iframe); + IHTMLIFrameElement_Release(iframe); + + cookie = register_cp((IUnknown*)iframes_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); + + cp = get_cp((IUnknown*)doc, &IID_IDispatch); + hres = IConnectionPoint_Unadvise(cp, cookie); + IConnectionPoint_Release(cp); + ok(hres == CONNECT_E_NOCONNECTION, "Unadvise returned %08x, expected CONNECT_E_NOCONNECTION\n", hres); + + IHTMLDocument2_Release(iframes_doc); +} + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) @@ -2309,6 +2383,35 @@ static HWND create_container_window(void) 300, 300, NULL, NULL, NULL, NULL); } +static void test_empty_document(void) +{ + HRESULT hres; + IHTMLWindow2 *window; + IHTMLDocument2 *windows_doc, *doc; + IConnectionPoint *cp; + DWORD cookie; + + doc = create_document(); + if(!doc) + return; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_document(window, &windows_doc); + IHTMLWindow2_Release(window); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + cookie = register_cp((IUnknown*)windows_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); + + cp = get_cp((IUnknown*)doc, &IID_IDispatch); + hres = IConnectionPoint_Unadvise(cp, cookie); + IConnectionPoint_Release(cp); + todo_wine ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IHTMLDocument2_Release(windows_doc); +} + START_TEST(events) { CoInitialize(NULL); @@ -2323,6 +2426,9 @@ START_TEST(events) run_test(img_doc_str, test_imgload); run_test(input_doc_str, test_focus); run_test(form_doc_str, test_submit); + run_test(iframe_doc_str, test_iframe_connections); + + test_empty_document(); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Alexandre Julliard : server: Fix checking of X button flags when updating the input key state.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 0b8571e3dc348d3ca0bbd43dd9d4e0895c59e0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8571e3dc348d3ca0bbd43dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 23:48:03 2011 +0100 server: Fix checking of X button flags when updating the input key state. --- server/queue.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 97e0c4d..7d25afa 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1147,8 +1147,8 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_XBUTTONUP: - if (msg->wparam == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); - else if (msg->wparam == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); + if (msg->wparam >> 16 == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); + else if (msg->wparam >> 16 == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); break; case WM_KEYDOWN: case WM_SYSKEYDOWN:

1 0

Peter Schellenbach : oleaut32: Corrected registration flag inversion in RegisterActiveObject.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 99af2f56ba972f062acb389f802e417c8d310dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=99af2f56ba972f062acb389f8… Author: Peter Schellenbach <pjs(a)asent.com> Date: Thu Mar 3 17:03:40 2011 -0800 oleaut32: Corrected registration flag inversion in RegisterActiveObject. --- dlls/oleaut32/oleaut.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index ac2d666..f93339a 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -471,6 +471,7 @@ HRESULT WINAPI RegisterActiveObject( HRESULT ret; LPRUNNINGOBJECTTABLE runobtable; LPMONIKER moniker; + DWORD rot_flags = ROTFLAGS_REGISTRATIONKEEPSALIVE; /* default registration is strong */ StringFromGUID2(rcid,guidbuf,39); ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker); @@ -481,7 +482,9 @@ HRESULT WINAPI RegisterActiveObject( IMoniker_Release(moniker); return ret; } - ret = IRunningObjectTable_Register(runobtable,dwFlags,punk,moniker,pdwRegister); + if(dwFlags == ACTIVEOBJECT_WEAK) + rot_flags = 0; + ret = IRunningObjectTable_Register(runobtable,rot_flags,punk,moniker,pdwRegister); IRunningObjectTable_Release(runobtable); IMoniker_Release(moniker); return ret;

1 0

Alexandre Julliard : user32: Get rid of the RegisterClipboardFormat driver entry point.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 7879b8e349e2a8e81d684a78939865cbf758e00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7879b8e349e2a8e81d684a789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 17:05:32 2011 +0100 user32: Get rid of the RegisterClipboardFormat driver entry point. --- dlls/user32/clipboard.c | 18 ++++-------------- dlls/user32/driver.c | 13 ------------- dlls/user32/tests/clipboard.c | 3 +++ dlls/user32/user_private.h | 1 - dlls/winex11.drv/clipboard.c | 12 ------------ dlls/winex11.drv/winex11.drv.spec | 1 - 6 files changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 875a027..0985e6f 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -213,28 +213,18 @@ static HWND CLIPBOARD_SetClipboardViewer( HWND hWnd ) /************************************************************************** * RegisterClipboardFormatW (USER32.@) */ -UINT WINAPI RegisterClipboardFormatW(LPCWSTR FormatName) +UINT WINAPI RegisterClipboardFormatW( LPCWSTR name ) { - return USER_Driver->pRegisterClipboardFormat(FormatName); + return GlobalAddAtomW( name ); } /************************************************************************** * RegisterClipboardFormatA (USER32.@) */ -UINT WINAPI RegisterClipboardFormatA(LPCSTR formatName) +UINT WINAPI RegisterClipboardFormatA( LPCSTR name ) { - int len; - LPWSTR wFormat; - UINT ret; - - len = MultiByteToWideChar(CP_ACP, 0, formatName, -1, NULL, 0); - wFormat = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, formatName, -1, wFormat, len); - - ret = RegisterClipboardFormatW(wFormat); - HeapFree(GetProcessHeap(), 0, wFormat); - return ret; + return GlobalAddAtomA( name ); } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d40789c..d152f86 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -98,7 +98,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(CountClipboardFormats); GET_USER_FUNC(EnumClipboardFormats); GET_USER_FUNC(IsClipboardFormatAvailable); - GET_USER_FUNC(RegisterClipboardFormat); GET_USER_FUNC(EndClipboardUpdate); GET_USER_FUNC(ChangeDisplaySettingsEx); GET_USER_FUNC(EnumDisplayMonitors); @@ -279,11 +278,6 @@ static BOOL CDECL nulldrv_IsClipboardFormatAvailable( UINT format ) return FALSE; } -static UINT CDECL nulldrv_RegisterClipboardFormat( LPCWSTR name ) -{ - return 0; -} - static BOOL CDECL nulldrv_SetClipboardData( UINT format, HANDLE handle, BOOL owner ) { return FALSE; @@ -457,7 +451,6 @@ static USER_DRIVER null_driver = nulldrv_EnumClipboardFormats, nulldrv_GetClipboardData, nulldrv_IsClipboardFormatAvailable, - nulldrv_RegisterClipboardFormat, nulldrv_SetClipboardData, /* display modes */ nulldrv_ChangeDisplaySettingsEx, @@ -626,11 +619,6 @@ static BOOL CDECL loaderdrv_IsClipboardFormatAvailable( UINT format ) return load_driver()->pIsClipboardFormatAvailable( format ); } -static UINT CDECL loaderdrv_RegisterClipboardFormat( LPCWSTR name ) -{ - return load_driver()->pRegisterClipboardFormat( name ); -} - static BOOL CDECL loaderdrv_SetClipboardData( UINT format, HANDLE handle, BOOL owner ) { return load_driver()->pSetClipboardData( format, handle, owner ); @@ -798,7 +786,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_EnumClipboardFormats, loaderdrv_GetClipboardData, loaderdrv_IsClipboardFormatAvailable, - loaderdrv_RegisterClipboardFormat, loaderdrv_SetClipboardData, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c461df4..158ff3f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -183,6 +183,9 @@ todo_wine ok(!EmptyClipboard(), "EmptyClipboard should fail if clipboard wasn't open\n"); ok(GetLastError() == ERROR_CLIPBOARD_NOT_OPEN || broken(GetLastError() == 0xdeadbeef), /* wow64 */ "Wrong error %u\n", GetLastError()); + + format_id = RegisterClipboardFormatA("#1234"); + ok(format_id == 1234, "invalid clipboard format id %04x\n", format_id); } static HGLOBAL create_text(void) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f7b79b3..6d668ba 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -82,7 +82,6 @@ typedef struct tagUSER_DRIVER { UINT (CDECL *pEnumClipboardFormats)(UINT); /* Enumerate clipboard formats */ HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */ BOOL (CDECL *pIsClipboardFormatAvailable)(UINT); /* Check if specified format is available */ - UINT (CDECL *pRegisterClipboardFormat)(LPCWSTR); /* Register a clipboard format */ BOOL (CDECL *pSetClipboardData)(UINT, HANDLE, BOOL); /* Set specified selection data */ /* display modes */ LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 225c23c..0899815 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2481,18 +2481,6 @@ static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void) **************************************************************************/ -/************************************************************************** - * RegisterClipboardFormat (X11DRV.@) - * - * Registers a custom X clipboard format - * Returns: Format id or 0 on failure - */ -UINT CDECL X11DRV_RegisterClipboardFormat(LPCWSTR FormatName) -{ - return GlobalAddAtomW( FormatName ); -} - - static void selection_acquire(void) { Window owner; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index cc5cf43..c4a7672 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -94,7 +94,6 @@ @ cdecl GetDC(long long long ptr ptr long) X11DRV_GetDC @ cdecl IsClipboardFormatAvailable(long) X11DRV_IsClipboardFormatAvailable @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) X11DRV_MsgWaitForMultipleObjectsEx -@ cdecl RegisterClipboardFormat(wstr) X11DRV_RegisterClipboardFormat @ cdecl ReleaseDC(long long) X11DRV_ReleaseDC @ cdecl ScrollDC(long long long ptr ptr long ptr) X11DRV_ScrollDC @ cdecl SetClipboardData(long long long) X11DRV_SetClipboardData

1 0

Alexandre Julliard : winex11: Register clipboard formats only once they are actually used.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 59fb0ad174de1a37bab218ace163f717adf809ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=59fb0ad174de1a37bab218ace… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 17:02:21 2011 +0100 winex11: Register clipboard formats only once they are actually used. --- dlls/winex11.drv/clipboard.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2789724..225c23c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -336,11 +336,11 @@ void X11DRV_InitClipboard(void) /* Register known mapping between window formats and X properties */ for (i = 0; i < sizeof(PropertyFormatMap)/sizeof(PropertyFormatMap[0]); i++) - X11DRV_CLIPBOARD_InsertClipboardFormat( GlobalAddAtomW(PropertyFormatMap[i].lpszFormat), + X11DRV_CLIPBOARD_InsertClipboardFormat( RegisterClipboardFormatW(PropertyFormatMap[i].lpszFormat), GET_ATOM(PropertyFormatMap[i].prop)); /* Set up a conversion function from "HTML Format" to "text/html" */ - format = X11DRV_CLIPBOARD_InsertClipboardFormat( GlobalAddAtomW(wszHTMLFormat), + format = X11DRV_CLIPBOARD_InsertClipboardFormat( RegisterClipboardFormatW(wszHTMLFormat), GET_ATOM(XATOM_text_html)); format->lpDrvExportFunc = X11DRV_CLIPBOARD_ExportTextHtml; } @@ -552,6 +552,9 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE hData, D TRACE("format=%04x lpData=%p hData=%p flags=0x%08x lpFormat=%p override=%d\n", wFormatID, lpData, hData, flags, lpFormat, override); + /* make sure the format exists */ + if (!lpFormat) register_format( wFormatID, 0 ); + if (lpData && !override) return TRUE; @@ -1945,7 +1948,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p wname = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); MultiByteToWideChar(CP_UNIXCP, 0, names[i], -1, wname, len); - lpFormat = register_format( GlobalAddAtomW(wname), atoms[i] ); + lpFormat = register_format( RegisterClipboardFormatW(wname), atoms[i] ); HeapFree(GetProcessHeap(), 0, wname); if (!lpFormat) { @@ -2486,11 +2489,7 @@ static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void) */ UINT CDECL X11DRV_RegisterClipboardFormat(LPCWSTR FormatName) { - UINT id = GlobalAddAtomW( FormatName ); - - if (!id) return 0; - if (!register_format( id, 0 )) return 0; - return id; + return GlobalAddAtomW( FormatName ); }

1 0

Alexandre Julliard : winex11: Remove the unused clipboard format flags.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: c7d2a4dddf0ead2f0f23ddd1924d81d3e93430f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d2a4dddf0ead2f0f23ddd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 16:59:39 2011 +0100 winex11: Remove the unused clipboard format flags. --- dlls/winex11.drv/clipboard.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 1a3704d..2789724 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -114,7 +114,6 @@ typedef struct tagWINE_CLIPFORMAT { struct list entry; UINT wFormatID; UINT drvData; - UINT wFlags; DRVIMPORTFUNC lpDrvImportFunc; DRVEXPORTFUNC lpDrvExportFunc; } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; @@ -128,10 +127,8 @@ typedef struct tagWINE_CLIPDATA { LPWINE_CLIPFORMAT lpFormat; } WINE_CLIPDATA, *LPWINE_CLIPDATA; -#define CF_FLAG_BUILTINFMT 0x0001 /* Built-in windows format */ -#define CF_FLAG_UNOWNED 0x0002 /* cached data is not owned */ -#define CF_FLAG_SYNTHESIZED 0x0004 /* Implicitly converted data */ -#define CF_FLAG_UNICODE 0x0008 /* Data is in unicode */ +#define CF_FLAG_UNOWNED 0x0001 /* cached data is not owned */ +#define CF_FLAG_SYNTHESIZED 0x0002 /* Implicitly converted data */ static int selectionAcquired = 0; /* Contains the current selection masks */ static Window selectionWindow = None; /* The top level X window which owns the selection */ @@ -332,7 +329,6 @@ void X11DRV_InitClipboard(void) if (!(format = HeapAlloc( GetProcessHeap(), 0, sizeof(*format )))) break; format->wFormatID = builtin_formats[i].id; format->drvData = GET_ATOM(builtin_formats[i].data); - format->wFlags = CF_FLAG_BUILTINFMT; format->lpDrvImportFunc = builtin_formats[i].import; format->lpDrvExportFunc = builtin_formats[i].export; list_add_tail( &format_list, &format->entry ); @@ -410,8 +406,7 @@ static WINE_CLIPFORMAT *register_format( UINT id, Atom prop ) /* walk format chain to see if it's already registered */ LIST_FOR_EACH_ENTRY( lpFormat, &format_list, WINE_CLIPFORMAT, entry ) - if ((lpFormat->wFormatID == id) && (lpFormat->wFlags & CF_FLAG_BUILTINFMT) == 0) - return lpFormat; + if (lpFormat->wFormatID == id) return lpFormat; return X11DRV_CLIPBOARD_InsertClipboardFormat(id, prop); } @@ -469,7 +464,6 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr WARN("No more memory for a new format!\n"); return NULL; } - lpNewFormat->wFlags = 0; lpNewFormat->wFormatID = id; lpNewFormat->drvData = prop; lpNewFormat->lpDrvImportFunc = X11DRV_CLIPBOARD_ImportClipboardData;

1 0

Alexandre Julliard : winex11: Don' t unmap off-screen windows on PropertyNotify events.
by Alexandre Julliard 07 Mar '11

07 Mar '11

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 07 Mar '11

07 Mar '11

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

Erich Hoover : winex11: Use GetCursorFrameInfo to obtain animated frame delay.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 2a026493415771e0560f26cb2e12518ffe1dc876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a026493415771e0560f26cb2… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Mar 5 22:42:31 2011 -0700 winex11: Use GetCursorFrameInfo to obtain animated frame delay. --- dlls/winex11.drv/mouse.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7778203..a527a2e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -296,6 +296,7 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA int width, int height, int istep ) { XcursorImage *image, *ret = NULL; + DWORD delay_jiffies, is_static; int x, y, i, has_alpha; XcursorPixel *ptr; @@ -310,7 +311,13 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA image->xhot = iinfo->xHotspot; image->yhot = iinfo->yHotspot; - image->delay = 100; /* TODO: find a way to get the proper delay */ + + /* TODO: Handle animated cursors that use multiple rates */ + image->delay = 100; /* fallback delay, 100 ms */ + if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0 /* obtain first rate */, &delay_jiffies, &is_static) != 0) + image->delay = (100 * delay_jiffies) / 6; /* convert jiffies (1/60s) to milliseconds */ + else + WARN("Failed to retrieve animated cursor framerate.\n"); /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ memset( color_bits, 0x00, color_size );

1 0

Erich Hoover : user32: Implement semi-stub of GetCursorFrameInfo.
by Alexandre Julliard 07 Mar '11

07 Mar '11

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

Erich Hoover : user32: Permit loading animated cursors with CreateIconFromResource(Ex).
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 7b0ab606e24159e76dec0b309513c18dca4f52df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0ab606e24159e76dec0b309… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Mar 5 22:34:15 2011 -0700 user32: Permit loading animated cursors with CreateIconFromResource(Ex). --- dlls/user32/cursoricon.c | 4 + dlls/user32/tests/cursoricon.c | 160 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 0 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index cd7d3ed..1139256 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1120,6 +1120,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, return 0; } + /* Check if the resource is an animated icon/cursor */ + if (!memcmp(bits, "RIFF", 4)) + return CURSORICON_CreateIconFromANI( bits, cbSize, width, height, 0 /* default depth */, cFlag ); + if (bIcon) { hotspot.x = width / 2; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index da748b6..8d6ceb7 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -54,6 +54,135 @@ typedef struct CURSORICONFILEDIRENTRY idEntries[1]; } CURSORICONFILEDIR; +#define RIFF_FOURCC( c0, c1, c2, c3 ) \ + ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ + ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) + +#define ANI_RIFF_ID RIFF_FOURCC('R', 'I', 'F', 'F') +#define ANI_LIST_ID RIFF_FOURCC('L', 'I', 'S', 'T') +#define ANI_ACON_ID RIFF_FOURCC('A', 'C', 'O', 'N') +#define ANI_anih_ID RIFF_FOURCC('a', 'n', 'i', 'h') +#define ANI_seq__ID RIFF_FOURCC('s', 'e', 'q', ' ') +#define ANI_fram_ID RIFF_FOURCC('f', 'r', 'a', 'm') +#define ANI_icon_ID RIFF_FOURCC('i', 'c', 'o', 'n') + +#define ANI_FLAG_ICON 0x1 +#define ANI_FLAG_SEQUENCE 0x2 + +typedef struct { + DWORD header_size; + DWORD num_frames; + DWORD num_steps; + DWORD width; + DWORD height; + DWORD bpp; + DWORD num_planes; + DWORD display_rate; + DWORD flags; +} ani_header; + +typedef struct { + BYTE data[32*32*4]; +} ani_data32x32x32; + +typedef struct { + CURSORICONFILEDIR icon_info; /* animated cursor frame information */ + BITMAPINFOHEADER bmi_header; /* animated cursor frame header */ + ani_data32x32x32 bmi_data; /* animated cursor frame DIB data */ +} ani_frame32x32x32; + +typedef struct { + DWORD chunk_id; /* ANI_anih_ID */ + DWORD chunk_size; /* actual size of data */ + ani_header header; /* animated cursor header */ +} riff_header_t; + +typedef struct { + DWORD chunk_id; /* ANI_LIST_ID */ + DWORD chunk_size; /* actual size of data */ + DWORD chunk_type; /* ANI_fram_ID */ +} riff_list_t; + +typedef struct { + DWORD chunk_id; /* ANI_icon_ID */ + DWORD chunk_size; /* actual size of data */ + ani_frame32x32x32 data; /* animated cursor frame */ +} riff_icon32x32x32_t; + +typedef struct { + DWORD chunk_id; /* ANI_RIFF_ID */ + DWORD chunk_size; /* actual size of data */ + DWORD chunk_type; /* ANI_ACON_ID */ + riff_header_t header; /* RIFF animated cursor header */ + riff_list_t frame_list; /* RIFF animated cursor frame list info */ + riff_icon32x32x32_t frames[1]; /* array of animated cursor frames */ +} riff_cursor_t; + +riff_cursor_t empty_anicursor = { + ANI_RIFF_ID, + sizeof(empty_anicursor) - sizeof(DWORD)*2, + ANI_ACON_ID, + { + ANI_anih_ID, + sizeof(ani_header), + { + sizeof(ani_header), + 1, /* frames */ + 1, /* steps */ + 32, /* width */ + 32, /* height */ + 32, /* depth */ + 1, /* planes */ + 10, /* display rate in jiffies */ + ANI_FLAG_ICON /* flags */ + } + }, + { + ANI_LIST_ID, + sizeof(riff_icon32x32x32_t)*1 + sizeof(DWORD), + ANI_fram_ID, + }, + { + { + ANI_icon_ID, + sizeof(ani_frame32x32x32), + { + { + 0x0, /* reserved */ + 0, /* type: icon(1), cursor(2) */ + 1, /* count */ + { + { + 32, /* width */ + 32, /* height */ + 0, /* color count */ + 0x0, /* reserved */ + 16, /* x hotspot */ + 16, /* y hotspot */ + sizeof(ani_data32x32x32), /* DIB size */ + sizeof(CURSORICONFILEDIR) /* DIB offset */ + } + } + }, + { + sizeof(BITMAPINFOHEADER), /* structure for DIB-type data */ + 32, /* width */ + 32*2, /* actual height times two */ + 1, /* planes */ + 32, /* bpp */ + BI_RGB, /* compression */ + 0, /* image size */ + 0, /* biXPelsPerMeter */ + 0, /* biYPelsPerMeter */ + 0, /* biClrUsed */ + 0 /* biClrImportant */ + }, + { /* DIB data: left uninitialized */ } + } + } + } +}; + #include "poppack.h" static char **test_argv; @@ -1129,6 +1258,37 @@ static void test_CreateIconFromResource(void) * ok(handle == NULL, "Invalid pointer accepted (%p)\n", handle); */ HeapFree(GetProcessHeap(), 0, hotspot); + + /* Test creating an animated cursor. */ + empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ + empty_anicursor.frames[0].data.icon_info.idEntries[0].xHotspot = 3; + empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; + handle = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); + ok(handle != NULL, "Create cursor failed.\n"); + + /* Test the animated cursor's information. */ + SetLastError(0xdeadbeef); + ret = GetIconInfo(handle, &icon_info); + ok(ret, "GetIconInfo() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + if (ret) + { + ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); + ok(icon_info.xHotspot == 3, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == 3, "yHotspot is %u.\n", icon_info.yHotspot); + ok(icon_info.hbmColor != NULL || broken(!icon_info.hbmColor) /* no color cursor support */, + "No hbmColor!\n"); + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); + } + + /* Clean up. */ + SetLastError(0xdeadbeef); + ret = DestroyCursor(handle); + ok(ret, "DestroyCursor() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); } static HICON create_test_icon(HDC hdc, int width, int height, int bpp,

1 0

Akihiro Sagawa : regedit: Export a decent newline in Unicode format.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 3c6de3b3485e8ee3a622ef990c5b9042ad28e237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6de3b3485e8ee3a622ef990… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 4 23:00:51 2011 +0900 regedit: Export a decent newline in Unicode format. --- programs/regedit/regproc.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f753947..841ab79 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -23,6 +23,8 @@ #include <limits.h> #include <stdio.h> +#include <fcntl.h> +#include <io.h> #include <windows.h> #include <winnt.h> #include <winreg.h> @@ -987,9 +989,9 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD const WCHAR *hex_prefix; const WCHAR hex[] = {'h','e','x',':',0}; WCHAR hex_buf[17]; - const WCHAR concat[] = {'\\','\n',' ',' ',0}; + const WCHAR concat[] = {'\\','\r','\n',' ',' ',0}; DWORD concat_prefix, concat_len; - const WCHAR newline[] = {'\n',0}; + const WCHAR newline[] = {'\r','\n',0}; CHAR* value_multibyte = NULL; if (type == REG_BINARY) { @@ -1098,7 +1100,7 @@ static void export_hkey(FILE *file, HKEY key, DWORD i; BOOL more_data; LONG ret; - WCHAR key_format[] = {'\n','[','%','s',']','\n',0}; + WCHAR key_format[] = {'\r','\n','[','%','s',']','\r','\n',0}; /* get size information and resize the buffers if necessary */ if (RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, @@ -1168,7 +1170,7 @@ static void export_hkey(FILE *file, HKEY key, REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); } else { const WCHAR start[] = {'"',0}; - const WCHAR end[] = {'"','\n',0}; + const WCHAR end[] = {'"','\r','\n',0}; DWORD len; len = lstrlenW(start); @@ -1189,7 +1191,7 @@ static void export_hkey(FILE *file, HKEY key, case REG_DWORD: { - WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\n',0}; + WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\r','\n',0}; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + 15); sprintfW(*line_buf + line_len, format, *((DWORD *)*val_buf)); @@ -1254,19 +1256,20 @@ static void export_hkey(FILE *file, HKEY key, } /****************************************************************************** - * Open file for export. + * Open file in binary mode for export. */ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) { FILE *file; WCHAR dash = '-'; - if (strncmpW(file_name,&dash,1)==0) + if (strncmpW(file_name,&dash,1)==0) { file=stdout; - else + _setmode(_fileno(file), _O_BINARY); + } else { CHAR* file_nameA = GetMultiByteString(file_name); - file = fopen(file_nameA, "w"); + file = fopen(file_nameA, "wb"); if (!file) { perror(""); fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_nameA); @@ -1278,12 +1281,12 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if(unicode) { const BYTE unicode_seq[] = {0xff,0xfe}; - const WCHAR header[] = {'W','i','n','d','o','w','s',' ','R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s','i','o','n',' ','5','.','0','0','\n'}; + const WCHAR header[] = {'W','i','n','d','o','w','s',' ','R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n'}; fwrite(unicode_seq, sizeof(BYTE), sizeof(unicode_seq)/sizeof(unicode_seq[0]), file); fwrite(header, sizeof(WCHAR), sizeof(header)/sizeof(header[0]), file); } else { - fputs("REGEDIT4\n", file); + fputs("REGEDIT4\r\n", file); } return file;

1 0

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

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