January 2010 - Wine-commits

Jacek Caban : mshtml: Don' t try to wrap necko channel in nsChannel implementation.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: d60ebb308f408157b9219b091f5e592eeb6a5991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60ebb308f408157b9219b091… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:38:20 2010 +0100 mshtml: Don't try to wrap necko channel in nsChannel implementation. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsio.c | 124 +++++------------------------------------- 2 files changed, 14 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d60ebb308f408157b9219…

1 0

Jacek Caban : mshtml: Use nsIDocShell to load a page in set_moniker.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 2e6353d4bc6ffbac0d226d1f932c586c4dda9d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6353d4bc6ffbac0d226d1f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:38:57 2010 +0100 mshtml: Use nsIDocShell to load a page in set_moniker. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 59 ++++++++++++++++++++++------------------- dlls/mshtml/nsembed.c | 23 +--------------- dlls/mshtml/nsiface.idl | 6 +++- dlls/mshtml/nsio.c | 48 +++++++++++++++++++++++++++------- dlls/mshtml/persist.c | 33 ++++++++++------------- 6 files changed, 92 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e6353d4bc6ffbac0d226…

1 0

Jacek Caban : mshtml: Store body event target in HTMLDocumentNode.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: e4a936a2d2f81d027945c787861e786578300928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a936a2d2f81d027945c7878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:39:31 2010 +0100 mshtml: Store body event target in HTMLDocumentNode. --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 10 ---------- dlls/mshtml/htmlwindow.c | 29 ++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 2 +- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 1aa7313..7f22a4e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -783,8 +783,8 @@ static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) { HTMLBodyElement *This = HTMLBODY_NODE_THIS(iface); - return This->textcont.element.node.doc && This->textcont.element.node.doc->basedoc.window - ? &This->textcont.element.node.doc->basedoc.window->event_target + return This->textcont.element.node.doc + ? &This->textcont.element.node.doc->body_event_target : &This->textcont.element.node.event_target; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54d3ca3..ac67a84 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1842,6 +1842,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + if(This->body_event_target) + release_event_target(This->body_event_target); if(This->nsevent_listener) release_nsevents(This); if(This->catmgr) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2e2f1c9..d04b2e6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -934,7 +934,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM } } - call_event_handlers(doc, event_obj, doc->basedoc.doc_node->node.event_target, &doc->basedoc.cp_container, eid, + call_event_handlers(doc, event_obj, doc->node.event_target, &doc->basedoc.cp_container, eid, (IDispatch*)HTMLDOC(&doc->basedoc)); break; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index a0fb198..1a8572f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -74,13 +74,3 @@ static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *v { return get_node_event(&doc->doc_node->node, eid, var); } - -static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) -{ - return set_event_handler(&window->event_target, window->doc, eid, var); -} - -static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) -{ - return get_event_handler(&window->event_target, eid, var); -} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6db3148..4a2babe 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -117,6 +117,26 @@ static HRESULT get_location(HTMLWindow *This, HTMLLocation **ret) return S_OK; } +static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + if(!window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return set_event_handler(&window->doc->body_event_target, window->doc, eid, var); +} + +static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + if(!window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return get_event_handler(&window->doc->body_event_target, eid, var); +} + #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) @@ -206,8 +226,6 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) if(This->screen) IHTMLScreen_Release(This->screen); - if(This->event_target) - release_event_target(This->event_target); for(i=0; i < This->global_prop_cnt; i++) heap_free(This->global_props[i].name); @@ -1391,7 +1409,12 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->event_target, &This->doc_obj->basedoc, event, pDisp, pfResult); + if(!This->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return attach_event(&This->doc->body_event_target, &This->doc->basedoc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 491bc2a..68b3393 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -242,7 +242,6 @@ struct HTMLWindow { IMoniker *mon; LPOLESTR url; - event_target_t *event_target; IHTMLEventObj *event; SCRIPTMODE scriptmode; @@ -531,6 +530,7 @@ struct HTMLDocumentNode { nsIDOMHTMLDocument *nsdoc; HTMLDOMNode *nodes; BOOL content_ready; + event_target_t *body_event_target; IInternetSecurityManager *secmgr; ICatInformation *catmgr;

1 0

William Waghorn : wined3d: Added NVidia GT240 detection.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 0c582dca3adccc83a34727c0d8979989bd25fbb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c582dca3adccc83a34727c0d… Author: William Waghorn <willw(a)litany.me.uk> Date: Wed Dec 30 18:54:30 2009 -0800 wined3d: Added NVidia GT240 detection. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f9bc752..487b435 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -954,6 +954,7 @@ static const struct driver_version_information driver_version_table[] = {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 8618 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 8618 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 8618 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 14, 10, 6764 }, @@ -1222,6 +1223,12 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * *vidmem = 1024; return CARD_NVIDIA_GEFORCE_GTX260; } + /* Geforce 200 - midend */ + if (strstr(gl_renderer, "GT 240")) + { + *vidmem = 512; + return CARD_NVIDIA_GEFORCE_GT240; + } /* Geforce9 - highend / Geforce 200 - midend (GTS 150/250 are based on the same core) */ if (strstr(gl_renderer, "9800") diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47b89c9..361967b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1313,6 +1313,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Vincent Povirk : gdiplus: Fix a memory leak in GdipCreateMetafileFromWmf.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 01b32951a55eae139e939af96b6b7a6c18cceba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b32951a55eae139e939af96… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 31 16:15:37 2009 -0600 gdiplus: Fix a memory leak in GdipCreateMetafileFromWmf. --- dlls/gdiplus/graphics.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 563e43a..a4f1158 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1217,7 +1217,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, UINT read; BYTE* copy; HENHMETAFILE hemf; - GpStatus retval = GenericError; + GpStatus retval = Ok; TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile); @@ -1242,6 +1242,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ ERR("could not make stream\n"); GdipFree(copy); + retval = GenericError; goto err; } @@ -1253,7 +1254,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, (LPVOID*) &((*metafile)->image.picture)) != S_OK) + { + retval = GenericError; goto err; + } (*metafile)->image.type = ImageTypeMetafile; @@ -1277,10 +1281,9 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, TRACE("<-- %p\n", *metafile); - return Ok; - err: - GdipFree(*metafile); + if (retval != Ok) + GdipFree(*metafile); IStream_Release(stream); return retval; }

