October 2016 - Wine-Commits

Józef Kucia : wined3d: Avoid trying to get backup DC when context is no longer associated with swapchain.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: 6f7e0d3dba6e8be7973a955c27349c49c64e1434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7e0d3dba6e8be7973a955c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:05 2016 +0200 wined3d: Avoid trying to get backup DC when context is no longer associated with swapchain. 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/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f249587..89cc9ce 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1069,7 +1069,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) * a swapchain, so we can't use the swapchain to get a backup dc. To * make this work windowless contexts would need to be handled by the * device. */ - if (ctx->destroyed) + if (ctx->destroyed || !swapchain) { FIXME("Unable to get backup dc for destroyed context %p.\n", ctx); context_set_current(NULL);

1 0

Jacek Caban : kernel32/tests: Added GetNamedPipeInfo tests.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: 7abde01cc112c45cf7dbf6f4c6c294321e80b9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abde01cc112c45cf7dbf6f4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 5 21:27:06 2016 +0200 kernel32/tests: Added GetNamedPipeInfo tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a896843..cf7e3ba 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2250,6 +2250,77 @@ static void test_NamedPipeHandleState(void) CloseHandle(server); } +#define test_pipe_info(a,b,c,d,e) _test_pipe_info(__LINE__,a,b,c,d,e) +static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex_out_buf_size, DWORD ex_in_buf_size, DWORD ex_max_instances) +{ + DWORD flags = 0xdeadbeef, out_buf_size = 0xdeadbeef, in_buf_size = 0xdeadbeef, max_instances = 0xdeadbeef; + BOOL res; + + res = GetNamedPipeInfo(pipe, &flags, &out_buf_size, &in_buf_size, &max_instances); + ok_(__FILE__,line)(res, "GetNamedPipeInfo failed: %x\n", res); + ok_(__FILE__,line)(flags == ex_flags, "flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)(out_buf_size == ex_out_buf_size, "out_buf_size = %x, expected %u\n", out_buf_size, ex_out_buf_size); + ok_(__FILE__,line)(in_buf_size == ex_in_buf_size, "in_buf_size = %x, expected %u\n", in_buf_size, ex_in_buf_size); + ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); +} + +static void test_GetNamedPipeInfo(void) +{ + HANDLE server; + + server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_BYTE, 1024, 1024, 1); + + CloseHandle(server); + + server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_MESSAGE | PIPE_NOWAIT, + /* nMaxInstances */ 3, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_MESSAGE, 1024, 1024, 3); + + CloseHandle(server); + + server = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_MESSAGE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 0, + /* nInBufSize */ 0, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_MESSAGE, 0, 0, 1); + + CloseHandle(server); + + server = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_MESSAGE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 0xf000, + /* nInBufSize */ 0xf000, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_MESSAGE, 0xf000, 0xf000, 1); + + CloseHandle(server); +} + static void test_readfileex_pending(void) { HANDLE server, client, event; @@ -2432,5 +2503,6 @@ START_TEST(pipe) test_overlapped(); test_overlapped_error(); test_NamedPipeHandleState(); + test_GetNamedPipeInfo(); test_readfileex_pending(); }

1 0

Jacek Caban : winhttp: Added WINHTTP_OPTION_CLIENT_CERT_CONTEXT option stub.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: e27ff36fc678dcb27372aace5fc2e25688854828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27ff36fc678dcb27372aace5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 6 14:05:32 2016 +0200 winhttp: Added WINHTTP_OPTION_CLIENT_CERT_CONTEXT option stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 10 +++++++++- dlls/winhttp/tests/winhttp.c | 6 ++++++ include/winhttp.h | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 4813a3f..514a56d 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -999,6 +999,14 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe if (!(session->proxy_password = buffer_to_str( buffer, buflen ))) return FALSE; return TRUE; } + case WINHTTP_OPTION_CLIENT_CERT_CONTEXT: + if (!(hdr->flags & WINHTTP_FLAG_SECURE)) + { + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } + FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER ); @@ -1224,7 +1232,7 @@ static BOOL set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD { BOOL ret = TRUE; - if (!buffer) + if (!buffer && buflen) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1cc9ba0..e5a8be3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -994,6 +994,9 @@ static void test_secure_connection(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); + ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "setting client cert context returned %x (%u)\n", ret, GetLastError()); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) @@ -1017,6 +1020,9 @@ static void test_secure_connection(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); + ok(ret, "failed to set client cert context %u\n", GetLastError()); + WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); diff --git a/include/winhttp.h b/include/winhttp.h index 51e8265..3d87280 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -63,6 +63,8 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_NO_PROXY_NAME NULL #define WINHTTP_NO_PROXY_BYPASS NULL +#define WINHTTP_NO_CLIENT_CERT_CONTEXT NULL + #define WINHTTP_NO_REFERER NULL #define WINHTTP_DEFAULT_ACCEPT_TYPES NULL

