wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

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>

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> + Die Entwicklungsversion 1.3.15 von Wine ist jetzt verfügbar. + <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> +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. +</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> + Wydanie rozwojowe Wine 1.3.2 jest już dostępne. + <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> +Ź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>. +</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> + Wydanie rozwojowe Wine 1.3.15 jest już dostępne. + <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> +Ź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>. +</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

← Newer
1
...
63
64
65
66
67
68
69
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011