January 2012 - Wine-Commits

Dmitry Timoshkov : winex11.drv: Use dialog window type also for owned windows with WS_EX_DLGMODALFRAME style set .
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: c0cf49d50c3c7e18f0d39ada3f6679f8a6b08b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cf49d50c3c7e18f0d39ada3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 19 18:28:00 2012 +0800 winex11.drv: Use dialog window type also for owned windows with WS_EX_DLGMODALFRAME style set. --- 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 e6affcb..48ba000 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1197,7 +1197,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for * dialogs owned by fullscreen windows. */ - if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + if (((style & WS_POPUP) || (ex_style & WS_EX_DLGMODALFRAME)) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE),

1 0

Austin English : ntoskrnl.exe: Add a stub for IoCreateSynchronizationEvent.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: a4ee9f2d20f10792c9c01e5fa8ce3928a44125c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee9f2d20f10792c9c01e5fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 02:36:43 2012 -0600 ntoskrnl.exe: Add a stub for IoCreateSynchronizationEvent. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4dbab40..89f5b17 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1751,3 +1751,12 @@ BOOLEAN WINAPI Ke386SetIoAccessMap(ULONG flag, PVOID buffer) FIXME("(%d %p) stub\n", flag, buffer); return FALSE; } + +/***************************************************** + * IoCreateSynchronizationEvent (NTOSKRNL.EXE.@) + */ +PKEVENT WINAPI IoCreateSynchronizationEvent(PUNICODE_STRING name, PHANDLE handle) +{ + FIXME("(%p %p) stub\n", name, handle); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2982d8b..da3d38e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -346,7 +346,7 @@ @ stub IoCreateStreamFileObjectEx @ stub IoCreateStreamFileObjectLite @ stdcall IoCreateSymbolicLink(ptr ptr) -@ stub IoCreateSynchronizationEvent +@ stdcall IoCreateSynchronizationEvent(ptr ptr) @ stub IoCreateUnprotectedSymbolicLink @ stub IoCsqInitialize @ stub IoCsqInsertIrp

1 0

Jacek Caban : mshtml: Added IOleContainer::EnumObjects tests.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 882d126dbaed7cd1a3d698e17a15d35cb339f7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882d126dbaed7cd1a3d698e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:51 2012 +0100 mshtml: Added IOleContainer::EnumObjects tests. --- dlls/mshtml/tests/htmldoc.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0fb115a..a79e50e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6184,6 +6184,35 @@ static void test_external(IHTMLDocument2 *doc, BOOL initialized) IHTMLWindow2_Release(htmlwin); } +static void test_enum_objects(IOleContainer *container) +{ + IEnumUnknown *enum_unknown; + IUnknown *buf[100] = {(void*)0xdeadbeef}; + ULONG fetched; + HRESULT hres; + + enum_unknown = NULL; + hres = IOleContainer_EnumObjects(container, OLECONTF_EMBEDDINGS, &enum_unknown); + ok(hres == S_OK, "EnumObjects failed: %08x\n", hres); + ok(enum_unknown != NULL, "enum_unknown == NULL\n"); + + fetched = 0xdeadbeef; + hres = IEnumUnknown_Next(enum_unknown, sizeof(buf)/sizeof(*buf), buf, &fetched); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + ok(buf[0] == (void*)0xdeadbeef, "buf[0] = %p\n", buf[0]); + + fetched = 0xdeadbeef; + hres = IEnumUnknown_Next(enum_unknown, 1, buf, &fetched); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + hres = IEnumUnknown_Next(enum_unknown, 1, buf, NULL); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + + IEnumUnknown_Release(enum_unknown); +} + static void test_target_container(IHTMLDocument2 *doc) { IOleContainer *ole_container, *doc_ole_container; @@ -6201,6 +6230,7 @@ static void test_target_container(IHTMLDocument2 *doc) ok(hres == S_OK, "GetFramesContainer failed: %08x\n", hres); ok(ole_container != NULL, "ole_container == NULL\n"); ok(iface_cmp((IUnknown*)ole_container, (IUnknown*)doc_ole_container), "ole_container != doc_ole_container\n"); + test_enum_objects(ole_container); IOleContainer_Release(ole_container); ITargetContainer_Release(target_container);

1 0

Jacek Caban : mshtml: Added IOleContainer::EnumObjects implementation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 3b80784b63f4ad72f077c44a79b6b8b3bd1b1b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b80784b63f4ad72f077c44a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:37 2012 +0100 mshtml: Added IOleContainer::EnumObjects implementation. --- dlls/mshtml/oleobj.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9f3d75a..261eda3 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -40,6 +40,102 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define DOCHOST_DOCCANNAVIGATE 0 +typedef struct { + IEnumUnknown IEnumUnknown_iface; + LONG ref; +} EnumUnknown; + +static inline EnumUnknown *impl_from_IEnumUnknown(IEnumUnknown *iface) +{ + return CONTAINING_RECORD(iface, EnumUnknown, IEnumUnknown_iface); +} + +static HRESULT WINAPI EnumUnknown_QueryInterface(IEnumUnknown *iface, REFIID riid, void **ppv) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumUnknown_iface; + }else if(IsEqualGUID(&IID_IEnumUnknown, riid)) { + TRACE("(%p)->(IID_IEnumUnknown %p)\n", This, ppv); + *ppv = &This->IEnumUnknown_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumUnknown_AddRef(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumUnknown_Release(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI EnumUnknown_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + + /* FIXME: It's not clear if we should ever return something here */ + if(pceltFetched) + *pceltFetched = 0; + return S_FALSE; +} + +static HRESULT WINAPI EnumUnknown_Skip(IEnumUnknown *iface, ULONG celt) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUnknown_Reset(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUnknown_Clone(IEnumUnknown *iface, IEnumUnknown **ppenum) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static const IEnumUnknownVtbl EnumUnknownVtbl = { + EnumUnknown_QueryInterface, + EnumUnknown_AddRef, + EnumUnknown_Release, + EnumUnknown_Next, + EnumUnknown_Skip, + EnumUnknown_Reset, + EnumUnknown_Clone +}; + /********************************************************** * IOleObject implementation */ @@ -871,8 +967,19 @@ static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindC static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer *iface, DWORD grfFlags, IEnumUnknown **ppenum) { HTMLDocument *This = impl_from_IOleContainer(iface); - FIXME("(%p)->(%x %p)\n", This, grfFlags, ppenum); - return E_NOTIMPL; + EnumUnknown *ret; + + TRACE("(%p)->(%x %p)\n", This, grfFlags, ppenum); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumUnknown_iface.lpVtbl = &EnumUnknownVtbl; + ret->ref = 1; + + *ppenum = &ret->IEnumUnknown_iface; + return S_OK; } static HRESULT WINAPI OleContainer_LockContainer(IOleContainer *iface, BOOL fLock)

1 0

Jacek Caban : mshtml: Added ITargetContainer:: GetFramesContainer implementation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 537d05fb4bca899d301ff6b1f36d90fc350135a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537d05fb4bca899d301ff6b1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:24 2012 +0100 mshtml: Added ITargetContainer::GetFramesContainer implementation. --- dlls/mshtml/oleobj.c | 9 +++++++-- dlls/mshtml/tests/htmldoc.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9d50347..9f3d75a 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -924,8 +924,13 @@ static HRESULT WINAPI TargetContainer_GetFrameUrl(ITargetContainer *iface, LPWST static HRESULT WINAPI TargetContainer_GetFramesContainer(ITargetContainer *iface, IOleContainer **ppContainer) { HTMLDocumentObj *This = impl_from_ITargetContainer(iface); - FIXME("(%p)->(%p)\n", This, ppContainer); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppContainer); + + /* NOTE: we should return wrapped interface here */ + IOleContainer_AddRef(&This->basedoc.IOleContainer_iface); + *ppContainer = &This->basedoc.IOleContainer_iface; + return S_OK; } static const ITargetContainerVtbl TargetContainerVtbl = { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 736e60f..0fb115a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -310,6 +310,21 @@ static BOOL is_lang_english(void) return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + + return unk1 == unk2; +} + #define EXPECT_UPDATEUI 1 #define EXPECT_SETTITLE 2 @@ -5212,7 +5227,6 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) }else { ok(new_window != NULL, "new_window == NULL\n"); - trace("WINDOW %p\n", new_window); hres = IHTMLWindow2_close(new_window); ok(hres == S_OK, "close failed: %08x\n", hres); } @@ -6170,6 +6184,29 @@ static void test_external(IHTMLDocument2 *doc, BOOL initialized) IHTMLWindow2_Release(htmlwin); } +static void test_target_container(IHTMLDocument2 *doc) +{ + IOleContainer *ole_container, *doc_ole_container; + ITargetContainer *target_container; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_ITargetContainer, (void**)&target_container); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleContainer, (void**)&doc_ole_container); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + + ole_container = (void*)0xdeadbeef; + hres = ITargetContainer_GetFramesContainer(target_container, &ole_container); + ok(hres == S_OK, "GetFramesContainer failed: %08x\n", hres); + ok(ole_container != NULL, "ole_container == NULL\n"); + ok(iface_cmp((IUnknown*)ole_container, (IUnknown*)doc_ole_container), "ole_container != doc_ole_container\n"); + IOleContainer_Release(ole_container); + + ITargetContainer_Release(target_container); + IOleContainer_Release(doc_ole_container); +} + static void test_StreamLoad(IHTMLDocument2 *doc) { IPersistStreamInit *init; @@ -6354,6 +6391,7 @@ static void test_HTMLDocument(BOOL do_load) test_OnAmbientPropertyChange(doc); test_Window(doc, TRUE); test_external(doc, TRUE); + test_target_container(doc); test_UIDeactivate(); test_OleCommandTarget(doc);

1 0

Jacek Caban : tlogstg.idl: Added new file and ITravelLogClient declaration.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 97f4b22543c44216f5286eb1cd42b201d884eca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4b22543c44216f5286eb1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 15:49:11 2012 +0100 tlogstg.idl: Added new file and ITravelLogClient declaration. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9164c25..b97d5b5 100644 --- a/.gitignore +++ b/.gitignore @@ -226,6 +226,7 @@ include/stdole2.tlb include/strmif.h include/structuredquerycondition.h include/textstor.h +include/tlogstg.h include/tom.h include/unknwn.h include/urlhist.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 25e98a7..cae55c7 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -83,6 +83,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "sensevts.h" #include "ocmm.h" #include "commoncontrols.h" +#include "tlogstg.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/Makefile.in b/include/Makefile.in index 0c4122e..5ffc5e8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -92,6 +92,7 @@ PUBLIC_IDL_H_SRCS = \ strmif.idl \ structuredquerycondition.idl \ textstor.idl \ + tlogstg.idl \ tom.idl \ unknwn.idl \ urlhist.idl \

1 0

Huw Davies : gdi32: The clip region should stop the flooding.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 3dc4f259e9093463b4ee87ae8c35ea8f8f726e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc4f259e9093463b4ee87ae8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 19 10:11:44 2012 +0000 gdi32: The clip region should stop the flooding. --- dlls/gdi32/dibdrv/graphics.c | 29 ++++++++++++++++------------- dlls/gdi32/tests/dib.c | 31 +++++++++++++++++++------------ 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index ace7c6d..17d6994 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -678,17 +678,20 @@ BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) return dibdrv_RoundRect( dev, left, top, right, bottom, right - left, bottom - top ); } -static inline BOOL is_interior( dib_info *dib, int x, int y, DWORD pixel, UINT type) +static inline BOOL is_interior( dib_info *dib, HRGN clip, int x, int y, DWORD pixel, UINT type) { + /* the clip rgn stops the flooding */ + if (!PtInRegion( clip, x, y )) return FALSE; + if (type == FLOODFILLBORDER) return dib->funcs->get_pixel( dib, x, y ) != pixel; else return dib->funcs->get_pixel( dib, x, y ) == pixel; } -static void fill_row( dib_info *dib, RECT *row, DWORD pixel, UINT type, HRGN rgn ); +static void fill_row( dib_info *dib, HRGN clip, RECT *row, DWORD pixel, UINT type, HRGN rgn ); -static inline void do_next_row( dib_info *dib, const RECT *row, int offset, DWORD pixel, UINT type, HRGN rgn ) +static inline void do_next_row( dib_info *dib, HRGN clip, const RECT *row, int offset, DWORD pixel, UINT type, HRGN rgn ) { RECT next; @@ -697,26 +700,26 @@ static inline void do_next_row( dib_info *dib, const RECT *row, int offset, DWOR next.left = next.right = row->left; while (next.right < row->right) { - if (is_interior( dib, next.right, next.top, pixel, type)) next.right++; + if (is_interior( dib, clip, next.right, next.top, pixel, type)) next.right++; else { if (next.left != next.right && !PtInRegion( rgn, next.left, next.top )) - fill_row( dib, &next, pixel, type, rgn ); + fill_row( dib, clip, &next, pixel, type, rgn ); next.left = ++next.right; } } if (next.left != next.right && !PtInRegion( rgn, next.left, next.top )) - fill_row( dib, &next, pixel, type, rgn ); + fill_row( dib, clip, &next, pixel, type, rgn ); } -static void fill_row( dib_info *dib, RECT *row, DWORD pixel, UINT type, HRGN rgn ) +static void fill_row( dib_info *dib, HRGN clip, RECT *row, DWORD pixel, UINT type, HRGN rgn ) { - while (row->left > 0 && is_interior( dib, row->left - 1, row->top, pixel, type)) row->left--; - while (row->right < dib->width && is_interior( dib, row->right, row->top, pixel, type)) row->right++; + while (row->left > 0 && is_interior( dib, clip, row->left - 1, row->top, pixel, type)) row->left--; + while (row->right < dib->width && is_interior( dib, clip, row->right, row->top, pixel, type)) row->right++; add_rect_to_region( rgn, row ); - if (row->top > 0) do_next_row( dib, row, -1, pixel, type, rgn ); - if (row->top < dib->height - 1) do_next_row( dib, row, 1, pixel, type, rgn ); + if (row->top > 0) do_next_row( dib, clip, row, -1, pixel, type, rgn ); + if (row->top < dib->height - 1) do_next_row( dib, clip, row, 1, pixel, type, rgn ); return; } @@ -733,7 +736,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) TRACE( "(%p, %d, %d, %08x, %d\n", pdev, x, y, color, type ); - if (!is_interior( &pdev->dib, x, y, pixel, type )) return FALSE; + if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; rgn = CreateRectRgn( 0, 0, 0, 0 ); row.left = x; @@ -741,7 +744,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) row.top = y; row.bottom = y + 1; - fill_row( &pdev->dib, &row, pixel, type, rgn ); + fill_row( &pdev->dib, pdev->clip, &row, pixel, type, rgn ); brush_region( pdev, rgn ); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index fba4243..0846175 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -145,7 +145,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "f451a05f699ac3bbe155d059e7871a2636887b5f", "5dca709c60e0cd50fa85274a2836aec9eb6168e3", "dccaef62738ff90da4554a85d8cb846d6436799e", - "57b3c6ece2c4f322d5cb5e5dde596714607d5502", + "cc4e1372ddf6e303a7fd159090c9d3a1f8ec2a89", NULL }; @@ -217,7 +217,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "f451a05f699ac3bbe155d059e7871a2636887b5f", "5dca709c60e0cd50fa85274a2836aec9eb6168e3", "dccaef62738ff90da4554a85d8cb846d6436799e", - "57b3c6ece2c4f322d5cb5e5dde596714607d5502", + "cc4e1372ddf6e303a7fd159090c9d3a1f8ec2a89", NULL }; @@ -289,7 +289,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "707bc44fc9fed68ff1f537f0473e0cd825dd660f", "f19f5d8e2c96328f06f3985d02ff474fa37b1ea8", "175a7bcb73c74eceecc000657a0100bccf158ff4", - "71085fe7617b710a27a3ee4478d94e4d9209804e", + "d26eeb6b2d345b587d4305a1234ec0842a96d4b6", NULL }; @@ -361,7 +361,7 @@ static const char *sha1_graphics_r10g10b10[] = "88cfa7b7c1487f8eda05fce92b622942c9fb7ca4", "64cf929548bc5324fb14b053077bf5bc4be3e15c", "ad91dde8566dceaadc3523cdc8149cd7415a1b70", - "a56731d5c808a8a37ce057818d8c61d563ae4432", + "1936661eee8073068506131c9e89265b2f8403e8", NULL }; @@ -433,7 +433,7 @@ static const char *sha1_graphics_r6g6b6[] = "8e32ea3614c3b20899d748db48258761c7158d2b", "5da35bad12e3e9b26a0444d30820099481281e45", "94f004e98ae8035af948611770a4a2dd6643f510", - "130b503745311a795cd565f667c76870326b82d4", + "045ddaf752e7ffc7ded792f36af3c7c0cfeeae42", NULL }; @@ -505,7 +505,7 @@ static const char *sha1_graphics_24[] = "09cb4ab070083144bed4271c0a2a34ccb6ed13c0", "cc5ed4c9e925f0a457a7437fbb8054528cdd9469", "c95afd0a020e68a76982fe8663b5d64113987233", - "64d9e7cf03118d096a9a5bc5b5ee8c48df8bc0f6", + "48658ff76c137185c56a53f3ccf0e958d0296742", NULL }; @@ -581,7 +581,7 @@ static const char *sha1_graphics_r5g5b5[] = "7de23c68ca224818fdf127c5e96729dcd0de2b8b", "a848b1b0293b05b3f9358a3ffcb21a2e5fdecf05", "1a0fd0df17fa4c455a4a91cad30b5242f77fd233", - "1511523f4c6fd76a10867c44cc87a95446387425", + "af45bf81d119be5cf6845ad41191ba52637e65e9", NULL }; @@ -652,7 +652,7 @@ static const char *sha1_graphics_r4g4b4[] = "6fd751b7328c02954bce98bed94b3ce3c73db118", "91d50b5a604d6c38aa0d08b9af995490f8ec246b", "8585783d0373e9696b508776b6e6b18a80b09888", - "2e8fc36b1e534314c153375b9d3f6d217ccc08f1", + "b53cde47b0e28063770d3b1328c3cc2f774a6300", NULL }; @@ -729,7 +729,7 @@ static const char *sha1_graphics_8_color[] = "d7ffa3893c6fa937569791cf49986518a4a4d96e", "26bc25a011e2b60961ee9d6c6141d928ae24389b", "8771d5ff7b93b9dd9d077e672b342235dfb28472", - "6591276cda7784d91c79ed66ad4558b3f17426bc", + "6a1f6e1d494bf6b0ece7af5fa164ebaadb3a19bd", NULL }; @@ -886,7 +886,7 @@ static const char *sha1_graphics_8[] = "a6311d74fc058079a327abb536e69353be719925", "fbaa8848a1d3896469c37fd43ab44233f5b875a3", "0000000000000000000000000000000000000000", - "f3e856449b0ad00297cae027f51e3586746f9918", + "c2ac98ef716fd8a5ac8f08ce66293d9a96344337", NULL }; @@ -957,7 +957,7 @@ static const char *sha1_graphics_4[] = "6fe7d0d17b892032cfd171c3d7c365f030b5be38", "7ae780dcc7cf04dda50648bfc07cc6a7a2f2189e", "0000000000000000000000000000000000000000", - "3b6e78e568ed3e60e77f45fdf38cdfed4c341bb9", + "9ab46e0c42f82dc73df8a55cbf881abd72397cec", NULL }; @@ -1840,6 +1840,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh pSetLayout(hdc, LAYOUT_LTR); } + DeleteObject( hrgn ); for(i = 0, y = 10; i < 256; i++) { @@ -2554,6 +2555,11 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh solid_patblt( hdc, 100, 160, 50, 50, RGB( 0, 0, 0xff ) ); solid_patblt( hdc, 90, 160, 70, 10, RGB( 0, 0, 0xff ) ); + /* add a vertical 'bar' to show that the clip rgn stops the flooding */ + hrgn = CreateRectRgn( 180, 10, 190, 210 ); + ExtSelectClipRgn( hdc, hrgn, RGN_DIFF ); + DeleteObject( hrgn ); + solid_brush = CreateSolidBrush( RGB( 0xff, 0, 0 ) ); SelectObject( hdc, solid_brush ); @@ -2562,9 +2568,10 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "flood fill" ); memset(bits, 0xcc, dib_size); + ExtSelectClipRgn( hdc, NULL, RGN_COPY ); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); - DeleteObject(hrgn); DeleteObject(dib_brush); DeleteObject(solid_brush); DeleteObject(wide_pen);