1 0

Huw Davies : riched20: Set a temporary insert style for the new paragraph.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 2dbcddc6605e7e7ebad75e27774136063b6dd80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbcddc6605e7e7ebad75e277… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:26 2016 +0100 riched20: Set a temporary insert style for the new paragraph. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7b934fe..78cb50c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2392,7 +2392,6 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); if (shift_is_down) ME_InsertEndRowFromCursor(editor, 0); @@ -2401,12 +2400,13 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_InsertTextFromCursor(editor, 0, &endl, 1, style); else ME_InsertTextFromCursor(editor, 0, endlv10, 2, style); - ME_ReleaseStyle(style); ME_CommitCoalescingUndo(editor); SetCursor(NULL); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); } return TRUE; }

1 0

Huw Davies : riched20: Use the provided style for the end-of-paragraph run.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 4989c858a00a21fef41f652ec83d15889e0535f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4989c858a00a21fef41f652ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:24 2016 +0100 riched20: Use the provided style for the end-of-paragraph run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a47930f..26af743 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -549,7 +549,6 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, pos++; } else { /* handle EOLs */ ME_DisplayItem *tp, *end_run, *run, *prev; - ME_Style *tmp_style; int eol_len = 0; /* Find number of CR and LF in end of paragraph run */ @@ -594,13 +593,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, run = p->pRun; } - tmp_style = ME_GetInsertStyle(editor, nCursor); - /* ME_SplitParagraph increases style refcount */ - tp = ME_SplitParagraph(editor, run, run->member.run.style, eol_str, eol_len, 0); + tp = ME_SplitParagraph(editor, run, style, eol_str, eol_len, 0); end_run = ME_FindItemBack(tp, diRun); - ME_ReleaseStyle(end_run->member.run.style); - end_run->member.run.style = tmp_style; /* Move any cursors that were at the end of the previous run to the beginning of the new para */ prev = ME_FindItemBack( end_run, diRun );

1 0

Michael Stefaniuc : ws2_32: Use debugstr_guid() to trace GUIDs.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 8581ae8cc5b2dd9f40cc1c09d1f6afa34f8d14ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8581ae8cc5b2dd9f40cc1c09d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:37:59 2016 +0200 ws2_32: Use debugstr_guid() to trace GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9d0b60e..e3c7507 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7880,7 +7880,7 @@ int WINAPI WSAInstallServiceClassW(LPWSASERVICECLASSINFOW info) */ int WINAPI WSARemoveServiceClass(LPGUID info) { - FIXME("Request to remove service %p\n",info); + FIXME("Request to remove service %s\n", debugstr_guid(info)); SetLastError(WSATYPE_NOT_FOUND); return SOCKET_ERROR; } @@ -8569,7 +8569,7 @@ INT WINAPI WSCInstallNameSpace( LPWSTR identifier, LPWSTR path, DWORD namespace, */ INT WINAPI WSCUnInstallNameSpace( LPGUID lpProviderId ) { - FIXME("(%p) Stub!\n", lpProviderId); + FIXME("(%s) Stub!\n", debugstr_guid(lpProviderId)); return NO_ERROR; }

1 0

Michael Stefaniuc : dmusic/tests: Add basic COM tests for IDirectMusicPort.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 1dc5cc3470c106dab95e03ea366b3954403e72cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc5cc3470c106dab95e03ea3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:27:56 2016 +0200 dmusic/tests: Add basic COM tests for IDirectMusicPort. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 5a0c095..69df51d 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -379,6 +379,65 @@ static BOOL missing_dmusic(void) return TRUE; } +static void test_COM_synthport(void) +{ + IDirectMusic *dmusic = NULL; + IDirectMusicPort *port = NULL; + IDirectMusicPortDownload *dmpd; + IDirectMusicThru *dmt; + IKsControl *iksc; + IReferenceClock *clock; + IUnknown *unk; + DMUS_PORTPARAMS port_params; + ULONG refcount; + HRESULT hr; + + /* Create a IDirectMusicPort */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, + (void**)&dmusic); + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); + port_params.dwSize = sizeof(port_params); + port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; + port_params.dwChannelGroups = 1; + port_params.dwAudioChannels = 2; + hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); + ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr); + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL); + ok(hr == S_OK, "IDirectMusic_CreatePort returned: %x\n", hr); + + /* Same refcount for all DirectMusicPort interfaces */ + refcount = IDirectMusicPort_AddRef(port); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicPort_QueryInterface(port, &IID_IDirectMusicPortDownload, (void**)&dmpd); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPortDownload failed: %08x\n", hr); + refcount = IDirectMusicPortDownload_AddRef(dmpd); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + IDirectMusicPortDownload_Release(dmpd); + + hr = IDirectMusicPort_QueryInterface(port, &IID_IKsControl, (void**)&iksc); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); + if (hr == S_OK) { + refcount = IKsControl_AddRef(iksc); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IKsControl_Release(iksc); + } + + hr = IDirectMusicPort_QueryInterface(port, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + todo_wine ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + IUnknown_Release(unk); + + /* Unsupported interface */ + hr = IDirectMusicPort_QueryInterface(port, &IID_IDirectMusicThru, (void**)&dmt); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicThru failed: %08x\n", hr); + hr = IDirectMusicPort_QueryInterface(port, &IID_IReferenceClock, (void**)&clock); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %08x\n", hr); + + while (IDirectMusicPort_Release(port)); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -391,6 +450,7 @@ START_TEST(dmusic) } test_COM(); test_COM_dmcoll(); + test_COM_synthport(); test_dmusic(); test_dmbuffer(); test_dmcoll();

