wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Hans Leidekker : webservices: Implement WsSkipNode.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: da030566e7de8b5c8cd99985598c04f72a54f646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da030566e7de8b5c8cd999855… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:50 2017 +0200 webservices: Implement WsSkipNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 46 ++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1d85f00..befe8db 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1739,6 +1739,52 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error ) return hr; } +static HRESULT skip_node( struct reader *reader ) +{ + const struct node *parent; + HRESULT hr; + + if (node_type( reader->current ) == WS_XML_NODE_TYPE_EOF) return WS_E_INVALID_OPERATION; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_ELEMENT) parent = reader->current; + else parent = NULL; + + for (;;) + { + if ((hr = read_node( reader ) != S_OK) || !parent) break; + if (node_type( reader->current ) != WS_XML_NODE_TYPE_END_ELEMENT) continue; + if (reader->current->parent == parent) return read_node( reader ); + } + + return hr; +} + +/************************************************************************** + * WsSkipNode [webservices.@] + */ +HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + EnterCriticalSection( &reader->cs ); + + if (reader->magic != READER_MAGIC) + { + LeaveCriticalSection( &reader->cs ); + return E_INVALIDARG; + } + + hr = skip_node( reader ); + + LeaveCriticalSection( &reader->cs ); + return hr; +} + /************************************************************************** * WsReadStartElement [webservices.@] */ diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1598cb2..93b7ed5 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4403,6 +4403,65 @@ static void test_WsReadAttribute(void) WsFreeReader( reader ); } +static void test_WsSkipNode(void) +{ + const WS_XML_NODE *node; + WS_XML_READER *reader; + HRESULT hr; + + hr = WsSkipNode( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSkipNode( reader, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t><u></u></t>", sizeof("<t><u></u></t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + /* BOF */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + /* element */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + /* EOF */ + hr = WsSkipNode( reader, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* non-element */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", node->nodeType ); + + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -4444,4 +4503,5 @@ START_TEST(reader) test_WsReadCharsUtf8(); test_WsReadQualifiedName(); test_WsReadAttribute(); + test_WsSkipNode(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a6b8452..1f98aa3 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -159,7 +159,7 @@ @ stdcall WsSetReaderPosition(ptr ptr ptr) @ stdcall WsSetWriterPosition(ptr ptr ptr) @ stub WsShutdownSessionChannel -@ stub WsSkipNode +@ stdcall WsSkipNode(ptr ptr) @ stub WsStartReaderCanonicalization @ stub WsStartWriterCanonicalization @ stub WsTrimXmlWhitespace

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 75087023417f5e64e63e4d5fbd563f7a264c6f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75087023417f5e64e63e4d5fb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:49 2017 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index c5aa3ec..fc259c1 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -211,16 +211,46 @@ typedef enum { WS_CHARSET_UTF16BE } WS_CHARSET; +typedef struct _WS_XML_DICTIONARY { + GUID guid; + struct _WS_XML_STRING *strings; + ULONG stringCount; + BOOL isConst; +} WS_XML_DICTIONARY; + +typedef struct _WS_XML_STRING { + ULONG length; + BYTE *bytes; + WS_XML_DICTIONARY *dictionary; + ULONG id; +} WS_XML_STRING; + typedef struct _WS_XML_READER_TEXT_ENCODING { WS_XML_READER_ENCODING encoding; WS_CHARSET charSet; } WS_XML_READER_TEXT_ENCODING; +typedef struct _WS_XML_READER_BINARY_ENCODING { + WS_XML_READER_ENCODING encoding; + WS_XML_DICTIONARY *staticDictionary; + WS_XML_DICTIONARY *dynamicDictionary; +} WS_XML_READER_BINARY_ENCODING; + typedef struct _WS_XML_WRITER_TEXT_ENCODING { WS_XML_WRITER_ENCODING encoding; WS_CHARSET charSet; } WS_XML_WRITER_TEXT_ENCODING; +typedef HRESULT (CALLBACK *WS_DYNAMIC_STRING_CALLBACK) + (void*, const WS_XML_STRING*, BOOL*, ULONG*, WS_ERROR*); + +typedef struct _WS_XML_WRITER_BINARY_ENCODING { + WS_XML_WRITER_ENCODING encoding; + WS_XML_DICTIONARY *staticDictionary; + WS_DYNAMIC_STRING_CALLBACK dynamicStringCallback; + void *dynamicStringCallbackState; +} WS_XML_WRITER_BINARY_ENCODING; + typedef enum { WS_XML_READER_INPUT_TYPE_BUFFER = 1, WS_XML_READER_INPUT_TYPE_STREAM = 2 @@ -274,20 +304,6 @@ typedef struct _WS_XML_READER_STREAM_INPUT { void *readCallbackState; } WS_XML_READER_STREAM_INPUT; -typedef struct _WS_XML_DICTIONARY { - GUID guid; - struct _WS_XML_STRING *strings; - ULONG stringCount; - BOOL isConst; -} WS_XML_DICTIONARY; - -typedef struct _WS_XML_STRING { - ULONG length; - BYTE *bytes; - WS_XML_DICTIONARY *dictionary; - ULONG id; -} WS_XML_STRING; - typedef enum { WS_ELEMENT_TYPE_MAPPING = 1, WS_ATTRIBUTE_TYPE_MAPPING = 2, @@ -1568,6 +1584,7 @@ void WINAPI WsFreeReader(WS_XML_READER*); void WINAPI WsFreeServiceProxy(WS_SERVICE_PROXY*); void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetDictionary(WS_ENCODING, WS_XML_DICTIONARY**, WS_ERROR*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*);

1 0

Huw Davies : ole32: OleUninitialize() does not release the reference to the clipboard's source dataobject.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 8fc1a4cd863aad02761f015bf5a5f67f94934aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc1a4cd863aad02761f015bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 09:33:02 2017 +0100 ole32: OleUninitialize() does not release the reference to the clipboard's source dataobject. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 64 ++++++++++++++++++++++++-------------------- dlls/ole32/tests/clipboard.c | 14 +++++++++- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b3c7665..919d9e3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1786,35 +1786,6 @@ void OLEClipbrd_Initialize(void) } } -/*********************************************************************** - * OLEClipbrd_UnInitialize() - * Un-Initializes the OLE clipboard - */ -void OLEClipbrd_UnInitialize(void) -{ - ole_clipbrd *clipbrd = theOleClipboard; - - TRACE("()\n"); - - if ( clipbrd ) - { - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); - - if ( clipbrd->window ) - { - DestroyWindow(clipbrd->window); - UnregisterClassW( clipbrd_wndclass, hinst ); - } - - IStream_Release(clipbrd->marshal_data); - if (clipbrd->src_data) IDataObject_Release(clipbrd->src_data); - HeapFree(GetProcessHeap(), 0, clipbrd->cached_enum); - HeapFree(GetProcessHeap(), 0, clipbrd); - theOleClipboard = NULL; - } -} - /********************************************************************* * set_clipboard_formats * @@ -2015,6 +1986,41 @@ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) } /*********************************************************************** + * OLEClipbrd_UnInitialize() + * Un-Initializes the OLE clipboard + */ +void OLEClipbrd_UnInitialize(void) +{ + ole_clipbrd *clipbrd = theOleClipboard; + + TRACE("()\n"); + + if ( clipbrd ) + { + static const WCHAR ole32W[] = {'o','l','e','3','2',0}; + HINSTANCE hinst = GetModuleHandleW(ole32W); + + /* OleUninitialize() does not release the reference to the dataobject, so + take an additional reference here. This reference is then leaked. */ + if (clipbrd->src_data) + { + IDataObject_AddRef(clipbrd->src_data); + set_src_dataobject(clipbrd, NULL); + } + + if ( clipbrd->window ) + { + DestroyWindow(clipbrd->window); + UnregisterClassW( clipbrd_wndclass, hinst ); + } + + IStream_Release(clipbrd->marshal_data); + HeapFree(GetProcessHeap(), 0, clipbrd); + theOleClipboard = NULL; + } +} + +/*********************************************************************** * clipbrd_wndproc */ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1c8923e..4890782 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1187,9 +1187,21 @@ static void test_consumer_refs(void) IDataObject_Release(get1); IDataObject_Release(src2); - IDataObject_Release(src); + + /* Show that OleUninitialize() doesn't release the + dataobject's ref, and thus the object is leaked. */ + old_refs = count_refs(src); + ok(old_refs == 1, "%d\n", old_refs); + + OleSetClipboard(src); + refs = count_refs(src); + ok(refs > old_refs, "%d %d\n", refs, old_refs); OleUninitialize(); + refs = count_refs(src); + ok(refs == 2, "%d\n", refs); + + IDataObject_Release(src); } static void test_flushed_getdata(void)

1 0

Vincent Povirk : gdiplus: Check SHADEBLENDCAPS only for printer devices.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: b8a8e1bde9382897927945ec0b58b8a2fcfcfe59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a8e1bde9382897927945ec0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 22 13:20:58 2017 -0500 gdiplus: Check SHADEBLENDCAPS only for printer devices. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c0d58d..815ffb0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -324,7 +324,8 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + if (GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) { TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); @@ -404,7 +405,8 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE || + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) memcpy(temp_bits, src, src_width * src_height * 4); else

1 0

Hugh McMaster : regedit: Only show the 'New' pop-up menu when right-clicking beneath the listview item list.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: e880c9ca8c557fe9df536ae5970fe0b57a793868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e880c9ca8c557fe9df536ae59… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:21 2017 +0000 regedit: Only show the 'New' pop-up menu when right-clicking beneath the listview item list. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 258 ++++++++++++++++++++++---------------------- po/bg.po | 258 ++++++++++++++++++++++---------------------- po/ca.po | 258 ++++++++++++++++++++++---------------------- po/cs.po | 258 ++++++++++++++++++++++---------------------- po/da.po | 258 ++++++++++++++++++++++---------------------- po/de.po | 258 ++++++++++++++++++++++---------------------- po/el.po | 258 ++++++++++++++++++++++---------------------- po/en.po | 258 ++++++++++++++++++++++---------------------- po/en_US.po | 258 ++++++++++++++++++++++---------------------- po/eo.po | 258 ++++++++++++++++++++++---------------------- po/es.po | 258 ++++++++++++++++++++++---------------------- po/fa.po | 258 ++++++++++++++++++++++---------------------- po/fi.po | 258 ++++++++++++++++++++++---------------------- po/fr.po | 258 ++++++++++++++++++++++---------------------- po/he.po | 258 ++++++++++++++++++++++---------------------- po/hi.po | 258 ++++++++++++++++++++++---------------------- po/hr.po | 258 ++++++++++++++++++++++---------------------- po/hu.po | 258 ++++++++++++++++++++++---------------------- po/it.po | 258 ++++++++++++++++++++++---------------------- po/ja.po | 258 ++++++++++++++++++++++---------------------- po/ko.po | 258 ++++++++++++++++++++++---------------------- po/lt.po | 258 ++++++++++++++++++++++---------------------- po/ml.po | 258 ++++++++++++++++++++++---------------------- po/nb_NO.po | 258 ++++++++++++++++++++++---------------------- po/nl.po | 258 ++++++++++++++++++++++---------------------- po/or.po | 258 ++++++++++++++++++++++---------------------- po/pa.po | 258 ++++++++++++++++++++++---------------------- po/pl.po | 258 ++++++++++++++++++++++---------------------- po/pt_BR.po | 258 ++++++++++++++++++++++---------------------- po/pt_PT.po | 258 ++++++++++++++++++++++---------------------- po/rm.po | 258 ++++++++++++++++++++++---------------------- po/ro.po | 258 ++++++++++++++++++++++---------------------- po/ru.po | 258 ++++++++++++++++++++++---------------------- po/sk.po | 258 ++++++++++++++++++++++---------------------- po/sl.po | 258 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 258 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 258 ++++++++++++++++++++++---------------------- po/sv.po | 258 ++++++++++++++++++++++---------------------- po/te.po | 258 ++++++++++++++++++++++---------------------- po/th.po | 258 ++++++++++++++++++++++---------------------- po/tr.po | 258 ++++++++++++++++++++++---------------------- po/uk.po | 258 ++++++++++++++++++++++---------------------- po/wa.po | 258 ++++++++++++++++++++++---------------------- po/wine.pot | 258 ++++++++++++++++++++++---------------------- po/zh_CN.po | 258 ++++++++++++++++++++++---------------------- po/zh_TW.po | 258 ++++++++++++++++++++++---------------------- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 3 +- programs/regedit/regedit.rc | 14 +++ 49 files changed, 5951 insertions(+), 5936 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e880c9ca8c557fe9df536…

1 0

Hugh McMaster : regedit: Update and sort the pop-up menus.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 7bf054f198695abb445e5d2ebd7b777d6a1bba71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf054f198695abb445e5d2eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:11 2017 +0000 regedit: Update and sort the pop-up menus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 266 ++++++++++++++++++++++---------------------- po/bg.po | 266 ++++++++++++++++++++++---------------------- po/ca.po | 266 ++++++++++++++++++++++---------------------- po/cs.po | 266 ++++++++++++++++++++++---------------------- po/da.po | 266 ++++++++++++++++++++++---------------------- po/de.po | 266 ++++++++++++++++++++++---------------------- po/el.po | 266 ++++++++++++++++++++++---------------------- po/en.po | 266 ++++++++++++++++++++++---------------------- po/en_US.po | 266 ++++++++++++++++++++++---------------------- po/eo.po | 266 ++++++++++++++++++++++---------------------- po/es.po | 266 ++++++++++++++++++++++---------------------- po/fa.po | 266 ++++++++++++++++++++++---------------------- po/fi.po | 266 ++++++++++++++++++++++---------------------- po/fr.po | 266 ++++++++++++++++++++++---------------------- po/he.po | 266 ++++++++++++++++++++++---------------------- po/hi.po | 266 ++++++++++++++++++++++---------------------- po/hr.po | 266 ++++++++++++++++++++++---------------------- po/hu.po | 266 ++++++++++++++++++++++---------------------- po/it.po | 266 ++++++++++++++++++++++---------------------- po/ja.po | 266 ++++++++++++++++++++++---------------------- po/ko.po | 266 ++++++++++++++++++++++---------------------- po/lt.po | 266 ++++++++++++++++++++++---------------------- po/ml.po | 266 ++++++++++++++++++++++---------------------- po/nb_NO.po | 266 ++++++++++++++++++++++---------------------- po/nl.po | 266 ++++++++++++++++++++++---------------------- po/or.po | 266 ++++++++++++++++++++++---------------------- po/pa.po | 266 ++++++++++++++++++++++---------------------- po/pl.po | 266 ++++++++++++++++++++++---------------------- po/pt_BR.po | 266 ++++++++++++++++++++++---------------------- po/pt_PT.po | 266 ++++++++++++++++++++++---------------------- po/rm.po | 266 ++++++++++++++++++++++---------------------- po/ro.po | 266 ++++++++++++++++++++++---------------------- po/ru.po | 266 ++++++++++++++++++++++---------------------- po/sk.po | 266 ++++++++++++++++++++++---------------------- po/sl.po | 266 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 266 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 266 ++++++++++++++++++++++---------------------- po/sv.po | 266 ++++++++++++++++++++++---------------------- po/te.po | 266 ++++++++++++++++++++++---------------------- po/th.po | 266 ++++++++++++++++++++++---------------------- po/tr.po | 266 ++++++++++++++++++++++---------------------- po/uk.po | 266 ++++++++++++++++++++++---------------------- po/wa.po | 266 ++++++++++++++++++++++---------------------- po/wine.pot | 266 ++++++++++++++++++++++---------------------- po/zh_CN.po | 266 ++++++++++++++++++++++---------------------- po/zh_TW.po | 266 ++++++++++++++++++++++---------------------- programs/regedit/childwnd.c | 2 +- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 7 +- programs/regedit/regedit.rc | 22 ++-- 50 files changed, 6136 insertions(+), 6133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bf054f198695abb445e5…

1 0

Hugh McMaster : regedit: Re-select the listview item after renaming is complete.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: c5d38ce42778726c7a243520e015d38d0bebc160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d38ce42778726c7a243520e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:01 2017 +0000 regedit: Re-select the listview item after renaming is complete. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index d8589b8..a78a406 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -400,11 +400,16 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR LPNMLVDISPINFOW dispInfo = (LPNMLVDISPINFOW)lParam; LPWSTR oldName = GetItemText(hWnd, dispInfo->item.iItem); LONG ret; + LVITEMW item; + if (!oldName) return -1; /* cannot rename a default value */ ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, dispInfo->item.pszText); if (ret) { RefreshListView(hWnd, g_currentRootKey, g_currentPath, dispInfo->item.pszText); + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(hWnd, LVM_SETITEMSTATE, dispInfo->item.iItem, (LPARAM)&item); } HeapFree(GetProcessHeap(), 0, oldName); return 0;