1 0

Hans Leidekker : msi: Don' t parse the format string when building the shortcut target path.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: d20c69c54dbc52030162042d78e9fc60c9a93d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20c69c54dbc52030162042d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 19 12:27:05 2012 +0100 msi: Don't parse the format string when building the shortcut target path. It's no longer necessary because target paths are always normalized. --- dlls/msi/action.c | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index baebdc2..2347902 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3601,25 +3601,9 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) target = MSI_RecordGetString(row, 5); if (strchrW(target, '[')) { - int len; - WCHAR *format_string, *p; - - if (!(p = strchrW( target, ']' ))) goto err; - len = p - target + 1; - format_string = msi_alloc( (len + 1) * sizeof(WCHAR) ); - memcpy( format_string, target, len * sizeof(WCHAR) ); - format_string[len] = 0; - deformat_string( package, format_string, &deformated ); - msi_free( format_string ); - - path = msi_alloc( (strlenW( deformated ) + strlenW( p + 1 ) + 2) * sizeof(WCHAR) ); - strcpyW( path, deformated ); - PathAddBackslashW( path ); - strcatW( path, p + 1 ); + deformat_string( package, target, &path ); TRACE("target path is %s\n", debugstr_w(path)); - IShellLinkW_SetPath( sl, path ); - msi_free( deformated ); msi_free( path ); } else