1 0

Andrew Eikum : hlink: Fix copy-paste typo.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 9b164cf6f405385795de1d910ff3b66ac7c233f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b164cf6f405385795de1d910… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 31 16:37:27 2009 -0600 hlink: Fix copy-paste typo. --- dlls/hlink/hlink_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index f6c4184..1a15c08 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -126,7 +126,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, /*********************************************************************** - * HlinkNavigate (HLINK.@) + * HlinkCreateBrowseContext (HLINK.@) */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) {

1 0

Andrew Eikum : hlink/tests: Fix some memory leaks (valgrind).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 4fec073d49ccd2534c04c30e01517410fc138941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fec073d49ccd2534c04c30e0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 31 16:37:30 2009 -0600 hlink/tests: Fix some memory leaks (valgrind). --- dlls/hlink/tests/browse_ctx.c | 3 +++ dlls/hlink/tests/hlink.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 483f604..a9b26e7 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -70,6 +70,9 @@ static void test_SetInitialHlink(void) ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); + CoTaskMemFree(exp_name); + CoTaskMemFree(found_name); + IBindCtx_Release(bindctx); IMoniker_Release(found_moniker); IHlink_Release(found_hlink); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 6a67f59..1802196 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1138,6 +1138,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, HLINKSETF_LOCATION, one, two); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1146,6 +1148,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -HLINKSETF_LOCATION, two, one); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1154,6 +1158,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test setting/getting target */ hres = IHlink_SetStringReference(link, HLINKSETF_TARGET, two, three); @@ -1163,6 +1169,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, two), "Found target should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -HLINKSETF_TARGET, three, two); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1171,6 +1179,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test setting/getting both */ hres = IHlink_SetStringReference(link, HLINKSETF_TARGET | HLINKSETF_LOCATION, one, two); @@ -1180,6 +1190,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, one), "Found target should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -(HLINKSETF_TARGET | HLINKSETF_LOCATION), three, one); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1188,6 +1200,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test invalid flags/params */ hres = IHlink_GetStringReference(link, 4, &fnd_tgt, &fnd_loc); @@ -1195,14 +1209,20 @@ static void test_HlinkGetSetStringReference(void) "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(fnd_loc == NULL, "Found location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_GetStringReference(link, -1, &fnd_tgt, &fnd_loc); todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_GetStringReference(link, -2, &fnd_tgt, &fnd_loc); ok(hres == E_INVALIDARG, "IHlink_GetStringReference should have failed " "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, 4, NULL, NULL); ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres);

1 0

Nikolay Sivov : comdlg32/tests: Free global blocks after PrintDlg() with PD_RETURNDEFAULT.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: d7b7f783ab8af0d717c7968a331233917e4c11b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b7f783ab8af0d717c7968a3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 1 18:50:45 2010 +0300 comdlg32/tests: Free global blocks after PrintDlg() with PD_RETURNDEFAULT. --- dlls/comdlg32/tests/printdlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 4e189ee..61eefa6 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -323,6 +323,8 @@ static void test_abort_proc(void) ok(DeleteFileA(filename), "Failed to delete temporary file\n"); return; } + GlobalFree(pd.hDevMode); + GlobalFree(pd.hDevNames); ok(pd.hDC != NULL, "PrintDlg didn't return a DC.\n"); if (!(print_dc = pd.hDC))

1 0

André Hentschel : comctl32: Improve German translation .
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 9d9c4061f9775cf6f2746dc98ee1a9d5975280bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9c4061f9775cf6f2746dc98… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 1 18:27:59 2010 +0100 comctl32: Improve German translation. --- dlls/comctl32/comctl_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc index 4a94f23..87730c8 100644 --- a/dlls/comctl32/comctl_De.rc +++ b/dlls/comctl32/comctl_De.rc @@ -63,7 +63,7 @@ FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Fertig", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14 PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

1 0

Vincent Povirk : ole32: Remove fixme for transacted mode.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 0debd2fef4c7bb9778d14d77faf9062bb8828c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0debd2fef4c7bb9778d14d77f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Jan 3 11:29:42 2010 -0600 ole32: Remove fixme for transacted mode. --- dlls/ole32/storage32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e000535..0e78a6d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6355,9 +6355,6 @@ HRESULT WINAPI StgCreateDocfile( if (STGM_SHARE_MODE(grfMode) && !(grfMode & STGM_SHARE_DENY_NONE)) FIXME("Storage share mode not implemented.\n"); - if (grfMode & STGM_TRANSACTED) - FIXME("Transacted mode not implemented.\n"); - *ppstgOpen = 0; hFile = CreateFileW(pwcsName,

1 0