June 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Add a helper function for registering a file read async I/O.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 7a8ebc828e763284fdda027dcdf135cc01a58dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8ebc828e763284fdda027dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 15:31:00 2016 +0900 ntdll: Add a helper function for registering a file read async I/O. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 66 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 55bdac0..7d09c8f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -774,6 +774,42 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL return status; } +/* register an async I/O for a file read; helper for NtReadFile */ +static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *iosb, void *buffer, + ULONG already, ULONG length, BOOL avail_mode ) +{ + ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + struct async_fileio_read *fileio; + NTSTATUS status; + + if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), handle, apc, apc_user ))) + return STATUS_NO_MEMORY; + + fileio->already = already; + fileio->count = length; + fileio->buffer = buffer; + fileio->avail_mode = avail_mode; + + SERVER_START_REQ( register_async ) + { + req->type = ASYNC_TYPE_READ; + req->count = length; + req->async.handle = wine_server_obj_handle( handle ); + req->async.event = wine_server_obj_handle( event ); + req->async.callback = wine_server_client_ptr( FILE_AsyncReadService ); + req->async.iosb = wine_server_client_ptr( iosb ); + req->async.arg = wine_server_client_ptr( fileio ); + req->async.cvalue = cvalue; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + return status; +} + /****************************************************************************** * NtReadFile [NTDLL.@] @@ -910,7 +946,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (async_read) { - struct async_fileio_read *fileio; BOOL avail_mode; if ((status = get_io_avail_mode( hFile, type, &avail_mode ))) @@ -920,33 +955,8 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = STATUS_SUCCESS; goto done; } - - fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); - if (!fileio) - { - status = STATUS_NO_MEMORY; - goto err; - } - fileio->already = total; - fileio->count = length; - fileio->buffer = buffer; - fileio->avail_mode = avail_mode; - - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->count = length; - req->async.handle = wine_server_obj_handle( hFile ); - req->async.event = wine_server_obj_handle( hEvent ); - req->async.callback = wine_server_client_ptr( FILE_AsyncReadService ); - req->async.iosb = wine_server_client_ptr( io_status ); - req->async.arg = wine_server_client_ptr( fileio ); - req->async.cvalue = cvalue; - status = wine_server_call( req ); - } - SERVER_END_REQ; - - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + status = register_async_file_read( hFile, hEvent, apc, apc_user, io_status, + buffer, total, length, avail_mode ); goto err; } else /* synchronous read, wait for the fd to become ready */

1 0

Jacek Caban : user32: Make SetWindowLongW hotpatchable.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: bce9e1d2bd82531476a6c0ea96ef6a1913ebbd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce9e1d2bd82531476a6c0ea9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 19:59:33 2016 +0200 user32: Make SetWindowLongW hotpatchable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index eb1aeda..463602a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2678,7 +2678,7 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * and WM_STYLECHANGED afterwards. * App ver 4.0 can't use SetWindowLong to change WS_EX_TOPMOST. */ -LONG WINAPI SetWindowLongW( +LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( HWND hwnd, /* [in] window to alter */ INT offset, /* [in] offset, in bytes, of location to alter */ LONG newval /* [in] new value of location */

1 0

Józef Kucia : d3d10core/tests: Add more tests for creating shader resource views.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: cc9b4d8a9eb20eeb61dbaffb7b37619b217b7b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9b4d8a9eb20eeb61dbaffb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:56 2016 +0200 d3d10core/tests: Add more tests for creating shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 211 +++++++++++++++++++++++++++++------------- 1 file changed, 145 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc9b4d8a9eb20eeb61dba…

1 0