1 0

Francois Gouget : po: Remove English strings from the Esperanto translation .
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: dc1473dd6ad65fae4c6c011439ed8b5054fea102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1473dd6ad65fae4c6c01143… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 19 00:22:45 2012 +0100 po: Remove English strings from the Esperanto translation. --- po/eo.po | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po/eo.po b/po/eo.po index eb518eb..e3a6994 100644 --- a/po/eo.po +++ b/po/eo.po @@ -478,7 +478,7 @@ msgstr "&Implicita Presilo" #: comdlg32.rc:223 msgid "[none]" -msgstr "[none]" +msgstr "" #: comdlg32.rc:224 msgid "Specific &Printer" @@ -7139,7 +7139,7 @@ msgstr "Vere" #: oleaut32.rc:28 oleview.rc:145 msgid "False" -msgstr "False" +msgstr "" #: oleaut32.rc:31 msgid "On" @@ -7531,7 +7531,7 @@ msgstr "" #: shdoclc.rc:100 shell32.rc:94 msgid "&Select" -msgstr "&Select" +msgstr "" #: shdoclc.rc:102 msgid "&Cell" @@ -7850,11 +7850,11 @@ msgstr "Pri %s" #: shell32.rc:333 msgid "Wine &license" -msgstr "Wine &license" +msgstr "" #: shell32.rc:338 msgid "Running on %s" -msgstr "Running on %s" +msgstr "" #: shell32.rc:339 msgid "Wine was brought to you by:" @@ -7903,15 +7903,15 @@ msgstr "Komentario" #: shell32.rc:143 msgid "Owner" -msgstr "Owner" +msgstr "" #: shell32.rc:144 msgid "Group" -msgstr "Group" +msgstr "" #: shell32.rc:145 msgid "Original location" -msgstr "Original location" +msgstr "" #: shell32.rc:146 msgid "Date deleted" @@ -8401,11 +8401,11 @@ msgstr "&Ignoru" #: user32.rc:84 msgid "&Try Again" -msgstr "&Try Again" +msgstr "" #: user32.rc:85 msgid "&Continue" -msgstr "&Continue" +msgstr "" #: user32.rc:91 msgid "Select Window" @@ -10091,7 +10091,7 @@ msgstr "Seræu sekvanta\tF3" #: notepad.rc:55 wordpad.rc:52 msgid "&Replace...\tCtrl+H" -msgstr "&Replace...\tCtrl+H" +msgstr "" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 #, fuzzy @@ -10592,7 +10592,7 @@ msgstr "&Aløustigu la fenestron" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options" -msgstr "&Options" +msgstr "" #: progman.rc:42 msgid "&Arrange automatically" @@ -13412,15 +13412,15 @@ msgstr "" #: winhlp32.rc:48 winhlp32.rc:69 msgid "Small" -msgstr "Small" +msgstr "" #: winhlp32.rc:49 winhlp32.rc:70 msgid "Normal" -msgstr "Normal" +msgstr "" #: winhlp32.rc:50 winhlp32.rc:71 msgid "Large" -msgstr "Large" +msgstr "" #: winhlp32.rc:54 #, fuzzy @@ -13465,7 +13465,7 @@ msgstr "Eraro dum la legado de helpdosiero `%s'" #: winhlp32.rc:85 msgid "Summary" -msgstr "Summary" +msgstr "" #: winhlp32.rc:84 msgid "&Index"