1 0

Hugh McMaster : regedit: Always assign focus to the default value when refreshing the listview.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 5474b7a43ed42174911ad41c5240eae98b110c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5474b7a43ed42174911ad41c5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:02:52 2017 +0000 regedit: Always assign focus to the default value when refreshing the listview. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 11147a7..d8589b8 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -109,8 +109,7 @@ static void MakeMULTISZDisplayable(LPWSTR multi) /******************************************************************************* * Local module support methods */ -static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, - void* ValBuf, DWORD dwCount, BOOL bHighlight) +static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, void *ValBuf, DWORD dwCount) { LINE_INFO* linfo; LVITEMW item; @@ -137,9 +136,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; - if (bHighlight) { - item.stateMask = item.state = LVIS_FOCUSED; - } + switch (dwValType) { case REG_SZ: @@ -552,20 +549,25 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { - AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); + AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0); } for(index = 0; index < val_count; index++) { - BOOL bSelected = (valName == highlightValue); /* NOT a bug, we check for double NULL here */ valNameLen = max_val_name_len; valSize = max_val_size; valType = 0; errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - if (highlightValue && !lstrcmpW(valName, highlightValue)) - bSelected = TRUE; - AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); + AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize); + } + + memset(&item, 0, sizeof(item)); + if (!highlightValue) + { + item.state = item.stateMask = LVIS_FOCUSED; + SendMessageW(hwndLV, LVM_SETITEMSTATE, 0, (LPARAM)&item); } + SendMessageW(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc); g_currentRootKey = hKeyRoot;