Alex Henrie : msvcrt: Stub out _(get|set) _thread_local_invalid_parameter_handler.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: a88c35d0dc91b4f28baf656c65667f5ddff53ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88c35d0dc91b4f28baf656c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 7 16:36:50 2016 -0600 msvcrt: Stub out _(get|set)_thread_local_invalid_parameter_handler. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/msvcrt/errno.c | 19 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index e138bf6..9864c6c 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub _get_narrow_winmain_command_line @ cdecl _get_pgmptr(ptr) ucrtbase._get_pgmptr @ cdecl _get_terminate() ucrtbase._get_terminate -@ stub _get_thread_local_invalid_parameter_handler +@ cdecl _get_thread_local_invalid_parameter_handler() ucrtbase._get_thread_local_invalid_parameter_handler @ stub _get_wide_winmain_command_line @ cdecl _get_wpgmptr(ptr) ucrtbase._get_wpgmptr @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @@ -73,7 +73,7 @@ @ cdecl _set_error_mode(long) ucrtbase._set_error_mode @ cdecl _set_invalid_parameter_handler(ptr) ucrtbase._set_invalid_parameter_handler @ cdecl _set_new_handler(ptr) ucrtbase._set_new_handler -@ stub _set_thread_local_invalid_parameter_handler +@ cdecl _set_thread_local_invalid_parameter_handler(ptr) ucrtbase._set_thread_local_invalid_parameter_handler @ cdecl _seterrormode(long) ucrtbase._seterrormode @ cdecl _sleep(long) ucrtbase._sleep @ cdecl _statusfp() ucrtbase._statusfp diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 6c1a912..75e211e 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -473,3 +473,22 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( invalid_parameter_handler = handler; return old; } + +/********************************************************************* + * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) + */ +MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) +{ + FIXME(" stub\n"); + return NULL; +} + +/********************************************************************* + * _set_thread_local_invalid_parameter_handler (UCRTBASE.@) + */ +MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( + MSVCRT_invalid_parameter_handler handler) +{ + FIXME("(%p) stub\n", handler); + return NULL; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bda6d3d..9d65d3c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -375,7 +375,7 @@ @ stub _get_purecall_handler @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate -@ stub _get_thread_local_invalid_parameter_handler +@ cdecl _get_thread_local_invalid_parameter_handler() @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @@ -1893,7 +1893,7 @@ @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ stub _set_se_translator -@ stub _set_thread_local_invalid_parameter_handler +@ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 @ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio

1 0

Béla Gyebrószki : quartz: Fix a typo in an ERR() message.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 9c8566654d324100d37f609bafda4cae61ea38e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8566654d324100d37f609ba… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Wed Jun 8 20:59:15 2016 +0200 quartz: Fix a typo in an ERR() message. Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d6c4617..677cc1c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1045,7 +1045,7 @@ static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, } else { - ERR("pInputPin Disconncted\n"); + ERR("pInputPin Disconnected\n"); hr = E_FAIL; } LeaveCriticalSection(&This->renderer.filter.csFilter);

1 0

Józef Kucia : d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 723f73aeb69cb94c842f7ad5b29d3224fecbadd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723f73aeb69cb94c842f7ad5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:57 2016 +0200 d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 73 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 7bec5b9..5a2ef39 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -282,7 +282,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D; desc->u.Texture3D.MipSlice = 0; desc->u.Texture3D.FirstWSlice = 0; - desc->u.Texture3D.WSize = 1; + desc->u.Texture3D.WSize = texture_desc.Depth; return S_OK; } @@ -296,52 +296,73 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; - - if (desc->Format != DXGI_FORMAT_UNKNOWN) - return; + unsigned int layer_count; + DXGI_FORMAT format; ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D11_TEXTURE1D_DESC texture_desc; - ID3D11Texture1D *texture; + const struct d3d_texture2d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return; } - ID3D11Texture1D_GetDesc(texture, &texture_desc); - ID3D11Texture1D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; break; } - case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: { - D3D11_TEXTURE2D_DESC texture_desc; - ID3D11Texture2D *texture; + const struct d3d_texture3d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) { - ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture3D.\n"); + return; } - ID3D11Texture2D_GetDesc(texture, &texture_desc); - ID3D11Texture2D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.Depth; break; } default: + return; + } + + if (desc->Format == DXGI_FORMAT_UNKNOWN) + desc->Format = format; + + switch (desc->ViewDimension) + { + case D3D11_RTV_DIMENSION_TEXTURE1DARRAY: + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + break; + + case D3D11_RTV_DIMENSION_TEXTURE2DARRAY: + if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count) + desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice; + break; + + case D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY: + if (desc->u.Texture2DMSArray.ArraySize == -1 && desc->u.Texture2DMSArray.FirstArraySlice < layer_count) + desc->u.Texture2DMSArray.ArraySize = layer_count - desc->u.Texture2DMSArray.FirstArraySlice; + break; + + case D3D11_RTV_DIMENSION_TEXTURE3D: + layer_count = max(1, layer_count >> desc->u.Texture3D.MipSlice); + if (desc->u.Texture3D.WSize == -1 && desc->u.Texture3D.FirstWSlice < layer_count) + desc->u.Texture3D.WSize = layer_count - desc->u.Texture3D.FirstWSlice; + break; + + default: break; } }

1 0

Jeremy Newman : fix possible XSS attack vector
by Jeremy Newman June 8, 2016

June 8, 2016

Module: website Branch: master Commit: dfec0f52db8f557b00d2304a09079c3d08a26a4f URL: http://source.winehq.org/git/website.git/?a=commit;h=dfec0f52db8f557b00d230… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jun 8 13:33:58 2016 -0500 fix possible XSS attack vector --- site.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/site.php b/site.php index 29c5159..e108f77 100644 --- a/site.php +++ b/site.php @@ -77,7 +77,7 @@ if (isset($_SERVER['PATH_INFO'])) } // clean page path - $page = $html->clean_input($page); + $page = $html->clean_input($page, true); // template PAGE path verification if (preg_match('%^global/%', $page)) @@ -87,11 +87,16 @@ if (isset($_SERVER['PATH_INFO'])) $html->in404 = 1; define("PAGE", '404'); } - else + else if (preg_match('/[a-z0-9_-]/i', $page)) { // good path define("PAGE", $page); } + else + { + // unknown + define("PAGE", '404'); + } unset($page, $dirs, $good_dirs); } else

1 0

Hugh McMaster : reg/tests: Add tests for invalid switches.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 57c39cf2b6a3b72fcebaab92d501ecd2d24e4abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c39cf2b6a3b72fcebaab92d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 8 10:48:06 2016 +0000 reg/tests: Add tests for invalid switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2831e03..d34f19d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -450,6 +450,19 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup2 /t REG_DWORD /d 123 /f /d 456", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + /* Test invalid switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid1 /a", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid2 /ae", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid3 /", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "got %d\n", err); }