1 0

Francois Gouget : po: Remove English strings from the Italian translation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 5b1ef31b307dcb3cfda40bdb9a499985d7d3a71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1ef31b307dcb3cfda40bdb9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 19 00:16:47 2012 +0100 po: Remove English strings from the Italian translation. --- po/it.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/it.po b/po/it.po index b15ab64..4eddc86 100644 --- a/po/it.po +++ b/po/it.po @@ -7518,23 +7518,23 @@ msgstr "Vista del Debug" #: shdoclc.rc:201 msgid "Dump Tree" -msgstr "Dump Tree" +msgstr "" #: shdoclc.rc:202 msgid "Dump Lines" -msgstr "Dump Lines" +msgstr "" #: shdoclc.rc:203 msgid "Dump DisplayTree" -msgstr "Dump DisplayTree" +msgstr "" #: shdoclc.rc:204 msgid "Dump FormatCaches" -msgstr "Dump FormatCaches" +msgstr "" #: shdoclc.rc:205 msgid "Dump LayoutRects" -msgstr "Dump LayoutRects" +msgstr "" #: shdoclc.rc:206 msgid "Memory Monitor" @@ -7614,7 +7614,7 @@ msgstr "Internet Explorer di Wine" #: shdoclc.rc:30 msgid "&w&bPage &p" -msgstr "&w&bPage &p" +msgstr "" #: shell32.rc:27 shell32.rc:42 shell32.rc:119 shell32.rc:159 taskmgr.rc:65 #: taskmgr.rc:110 taskmgr.rc:252 @@ -11694,7 +11694,7 @@ msgstr "Termina la &famiglia dei processi" #: taskmgr.rc:152 winedbg.rc:29 msgid "&Debug" -msgstr "&Debug" +msgstr "" #: taskmgr.rc:154 msgid "Set &Priority"

1 0