1 0

Jacek Caban : rpcrt4: Implement cancel_call for named pipes.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: b54833890a21d1d5e3feeba74a7084b729fca30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54833890a21d1d5e3feeba74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:50 2017 +0200 rpcrt4: Implement cancel_call for named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ab87daa..1e7a62b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -447,9 +447,10 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) return 0; } -static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) +static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) { - /* FIXME: implement when named pipe writes use overlapped I/O */ + RpcConnection_np *connection = (RpcConnection_np *)conn; + CancelIoEx(connection->pipe, NULL); } static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection)

1 0

Jacek Caban : rpcrt4: Cache event handle in RpcConnection_np object.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 372c9e0db57099dd9d4277009f5f625562bc6343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372c9e0db57099dd9d4277009… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:43 2017 +0200 rpcrt4: Cache event handle in RpcConnection_np object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index afcb0e7..ab87daa 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -68,6 +68,7 @@ typedef struct _RpcConnection_np HANDLE pipe; HANDLE listen_event; IO_STATUS_BLOCK io_status; + HANDLE event_cache; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -76,14 +77,17 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) return &npc->common; } -static HANDLE get_np_event(void) +static HANDLE get_np_event(RpcConnection_np *connection) { - return CreateEventW(NULL, TRUE, FALSE, NULL); + HANDLE event = InterlockedExchangePointer(&connection->event_cache, NULL); + return event ? event : CreateEventW(NULL, TRUE, FALSE, NULL); } -static void release_np_event(HANDLE event) +static void release_np_event(RpcConnection_np *connection, HANDLE event) { - CloseHandle(event); + event = InterlockedExchangePointer(&connection->event_cache, event); + if (event) + CloseHandle(event); } static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) @@ -382,7 +386,7 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c HANDLE event; NTSTATUS status; - event = get_np_event(); + event = get_np_event(connection); if (!event) return -1; @@ -392,7 +396,7 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c WaitForSingleObject(event, INFINITE); status = io_status.Status; } - release_np_event(event); + release_np_event(connection, event); return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } @@ -403,7 +407,7 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne HANDLE event; NTSTATUS status; - event = get_np_event(); + event = get_np_event(connection); if (!event) return -1; @@ -413,7 +417,7 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne WaitForSingleObject(event, INFINITE); status = io_status.Status; } - release_np_event(event); + release_np_event(connection, event); if (status) return -1; @@ -435,6 +439,11 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) CloseHandle(connection->listen_event); connection->listen_event = 0; } + if (connection->event_cache) + { + CloseHandle(connection->event_cache); + connection->event_cache = 0; + } return 0; } @@ -640,7 +649,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p NTSTATUS status; HANDLE event; - event = get_np_event(); + event = get_np_event(conn); if (!event) continue; @@ -727,7 +736,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, { if (b_handle == conn->listen_event) { - release_np_event(conn->listen_event); + release_np_event(conn, conn->listen_event); conn->listen_event = NULL; if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) RPCRT4_SpawnConnection(&cconn, &conn->common);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
64
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 May 2017