1 0

Huw Davies : gdi32: Rename the struct representing an embedded WMF in an EMF.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 078f192c669212e58b3b211712b0f88d61a4b225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078f192c669212e58b3b21171… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 8 11:00:47 2016 +0100 gdi32: Rename the struct representing an embedded WMF in an EMF. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index c251b4e..cab30e9 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2739,7 +2739,7 @@ done: return emf; } -typedef struct gdi_mf_comment +typedef struct wmf_in_emf_comment { DWORD ident; DWORD iComment; @@ -2747,7 +2747,7 @@ typedef struct gdi_mf_comment DWORD nChecksum; DWORD fFlags; DWORD cbWinMetaFile; -} gdi_mf_comment; +} wmf_in_emf_comment; /****************************************************************** * SetWinMetaFileBits (GDI32.@) @@ -2830,10 +2830,10 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC */ if (mm != MM_TEXT) { - gdi_mf_comment *mfcomment; + wmf_in_emf_comment *mfcomment; UINT mfcomment_size; - mfcomment_size = sizeof (gdi_mf_comment) + cbBuffer; + mfcomment_size = sizeof (*mfcomment) + cbBuffer; mfcomment = HeapAlloc(GetProcessHeap(), 0, mfcomment_size); if (mfcomment) {

1 0

Hugh McMaster : reg: Recognise switches beginning with a forward slash or hyphen.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: f426ece3a16cc47f0e1da51d074d4ceb380995c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f426ece3a16cc47f0e1da51d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 8 10:48:18 2016 +0000 reg: Recognise switches beginning with a forward slash or hyphen. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 91 +++++++++++++++++++++++++++--------------------- programs/reg/tests/reg.c | 8 ++--- 2 files changed, 56 insertions(+), 43 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 28133de..7d9c972 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -858,16 +858,11 @@ int wmain(int argc, WCHAR *argvW[]) { int i, op, ret; BOOL show_op_help = FALSE; + static const WCHAR switchVAW[] = {'v','a',0}; + static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; HKEY root; - static const WCHAR slashDW[] = {'/','d',0}; - static const WCHAR slashFW[] = {'/','f',0}; - static const WCHAR slashSW[] = {'/','s',0}; - static const WCHAR slashTW[] = {'/','t',0}; - static const WCHAR slashVW[] = {'/','v',0}; - static const WCHAR slashVAW[] = {'/','v','a',0}; - static const WCHAR slashVEW[] = {'/','v','e',0}; if (argc == 1) { @@ -928,54 +923,72 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 3; i < argc; i++) { - if (!lstrcmpiW(argvW[i], slashVW)) + if (argvW[i][0] == '/' || argvW[i][0] == '-') { - if (value_name || !(value_name = argvW[++i])) + WCHAR *ptr = &argvW[i][1]; + + if (!lstrcmpiW(ptr, switchVEW)) { - output_message(STRING_INVALID_CMDLINE); - return 1; + value_empty = TRUE; + continue; } - } - else if (!lstrcmpiW(argvW[i], slashVEW)) - value_empty = TRUE; - else if (!lstrcmpiW(argvW[i], slashVAW)) - value_all = TRUE; - else if (!lstrcmpiW(argvW[i], slashTW)) - { - if (type || !(type = argvW[++i])) + else if (!lstrcmpiW(ptr, switchVAW)) { - output_message(STRING_INVALID_CMDLINE); - return 1; + value_all = TRUE; + continue; } - } - else if (!lstrcmpiW(argvW[i], slashDW)) - { - if (data || !(data = argvW[++i])) + else if (ptr[1]) { output_message(STRING_INVALID_CMDLINE); return 1; } - } - else if (!lstrcmpiW(argvW[i], slashSW)) - { - WCHAR *ptr; - if (op == REG_QUERY) + switch(tolowerW(argvW[i][1])) { - recurse = TRUE; - continue; - } + case 'v': + if (value_name || !(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + break; + case 't': + if (type || !(type = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + break; + case 'd': + if (data || !(data = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + break; + case 's': + if (op == REG_QUERY) + { + recurse = TRUE; + break; + } - ptr = argvW[++i]; - if (!ptr || strlenW(ptr) != 1) - { + ptr = argvW[++i]; + if (!ptr || strlenW(ptr) != 1) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = ptr[0]; + break; + case 'f': + force = TRUE; + break; + default: output_message(STRING_INVALID_CMDLINE); return 1; } - separator = ptr[0]; } - else if (!lstrcmpiW(argvW[i], slashFW)) - force = TRUE; } if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d34f19d..7556870 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -452,16 +452,16 @@ static void test_add(void) /* Test invalid switches */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid1 /a", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid2 /ae", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid3 /", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "got %d\n", err);

1 0