1 0

Hans Leidekker : wbemprox: Get rid of hard-coded OS version numbers.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 1977baa79393ddc7a1240dee7b168aaa28b44003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1977baa79393ddc7a1240dee7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 5 09:46:28 2016 +0200 wbemprox: Get rid of hard-coded OS version numbers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 122 ++++++++++++++++++++++++++++++++--------- dlls/wbemprox/tests/query.c | 128 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1977baa79393ddc7a1240…

1 0

Austin English : subst: Add stub program.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 7756d6ba9b0213d5533eb5248e62716e7e8409b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7756d6ba9b0213d5533eb5248… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 5 01:04:59 2016 -0500 subst: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/subst/Makefile.in | 5 +++++ programs/subst/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index e4f23e7..e3181e0 100755 --- a/configure +++ b/configure @@ -1554,6 +1554,7 @@ enable_services enable_shutdown enable_spoolsv enable_start +enable_subst enable_svchost enable_systeminfo enable_taskkill @@ -18489,6 +18490,7 @@ wine_fn_config_test programs/services/tests services.exe_test wine_fn_config_program shutdown enable_shutdown install wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start clean,install +wine_fn_config_program subst enable_subst install wine_fn_config_program svchost enable_svchost install wine_fn_config_program systeminfo enable_systeminfo install wine_fn_config_program taskkill enable_taskkill clean,install diff --git a/configure.ac b/configure.ac index e97cd17..741a4ef 100644 --- a/configure.ac +++ b/configure.ac @@ -3580,6 +3580,7 @@ WINE_CONFIG_TEST(programs/services/tests) WINE_CONFIG_PROGRAM(shutdown,,[install]) WINE_CONFIG_PROGRAM(spoolsv,,[install]) WINE_CONFIG_PROGRAM(start,,[clean,install]) +WINE_CONFIG_PROGRAM(subst,,[install]) WINE_CONFIG_PROGRAM(svchost,,[install]) WINE_CONFIG_PROGRAM(systeminfo,,[install]) WINE_CONFIG_PROGRAM(taskkill,,[clean,install]) diff --git a/programs/subst/Makefile.in b/programs/subst/Makefile.in new file mode 100644 index 0000000..63d574f --- /dev/null +++ b/programs/subst/Makefile.in @@ -0,0 +1,5 @@ +MODULE = subst.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/subst/main.c b/programs/subst/main.c new file mode 100644 index 0000000..5af524d --- /dev/null +++ b/programs/subst/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(subst); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Piotr Caban : msvcp110: Fix num_get structure layout.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: a4be8a31e526a6657bc4a30b197d785048b8f5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4be8a31e526a6657bc4a30b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 5 17:04:48 2016 +0200 msvcp110: Fix num_get structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 42 ++++++++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.h | 2 ++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f5b13db..fe5bd33 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4926,7 +4926,9 @@ DEFINE_THISCALL_WRAPPER(num_get_wchar__Init, 8) void __thiscall num_get_wchar__Init(num_get *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER <= 100 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -5145,11 +5147,18 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator wchar_t sep = 0, digits[11], *digits_pos; const char *grouping, *groups; BOOL error = FALSE, got_digit = FALSE, got_nonzero = FALSE; + const _Cvtvec *cvt; TRACE("(%p %p %p %p)\n", dest, first, last, loc); +#if _MSVCP_VER <= 100 + cvt = &this->cvt; +#else + cvt = &ctype_wchar_use_facet(loc)->cvt; +#endif + for(i=0; i<10; i++) - digits[i] = mb_to_wc('0'+i, &this->cvt); + digits[i] = mb_to_wc('0'+i, cvt); digits[10] = 0; numpunct_wchar_grouping(numpunct, &grouping_bstr); @@ -5163,10 +5172,10 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator istreambuf_iterator_wchar_val(first); /* get sign */ - if(first->strbuf && first->val==mb_to_wc('-', &this->cvt)) { + if(first->strbuf && first->val==mb_to_wc('-', cvt)) { *dest++ = '-'; istreambuf_iterator_wchar_inc(first); - }else if(first->strbuf && first->val==mb_to_wc('+', &this->cvt)) { + }else if(first->strbuf && first->val==mb_to_wc('+', cvt)) { *dest++ = '+'; istreambuf_iterator_wchar_inc(first); } @@ -5222,14 +5231,14 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator } /* read exponent, if any */ - if(first->strbuf && (first->val==mb_to_wc('e', &this->cvt) || first->val==mb_to_wc('E', &this->cvt))) { + if(first->strbuf && (first->val==mb_to_wc('e', cvt) || first->val==mb_to_wc('E', cvt))) { *dest++ = 'e'; istreambuf_iterator_wchar_inc(first); - if(first->strbuf && first->val==mb_to_wc('-', &this->cvt)) { + if(first->strbuf && first->val==mb_to_wc('-', cvt)) { *dest++ = '-'; istreambuf_iterator_wchar_inc(first); - }else if(first->strbuf && first->val==mb_to_wc('+', &this->cvt)) { + }else if(first->strbuf && first->val==mb_to_wc('+', cvt)) { *dest++ = '+'; istreambuf_iterator_wchar_inc(first); } @@ -5326,14 +5335,21 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator char *dest_beg = dest, *dest_end = dest+24; const char *grouping, *groups; BOOL error = TRUE, dest_empty = TRUE, found_zero = FALSE; + const _Cvtvec *cvt; TRACE("(%p %p %p %04x %p)\n", dest, first, last, fmtflags, loc); +#if _MSVCP_VER <= 100 + cvt = &this->cvt; +#else + cvt = &ctype_wchar_use_facet(loc)->cvt; +#endif + for(i=0; i<10; i++) - digits[i] = mb_to_wc('0'+i, &this->cvt); + digits[i] = mb_to_wc('0'+i, cvt); for(i=0; i<6; i++) { - digits[10+i] = mb_to_wc('a'+i, &this->cvt); - digits[16+i] = mb_to_wc('A'+i, &this->cvt); + digits[10+i] = mb_to_wc('a'+i, cvt); + digits[16+i] = mb_to_wc('A'+i, cvt); } numpunct_wchar_grouping(numpunct, &grouping_bstr); @@ -5353,10 +5369,10 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator base = 10; istreambuf_iterator_wchar_val(first); - if(first->strbuf && first->val==mb_to_wc('-', &this->cvt)) { + if(first->strbuf && first->val==mb_to_wc('-', cvt)) { *dest++ = '-'; istreambuf_iterator_wchar_inc(first); - }else if(first->strbuf && first->val==mb_to_wc('+', &this->cvt)) { + }else if(first->strbuf && first->val==mb_to_wc('+', cvt)) { *dest++ = '+'; istreambuf_iterator_wchar_inc(first); } @@ -5364,7 +5380,7 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator if(first->strbuf && first->val==digits[0]) { found_zero = TRUE; istreambuf_iterator_wchar_inc(first); - if(first->strbuf && (first->val==mb_to_wc('x', &this->cvt) || first->val==mb_to_wc('X', &this->cvt))) { + if(first->strbuf && (first->val==mb_to_wc('x', cvt) || first->val==mb_to_wc('X', cvt))) { if(!base || base == 22) { found_zero = FALSE; istreambuf_iterator_wchar_inc(first); @@ -6191,7 +6207,9 @@ DEFINE_THISCALL_WRAPPER(num_get_char__Init, 8) void __thiscall num_get_char__Init(num_get *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER <= 100 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a841f91..86b787b 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -510,7 +510,9 @@ unsigned short __thiscall basic_streambuf_wchar_sputc(basic_streambuf_wchar*, wc /* class num_get<char> */ typedef struct { locale_facet facet; +#if _MSVCP_VER <= 100 _Cvtvec cvt; +#endif } num_get; num_get* num_get_char_use_facet(const locale*);

1 0