February 2016 - Wine-Commits

Ken Thomases : winemac: Simplify and optimize making a GL context current with no view.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 38f579f9ba0aba49788c2ce84172ae5237929ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f579f9ba0aba49788c2ce84… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 22 21:14:30 2016 -0600 winemac: Simplify and optimize making a GL context current with no view. If the context is already current, don't do +clearCurrentContext followed by -makeCurrentContext. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 4694dfd..e1aca77 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -227,17 +227,17 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) { WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext]; - if ([currentContext isKindOfClass:[WineOpenGLContext class]]) - { - [WineOpenGLContext clearCurrentContext]; - if (currentContext != context) - [currentContext removeFromViews:YES]; - } + [context removeFromViews:YES]; - if (context) + if (currentContext != context) { - [context removeFromViews:YES]; - [context makeCurrentContext]; + if (context) + [context makeCurrentContext]; + else + [WineOpenGLContext clearCurrentContext]; + + if ([currentContext isKindOfClass:[WineOpenGLContext class]]) + [currentContext removeFromViews:YES]; } }

1 0

Hans Leidekker : webservices: Set bytes pointer to NULL if length is zero in alloc_xml_string and alloc_utf8_text.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: bc131a26534de74581e6fa171581eebbaaf3a3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc131a26534de74581e6fa171… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:53 2016 +0100 webservices: Set bytes pointer to NULL if length is zero in alloc_xml_string and alloc_utf8_text. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 55cd4ac..2abb82a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -665,7 +665,7 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *data, ULONG len ) if (!(ret = heap_alloc( sizeof(*ret) + len ))) return NULL; ret->length = len; - ret->bytes = (BYTE *)(ret + 1); + ret->bytes = len ? (BYTE *)(ret + 1) : NULL; ret->dictionary = NULL; ret->id = 0; if (data) memcpy( ret->bytes, data, len ); @@ -679,7 +679,7 @@ WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *data, ULONG len ) if (!(ret = heap_alloc( sizeof(*ret) + len ))) return NULL; ret->text.textType = WS_XML_TEXT_TYPE_UTF8; ret->value.length = len; - ret->value.bytes = (BYTE *)(ret + 1); + ret->value.bytes = len ? (BYTE *)(ret + 1) : NULL; ret->value.dictionary = NULL; ret->value.id = 0; if (data) memcpy( ret->value.bytes, data, len ); @@ -881,10 +881,8 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) if (!len) goto error; if ((hr = parse_name( start, len, &attr->prefix, &attr->localName )) != S_OK) goto error; - if (!attr->prefix->length) attr->prefix->bytes = NULL; hr = E_OUTOFMEMORY; if (!(attr->ns = alloc_xml_string( NULL, 0 ))) goto error; - attr->ns->bytes = NULL; hr = WS_E_INVALID_FORMAT; read_skip_whitespace( reader ); @@ -907,11 +905,8 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) } read_skip( reader, 1 ); - if (!(text = alloc_utf8_text( start, len ))) - { - free_attribute( attr ); - return E_OUTOFMEMORY; - } + hr = E_OUTOFMEMORY; + if (!(text = alloc_utf8_text( start, len ))) goto error; attr->value = &text->text; attr->singleQuote = (quote == '\''); @@ -957,9 +952,9 @@ static HRESULT read_element( struct reader *reader ) if (!len) goto error; if ((hr = parse_name( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; - if (!elem->prefix->length) elem->prefix->bytes = NULL; hr = E_OUTOFMEMORY; if (!(elem->ns = alloc_xml_string( NULL, 0 ))) goto error; + elem->ns->bytes = (BYTE *)(elem->ns + 1); reader->current_attr = 0; for (;;)

1 0

Huw Davies : ole32/tests: Add more drag and drop tests.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: d468ed1e999674d0711f0dbb090c4e18206d87d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d468ed1e999674d0711f0dbb0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:34 2016 +0000 ole32/tests: Add more drag and drop tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/dragdrop.c | 118 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 027e0da..09112b8 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -140,7 +140,123 @@ struct method_call call_lists[][30] = { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, { DoDragDrop_effect_out, 0, 0, 0, 0 }, { end_seq, 0, 0, 0, 0 } - } + }, + { /* Multiple initial effects */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_Drop, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a drop */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_Drop, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First QueryContinueDrag cancels */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_CANCEL, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_CANCEL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a cancel */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_CANCEL, 0, 0 }, + { DT_DragLeave, 0, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_CANCEL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a E_FAIL */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, E_FAIL, 0, 0 }, + { DT_DragLeave, 0, 0, 0, 0 }, + + { DoDragDrop_ret, E_FAIL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, }; static int droptarget_refs;

1 0

Huw Davies : ole32: Don't send DragOver if we're about to drop or cancel.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 9194c47ede575a56961ad4ac001de175ac32cee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9194c47ede575a56961ad4ac0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:32 2016 +0000 ole32: Don't send DragOver if we're about to drop or cancel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 07c8e9d..9cffb63 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2297,26 +2297,11 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) trackerInfo->returnValue = IDropSource_QueryContinueDrag(trackerInfo->dropSource, trackerInfo->escPressed, trackerInfo->dwKeyState); - /* - * If we are hovering over the same target as before, send the - * DragOver notification - */ - if ( (trackerInfo->curDragTarget != 0) && - (trackerInfo->curTargetHWND == hwndNewTarget) ) - { - *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; - IDropTarget_DragOver(trackerInfo->curDragTarget, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; - } - else + + if (trackerInfo->curTargetHWND != hwndNewTarget && + (trackerInfo->returnValue == S_OK || + trackerInfo->returnValue == DRAGDROP_S_DROP)) { - /* - * If we changed window, we have to notify our old target and check for - * the new one. - */ if (trackerInfo->curDragTarget) { IDropTarget_DragLeave(trackerInfo->curDragTarget); @@ -2327,15 +2312,25 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) if (hwndNewTarget) drag_enter( trackerInfo, hwndNewTarget ); - } - give_feedback( trackerInfo ); + give_feedback( trackerInfo ); - /* - * All the return valued will stop the operation except the S_OK - * return value. - */ - if (trackerInfo->returnValue != S_OK) + } + + if (trackerInfo->returnValue == S_OK) + { + if (trackerInfo->curDragTarget) + { + *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; + IDropTarget_DragOver(trackerInfo->curDragTarget, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; + } + give_feedback( trackerInfo ); + } + else drag_end( trackerInfo ); }

1 0

Shu Yokoyama : winex11: Fix HRESULT handling in XdndPosition.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 5ccf039fc72e86674794b4441253bce04ceff616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf039fc72e86674794b4441… Author: Shu Yokoyama <yokoyama(a)graco.c.u-tokyo.ac.jp> Date: Tue Feb 23 08:02:25 2016 +0900 winex11: Fix HRESULT handling in XdndPosition. Signed-off-by: Shu Yokoyama <yokoyama(a)graco.c.u-tokyo.ac.jp> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 8b2c582..c83caea 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -328,7 +328,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (dropTarget) { hr = IDropTarget_DragOver(dropTarget, MK_LBUTTON, pointl, &effect); - if (hr != S_OK) + if (hr == S_OK) XDNDDropEffect = effect; else WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr);

1 0

Hugh McMaster : reg/tests: Add a test for REG_NONE with no data argument.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 965dee67c1e48d80f0e6c77d63c28b6bd2c6ab4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=965dee67c1e48d80f0e6c77d6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:20 2016 +1100 reg/tests: Add a test for REG_NONE with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2c71b5c..db3b5a2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -145,6 +145,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v none1 /t REG_NONE /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "none1", REG_NONE, "\0", 2, TODO_REG_SIZE); + /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Hugh McMaster : reg/tests: Add more tests for REG_MULTI_SZ.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 99f2cebe86e8899f09016e716f8c98b65b3d9544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f2cebe86e8899f09016e716… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:15 2016 +1100 reg/tests: Add more tests for REG_MULTI_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index eb75ac9..bb54e2a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -363,6 +363,16 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi13 /t REG_MULTI_SZ /f /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi14 /t REG_MULTI_SZ /d \"\\0a\" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg: Allow either lowercase or uppercase 'x' when used with REG_DWORD.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 5e6429520b917ff8b447d31d8224b3eef6887053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6429520b917ff8b447d31d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:14 2016 +1100 reg: Allow either lowercase or uppercase 'x' when used with REG_DWORD. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7dc624a..933341c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -243,7 +243,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { LPWSTR rest; DWORD val; - val = strtoulW(data, &rest, (data[1] == 'x') ? 16 : 10); + val = strtoulW(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); if (*rest || data[0] == '-') { output_message(STRING_MISSING_INTEGER); break; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a813de1..eb75ac9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -298,6 +298,11 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword14 /t REG_DWORD /d 0X123 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x123; + verify_reg(hkey, "dword14", REG_DWORD, &dword, sizeof(dword), 0); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hans Leidekker : webservices: Add support for namespace attributes in the writer.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 2d53f131183ce24d89c38dee46780aace3fe2995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d53f131183ce24d89c38dee4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:50 2016 +0100 webservices: Add support for namespace attributes in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 119 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 99 insertions(+), 20 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 88dab77..2ea3486 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -485,7 +485,6 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) if (text) write_bytes( writer, text->value.bytes, text->value.length ); write_char( writer, quote ); - /* FIXME: ignoring namespace */ return S_OK; } @@ -503,21 +502,42 @@ static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING return S_OK; } +static HRESULT write_namespace_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) +{ + unsigned char quote = attr->singleQuote ? '\'' : '"'; + ULONG size; + HRESULT hr; + + /* ' xmlns:prefix="namespace"' */ + + size = attr->ns->length + 9 /* ' xmlns=""' */; + if (attr->prefix) size += attr->prefix->length + 1 /* ':' */; + if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; + + write_bytes( writer, (const BYTE *)" xmlns", 6 ); + if (attr->prefix) + { + write_char( writer, ':' ); + write_bytes( writer, attr->prefix->bytes, attr->prefix->length ); + } + write_char( writer, '=' ); + write_char( writer, quote ); + write_bytes( writer, attr->ns->bytes, attr->ns->length ); + write_char( writer, quote ); + + return S_OK; +} + static HRESULT write_startelement( struct writer *writer ) { WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; ULONG size, i; HRESULT hr; - /* '<prefix:localname prefix:attr="value"... xmlns:prefix="ns"' */ + /* '<prefix:localname prefix:attr="value"... xmlns:prefix="ns"'... */ size = elem->localName->length + 1 /* '<' */; if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; - if (elem->ns->length && !is_current_namespace( writer, elem->ns )) - { - size += strlen(" xmlns") + elem->ns->length + 3 /* '=""' */; - if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; - } if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_char( writer, '<' ); @@ -529,23 +549,20 @@ static HRESULT write_startelement( struct writer *writer ) write_bytes( writer, elem->localName->bytes, elem->localName->length ); for (i = 0; i < elem->attributeCount; i++) { + if (elem->attributes[i]->isXmlNs) continue; if ((hr = write_attribute( writer, elem->attributes[i] )) != S_OK) return hr; } - if (elem->ns->length && !is_current_namespace( writer, elem->ns )) + for (i = 0; i < elem->attributeCount; i++) { - if ((hr = set_current_namespace( writer, elem->ns )) != S_OK) return hr; - - write_bytes( writer, (const BYTE *)" xmlns", 6 ); - if (elem->prefix) - { - write_char( writer, ':' ); - write_bytes( writer, elem->prefix->bytes, elem->prefix->length ); - } - write_char( writer, '=' ); - write_char( writer, '"' ); - write_bytes( writer, elem->ns->bytes, elem->ns->length ); - write_char( writer, '"' ); + if (!elem->attributes[i]->isXmlNs || !elem->attributes[i]->prefix) continue; + if ((hr = write_namespace_attribute( writer, elem->attributes[i] )) != S_OK) return hr; + } + for (i = 0; i < elem->attributeCount; i++) + { + if (!elem->attributes[i]->isXmlNs || elem->attributes[i]->prefix) continue; + if ((hr = write_namespace_attribute( writer, elem->attributes[i] )) != S_OK) return hr; } + return S_OK; } @@ -576,9 +593,70 @@ static HRESULT write_endelement( struct writer *writer ) return S_OK; } +static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *ns, BOOL single ) +{ + WS_XML_ATTRIBUTE *attr; + WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; + HRESULT hr; + + if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; + + attr->singleQuote = !!single; + attr->isXmlNs = 1; + if (prefix && !(attr->prefix = alloc_xml_string( prefix->bytes, prefix->length ))) + { + free_attribute( attr ); + return E_OUTOFMEMORY; + } + if (!(attr->ns = alloc_xml_string( ns->bytes, ns->length ))) + { + free_attribute( attr ); + return E_OUTOFMEMORY; + } + if ((hr = append_attribute( elem, attr )) != S_OK) + { + free_attribute( attr ); + return hr; + } + return S_OK; +} + +static const WS_XML_ATTRIBUTE *find_namespace_attribute( const WS_XML_ELEMENT_NODE *elem, + const WS_XML_STRING *prefix, + const WS_XML_STRING *ns ) +{ + ULONG i; + for (i = 0; i < elem->attributeCount; i++) + { + if (!elem->attributes[i]->isXmlNs) continue; + if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && + WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) + { + return elem->attributes[i]; + } + } + return NULL; +} + +static HRESULT write_set_element_namespace( struct writer *writer ) +{ + WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; + HRESULT hr; + + if (!elem->ns->length || is_current_namespace( writer, elem->ns ) || + find_namespace_attribute( elem, elem->prefix, elem->ns )) return S_OK; + + if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) + return hr; + + return set_current_namespace( writer, elem->ns ); +} + static HRESULT write_endstartelement( struct writer *writer ) { HRESULT hr; + if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; write_char( writer, '>' ); @@ -609,6 +687,7 @@ static HRESULT write_close_element( struct writer *writer ) if (writer->state == WRITER_STATE_STARTELEMENT) { /* '/>' */ + if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; write_char( writer, '/' );

1 0

Alexandre Julliard : makefiles: Generate dependencies for default import libraries.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 96376059efb3e54e661da7f6c2d209e57f96175d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96376059efb3e54e661da7f6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 20:21:47 2016 +0900 makefiles: Generate dependencies for default import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 8ef8f16..e1897bc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1988,6 +1988,23 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra /******************************************************************* + * get_default_imports + */ +static struct strarray get_default_imports( const struct makefile *make ) +{ + struct strarray ret = empty_strarray; + + if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; + if (strarray_exists( &make->appmode, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + if (make->is_win16) strarray_add( &ret, "kernel" ); + strarray_add( &ret, "kernel32" ); + strarray_add( &ret, "ntdll" ); + strarray_add( &ret, "winecrt0" ); + return ret; +} + + +/******************************************************************* * add_install_rule */ static void add_install_rule( const struct makefile *make, struct strarray *install_rules, @@ -2527,6 +2544,7 @@ static struct strarray output_sources( const struct makefile *make ) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); + add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); strarray_add( &all_libs, "-lwine" ); @@ -2758,6 +2776,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray dep_libs = empty_strarray; struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, 0 ); + add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ strarray_addall( &all_libs, libs ); strarray_add( &all_targets, strmake( "%s%s", testmodule, dll_ext )); strarray_add( &clean_files, strmake( "%s%s", stripped, dll_ext )); @@ -2805,6 +2824,7 @@ static struct strarray output_sources( const struct makefile *make ) dep_libs = empty_strarray; all_libs = add_import_libs( make, &dep_libs, make->imports, 1 ); + add_import_libs( make, &dep_libs, get_default_imports( make ), 1 ); /* dependencies only */ strarray_addall( &all_libs, libs ); strarray_add( &clean_files, crosstest ); output( "%s: %s\n", obj_dir_path( make, "crosstest" ), obj_dir_path( make, crosstest ));

1 0