wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Daniel Ansorregui : d3d11/tests: Add a blend factor test.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: dfeb51492946c22b465602f04f5d6634032248fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeb51492946c22b465602f0… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Thu Oct 18 02:29:14 2018 +0330 d3d11/tests: Add a blend factor test. Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0939990..74b429f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6241,7 +6241,7 @@ static void test_device_context_state(void) static void test_blend(void) { - ID3D11BlendState *src_blend, *dst_blend; + ID3D11BlendState *src_blend, *dst_blend, *dst_blend_factor; struct d3d11_test_context test_context; ID3D11RenderTargetView *offscreen_rtv; D3D11_TEXTURE2D_DESC texture_desc; @@ -6333,7 +6333,7 @@ static void test_blend(void) {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float blend_factor[] = {0.3f, 0.4f, 0.8f, 0.9f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; if (!init_test_context(&test_context, NULL)) @@ -6374,6 +6374,14 @@ static void test_blend(void) hr = ID3D11Device_CreateBlendState(device, &blend_desc, &dst_blend); ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_BLEND_FACTOR; + blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_BLEND_FACTOR; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_DEST_ALPHA; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA; + + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &dst_blend_factor); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); stride = sizeof(*quads); @@ -6384,9 +6392,9 @@ static void test_blend(void) ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); - ID3D11DeviceContext_OMSetBlendState(context, src_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, src_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 0); - ID3D11DeviceContext_OMSetBlendState(context, dst_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, dst_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 4); color = get_texture_color(test_context.backbuffer, 320, 360); @@ -6394,6 +6402,17 @@ static void test_blend(void) color = get_texture_color(test_context.backbuffer, 320, 120); ok(compare_color(color, 0xa080007f, 1), "Got unexpected color 0x%08x.\n", color); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + + ID3D11DeviceContext_OMSetBlendState(context, dst_blend_factor, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_Draw(context, 4, 0); + ID3D11DeviceContext_Draw(context, 4, 4); + + color = get_texture_color(test_context.backbuffer, 320, 360); + ok(compare_color(color, 0x600066b3, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 320, 120); + ok(compare_color(color, 0xa0cc00b3, 1), "Got unexpected color 0x%08x.\n", color); + texture_desc.Width = 128; texture_desc.Height = 128; texture_desc.MipLevels = 1; @@ -6422,9 +6441,9 @@ static void test_blend(void) ID3D11DeviceContext_ClearRenderTargetView(context, offscreen_rtv, red); - ID3D11DeviceContext_OMSetBlendState(context, src_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, src_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 0); - ID3D11DeviceContext_OMSetBlendState(context, dst_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, dst_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 4); color = get_texture_color(offscreen, 64, 96) & 0x00ffffff; @@ -6435,6 +6454,7 @@ static void test_blend(void) ID3D11RenderTargetView_Release(offscreen_rtv); ID3D11Texture2D_Release(offscreen); done: + ID3D11BlendState_Release(dst_blend_factor); ID3D11BlendState_Release(dst_blend); ID3D11BlendState_Release(src_blend); ID3D11PixelShader_Release(ps);

1 0

Daniel Ansorregui : wined3d: Store the blend factor as a struct wined3d_color.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: 3d4dd7a06e87ed7ea554c167802ff057a6c313dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d4dd7a06e87ed7ea554c167… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Thu Oct 18 02:29:13 2018 +0330 wined3d: Store the blend factor as a struct wined3d_color. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 - dlls/d3d11/device.c | 23 ++++++----------------- dlls/d3d9/device.c | 39 ++++++++++++++++++++++++++++++++------- dlls/wined3d/cs.c | 15 ++++++++++++--- dlls/wined3d/device.c | 29 ++++++++++++++++++++--------- dlls/wined3d/state.c | 17 +++++++++-------- dlls/wined3d/stateblock.c | 27 +++++++++++++++++++++++++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 12 +++++++++--- include/wine/wined3d.h | 7 ++++--- 11 files changed, 121 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d4dd7a06e87ed7ea554…

1 0

Jacek Caban : mshtml: Return S_OK in IHTMLDocument2::put_charset.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: 481360f472b91e1a91c0f1d51183ca3be88ff2ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=481360f472b91e1a91c0f1d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 16:18:05 2018 +0200 mshtml: Return S_OK in IHTMLDocument2::put_charset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38189 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 17c9e63..fc22fa5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -910,8 +910,8 @@ static HRESULT WINAPI HTMLDocument_get_expando(IHTMLDocument2 *iface, VARIANT_BO static HRESULT WINAPI HTMLDocument_put_charset(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + FIXME("(%p)->(%s) returning S_OK\n", This, debugstr_w(v)); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_charset(IHTMLDocument2 *iface, BSTR *p)

1 0

Jacek Caban : rpcrt4/tests: Add a test of client reconnecting on send failure.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: cae3d28a9bd9221ff8acf1aaa5eb41c27744d9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae3d28a9bd9221ff8acf1aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:58:07 2018 +0200 rpcrt4/tests: Add a test of client reconnecting on send failure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 163 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 148 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 1494904..587dc45 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1973,6 +1973,118 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcStringFree\n"); } +HANDLE create_server_process(void) +{ + SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; + HANDLE ready_event; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + DWORD ret; + + memset(&startup, 0, sizeof startup); + startup.cb = sizeof startup; + + ready_event = CreateEventW(&sec_attr, TRUE, FALSE, NULL); + ok(ready_event != NULL, "CreateEvent failed: %u\n", GetLastError()); + + sprintf(cmdline, "%s server run %lx", progname, (UINT_PTR)ready_event); + trace("running server process...\n"); + ok(CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + ret = WaitForSingleObject(ready_event, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + + ok(CloseHandle(info.hThread), "CloseHandle\n"); + ok(CloseHandle(ready_event), "CloseHandle\n"); + return info.hProcess; +} + +static void run_server(HANDLE ready_event) +{ + static unsigned char np[] = "ncacn_np"; + static unsigned char pipe[] = PIPE "term_test"; + RPC_STATUS status; + BOOL ret; + + status = RpcServerUseProtseqEpA(np, 0, pipe, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status %d\n", status); + + status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); + + test_is_server_listening(NULL, RPC_S_NOT_LISTENING); + status = RpcServerListen(1, 20, TRUE); + ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); + + stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(stop_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + ret = SetEvent(ready_event); + ok(ret, "SetEvent failed: %u\n", GetLastError()); + + ret = WaitForSingleObject(stop_event, 1000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + + status = RpcMgmtWaitServerListen(); + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); + + CloseHandle(stop_event); + stop_event = NULL; +} + +static DWORD WINAPI basic_tests_thread(void *arg) +{ + basic_tests(); + return 0; +} + +static void test_reconnect(void) +{ + static unsigned char np[] = "ncacn_np"; + static unsigned char address_np[] = "\\\\."; + static unsigned char pipe[] = PIPE "term_test"; + unsigned char *binding; + HANDLE threads[32]; + HANDLE server_process; + unsigned i; + DWORD ret; + + server_process = create_server_process(); + + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, np, address_np, pipe, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + + for (i = 0; i < ARRAY_SIZE(threads); i++) + { + threads[i] = CreateThread(NULL, 0, basic_tests_thread, 0, 0, NULL); + ok(threads[i] != NULL, "CreateThread failed: %u\n", GetLastError()); + } + + for (i = 0; i < ARRAY_SIZE(threads); i++) + { + ret = WaitForSingleObject(threads[i], 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + CloseHandle(threads[i]); + } + + stop(); + + winetest_wait_child_process(server_process); + ok(CloseHandle(server_process), "CloseHandle\n"); + + /* create new server, rpcrt4 will connect to it once sending to existing connection fails + * that current connection is broken. */ + server_process = create_server_process(); + basic_tests(); + stop(); + + winetest_wait_child_process(server_process); + ok(CloseHandle(server_process), "CloseHandle\n"); + + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); +} + static BOOL is_process_elevated(void) { HANDLE token; @@ -2099,16 +2211,10 @@ START_TEST(server) ULONG size = 0; int argc; char **argv; - BOOL firewall_enabled = is_firewall_enabled(); + BOOL firewall_enabled = is_firewall_enabled(), firewall_disabled = FALSE; InitFunctionPointers(); - if (firewall_enabled && !is_process_elevated()) - { - trace("no privileges, skipping tests to avoid firewall dialog\n"); - return; - } - ok(!GetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); ok(GetUserNameExA(NameSamCompatible, domain_and_user, &size), "GetUserNameExA\n"); @@ -2130,23 +2236,50 @@ START_TEST(server) } else if (argc == 4) { - test_server_listening(); + if (!strcmp(argv[3], "listen")) + { + test_server_listening(); + } + else if(!strcmp(argv[2], "run")) + { + UINT_PTR event; + sscanf(argv[3], "%lx", &event); + run_server((HANDLE)event); + } } else { if (firewall_enabled) { - HRESULT hr = set_firewall(APP_ADD); - if (hr != S_OK) + if (is_process_elevated()) { - skip("can't authorize app in firewall %08x\n", hr); - HeapFree(GetProcessHeap(), 0, domain_and_user); - return; + HRESULT hr = set_firewall(APP_ADD); + if (hr == S_OK) + { + firewall_enabled = FALSE; + firewall_disabled = TRUE; + } + else + { + skip("can't authorize app in firewall %08x\n", hr); + } + } + else + { + trace("no privileges, skipping tests to avoid firewall dialog\n"); } } - server(); + + if (!firewall_enabled) server(); + + /* Those tests cause occasional crashes on winxp and win2k3 */ + if (GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "RpcExceptionFilter")) + test_reconnect(); + else + win_skip("Skipping reconnect tests on too old Windows version\n"); + run_client("test listen"); - if (firewall_enabled) set_firewall(APP_REMOVE); + if (firewall_disabled) set_firewall(APP_REMOVE); } HeapFree(GetProcessHeap(), 0, domain_and_user);

1 0

Jacek Caban : rpcrt4: Add RpcExceptionFilter implementation.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: 8a48621fc9b56d0ca68e89dd3d6720cd2c4d8db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a48621fc9b56d0ca68e89dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:57:37 2018 +0200 rpcrt4: Add RpcExceptionFilter implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 3 ++- dlls/rpcrt4/rpcrt4_main.c | 3 ++- dlls/rpcrt4/tests/rpc.c | 23 ++++++++++++----------- include/rpcdce.h | 2 ++ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index aa30ee7..0dc6789 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -42,7 +42,7 @@ @ stub I_RpcConnectionSetSockBuffSize @ stub I_RpcDeleteMutex @ stub I_RpcEnableWmiTrace # wxp -@ stdcall I_RpcExceptionFilter(long) +@ stdcall I_RpcExceptionFilter(long) RpcExceptionFilter @ stdcall I_RpcFree(ptr) @ stdcall I_RpcFreeBuffer(ptr) @ stub I_RpcFreePipeBuffer @@ -383,6 +383,7 @@ @ stub RpcErrorResetEnumeration # wxp @ stdcall RpcErrorSaveErrorInfo(ptr ptr ptr) @ stdcall RpcErrorStartEnumeration(ptr) +@ stdcall RpcExceptionFilter(long) @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index d5d349d..b274139 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -854,9 +854,10 @@ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) } /****************************************************************************** + * RpcExceptionFilter (rpcrt4.@) * I_RpcExceptionFilter (rpcrt4.@) */ -int WINAPI I_RpcExceptionFilter(ULONG ExceptionCode) +int WINAPI RpcExceptionFilter(ULONG ExceptionCode) { TRACE("0x%x\n", ExceptionCode); switch (ExceptionCode) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index c9f2a4b..d3a3aee 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -649,15 +649,15 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } -static void test_I_RpcExceptionFilter(void) +static void test_RpcExceptionFilter(const char *func_name) { ULONG exception; int retval; - int (WINAPI *pI_RpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "I_RpcExceptionFilter"); + int (WINAPI *pRpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), func_name); - if (!pI_RpcExceptionFilter) + if (!pRpcExceptionFilter) { - win_skip("I_RpcExceptionFilter not exported\n"); + win_skip("%s not exported\n", func_name); return; } @@ -668,7 +668,7 @@ static void test_I_RpcExceptionFilter(void) if (exception == 0x40000005) exception = 0x80000000; if (exception == 0x80000005) exception = 0xc0000000; - retval = pI_RpcExceptionFilter(exception); + retval = pRpcExceptionFilter(exception); switch (exception) { case STATUS_DATATYPE_MISALIGNMENT: @@ -679,17 +679,17 @@ static void test_I_RpcExceptionFilter(void) case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: case STATUS_POSSIBLE_DEADLOCK: - ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", - exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval == EXCEPTION_CONTINUE_SEARCH, "%s(0x%x) should have returned %d instead of %d\n", + func_name, exception, EXCEPTION_CONTINUE_SEARCH, retval); break; case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: - trace("I_RpcExceptionFilter(0x%x) returned %d\n", exception, retval); + trace("%s(0x%x) returned %d\n", func_name, exception, retval); break; default: - ok(retval == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", - exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval == EXCEPTION_EXECUTE_HANDLER, "%s(0x%x) should have returned %d instead of %d\n", + func_name, exception, EXCEPTION_EXECUTE_HANDLER, retval); } } } @@ -1198,7 +1198,8 @@ START_TEST( rpc ) test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); - test_I_RpcExceptionFilter(); + test_RpcExceptionFilter("I_RpcExceptionFilter"); + test_RpcExceptionFilter("RpcExceptionFilter"); test_RpcStringBindingFromBinding(); test_UuidCreate(); test_UuidCreateSequential(); diff --git a/include/rpcdce.h b/include/rpcdce.h index ee01d88..fc1fcea 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -325,6 +325,8 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer); RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); +RPCRTAPI int RPC_ENTRY RpcExceptionFilter(ULONG); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingCopy( RPC_BINDING_HANDLE SourceBinding, RPC_BINDING_HANDLE* DestinationBinding );

1 0

Jacek Caban : rpcrt4/tests: Get rid of no longer needed win9x checks.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: d6c94be74d166a42321548808e482873e2c0685f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c94be74d166a4232154880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:57:08 2018 +0200 rpcrt4/tests: Get rid of no longer needed win9x checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 32 +++++++++----------------------- dlls/rpcrt4/tests/rpc_async.c | 23 ++++++----------------- 2 files changed, 15 insertions(+), 40 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2695d46..d65b730 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2187,11 +2187,6 @@ static void test_conf_complex_array(void) #endif expected_length = (4 + memsrc.dim1 * (2 + memsrc.dim2)) * 4; - if (StubMsg.BufferLength == 96) - { - win_skip("Tests crash on Win9x, WinMe and NT4\n"); - goto cleanup; - } ok(StubMsg.BufferLength >= expected_length, "length %d\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ @@ -2261,7 +2256,6 @@ static void test_conf_complex_array(void) HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); -cleanup: for(i = 0; i < memsrc.dim1; i++) HeapFree(GetProcessHeap(), 0, memsrc.array[i]); HeapFree(GetProcessHeap(), 0, memsrc.array); @@ -2397,14 +2391,6 @@ static void test_NdrGetUserMarshalInfo(void) unsigned char buffer[16]; void *rpc_channel_buffer = (void *)(ULONG_PTR)0xcafebabe; RPC_MESSAGE rpc_msg; - RPC_STATUS (RPC_ENTRY *pNdrGetUserMarshalInfo)(ULONG *,ULONG,NDR_USER_MARSHAL_INFO *); - - pNdrGetUserMarshalInfo = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "NdrGetUserMarshalInfo"); - if (!pNdrGetUserMarshalInfo) - { - skip("NdrGetUserMarshalInfo not exported\n"); - return; - } /* unmarshall */ @@ -2432,7 +2418,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2466,7 +2452,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2500,7 +2486,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2534,7 +2520,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2566,7 +2552,7 @@ static void test_NdrGetUserMarshalInfo(void) umcb.CBType = USER_MARSHAL_CB_MARSHALL; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( U1(umi).Level1.BufferSize == 0, "umi.Level1.BufferSize was %u instead of 0\n", @@ -2575,22 +2561,22 @@ static void test_NdrGetUserMarshalInfo(void) /* error conditions */ rpc_msg.BufferLength = 14; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == ERROR_INVALID_USER_BUFFER, "NdrGetUserMarshalInfo should have failed with ERROR_INVALID_USER_BUFFER instead of %d\n", status); rpc_msg.BufferLength = 15; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 9999, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 9999, &umi); ok(status == RPC_S_INVALID_ARG, "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); umcb.CBType = 9999; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); umcb.CBType = USER_MARSHAL_CB_MARSHALL; umcb.Signature = 0; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_INVALID_ARG, "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); } diff --git a/dlls/rpcrt4/tests/rpc_async.c b/dlls/rpcrt4/tests/rpc_async.c index 555c58f..15c57fe 100644 --- a/dlls/rpcrt4/tests/rpc_async.c +++ b/dlls/rpcrt4/tests/rpc_async.c @@ -25,9 +25,6 @@ #include <rpc.h> #include <rpcasync.h> -static RPC_STATUS (RPC_ENTRY *pRpcAsyncInitializeHandle)(PRPC_ASYNC_STATE,unsigned int); -static RPC_STATUS (RPC_ENTRY *pRpcAsyncGetCallStatus)(PRPC_ASYNC_STATE); - static void test_RpcAsyncInitializeHandle(void) { char buffer[256]; @@ -36,15 +33,15 @@ static void test_RpcAsyncInitializeHandle(void) int i; void *unset_ptr; - status = pRpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer)); + status = RpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer)); ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status); - status = pRpcAsyncInitializeHandle(&async, sizeof(async) - 1); + status = RpcAsyncInitializeHandle(&async, sizeof(async) - 1); ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status); memset(&async, 0xcc, sizeof(async)); memset(&unset_ptr, 0xcc, sizeof(unset_ptr)); - status = pRpcAsyncInitializeHandle(&async, sizeof(async)); + status = RpcAsyncInitializeHandle(&async, sizeof(async)); ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status); ok(async.Size == sizeof(async), "async.Size wrong: %d\n", async.Size); @@ -65,29 +62,21 @@ static void test_RpcAsyncGetCallStatus(void) RPC_ASYNC_STATE async; RPC_STATUS status; - status = pRpcAsyncInitializeHandle(&async, sizeof(async)); + status = RpcAsyncInitializeHandle(&async, sizeof(async)); ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status); - status = pRpcAsyncGetCallStatus(&async); + status = RpcAsyncGetCallStatus(&async); todo_wine ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status); memset(&async, 0, sizeof(async)); - status = pRpcAsyncGetCallStatus(&async); + status = RpcAsyncGetCallStatus(&async); todo_wine ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status); } START_TEST( rpc_async ) { - HMODULE hRpcRt4 = GetModuleHandleA("rpcrt4.dll"); - pRpcAsyncInitializeHandle = (void *)GetProcAddress(hRpcRt4, "RpcAsyncInitializeHandle"); - pRpcAsyncGetCallStatus = (void *)GetProcAddress(hRpcRt4, "RpcAsyncGetCallStatus"); - if (!pRpcAsyncInitializeHandle || !pRpcAsyncGetCallStatus) - { - win_skip("asynchronous functions not available\n"); - return; - } test_RpcAsyncInitializeHandle(); test_RpcAsyncGetCallStatus(); }

1 0

Piotr Caban : msvcrt: Don't forward strpbrk to ntdll.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: c99d14d04de1e3958b6f293f79422a40367308ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c99d14d04de1e3958b6f293f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:37 2018 +0200 msvcrt: Don't forward strpbrk to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d39d8d8..1579415 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1813,7 +1813,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4df968d..029620f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2171,7 +2171,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5e21169..89002ed 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2381,7 +2381,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 28a9ddc..bda8160 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -821,7 +821,7 @@ @ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 3b7f1cf..124b73b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -817,7 +817,7 @@ @ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8f35c54..7aebe34 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1493,7 +1493,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9c6a13..eb70ff9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1466,7 +1466,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 16f1790..d963f7c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1434,7 +1434,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 513f3b2..cbbb65b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2052,3 +2052,11 @@ MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) { return strcspn( str, reject ); } + +/********************************************************************* + * strpbrk (MSVCRT.@) + */ +char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) +{ + return strpbrk(str, accept); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8838302..404da75 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2512,7 +2512,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr

1 0

Piotr Caban : msvcrt: Don't forward strcspn to ntdll.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: f43ae5e8034c1c9afd339e1aa1be8d013eb0f68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f43ae5e8034c1c9afd339e1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:29 2018 +0200 msvcrt: Don't forward strcspn to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 61f72f0..d39d8d8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1802,7 +1802,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4edad71..4df968d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2160,7 +2160,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7d18e14..5e21169 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2370,7 +2370,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index ac2eb95..28a9ddc 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -814,7 +814,7 @@ @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 20a37eb..3b7f1cf 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -810,7 +810,7 @@ @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 544483c..8f35c54 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1482,7 +1482,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 40dc508..a9c6a13 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1455,7 +1455,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5db436a..16f1790 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e0e620f..513f3b2 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2044,3 +2044,11 @@ int __cdecl MSVCRT__memicmp(const char *s1, const char *s2, MSVCRT_size_t len) { return MSVCRT__memicmp_l(s1, s2, len, NULL); } + +/********************************************************************* + * strcspn (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) +{ + return strcspn( str, reject ); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bc650ff..8838302 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2501,7 +2501,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime

1 0

Piotr Caban : msvcrt: Don't forward wcstol to ntdll.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: 48dbb1786195167b862a6e8c163adb52e4801e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48dbb1786195167b862a6e8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:22 2018 +0200 msvcrt: Don't forward wcstol to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2ee8953..61f72f0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1879,7 +1879,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3a42bb8..4edad71 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2237,7 +2237,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index bbdb774..7d18e14 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2474,7 +2474,7 @@ @ stub wcstoimax @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 96e9b8e..ac2eb95 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -867,7 +867,7 @@ @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ef9fdb8..20a37eb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -863,7 +863,7 @@ @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 94fc2c3..544483c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1559,7 +1559,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c467c9d..40dc508 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1532,7 +1532,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ded47de..5db436a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1505,7 +1505,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7717336..77099f6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2225,6 +2225,15 @@ MSVCRT_long CDECL MSVCRT__wcstol_l(const MSVCRT_wchar_t *s, } /********************************************************************* + * wcstol (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_wcstol(const MSVCRT_wchar_t *s, + MSVCRT_wchar_t **end, int base) +{ + return MSVCRT__wcstol_l(s, end, base, NULL); +} + +/********************************************************************* * _wtoi_l (MSVCRT.@) */ int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c26d103..bc650ff 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2581,7 +2581,7 @@ @ stub wcstoimax @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs

1 0

Piotr Caban : msvcrt: Don't forward wcsrchr to ntdll.
by Alexandre Julliard 17 Oct '18

17 Oct '18

Module: wine Branch: master Commit: c69de2c27c0002ca9ccd227d3a6c2e69f68c7eef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69de2c27c0002ca9ccd227d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:08 2018 +0200 msvcrt: Don't forward wcsrchr to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cdb46a3..2ee8953 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1871,7 +1871,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81dcecd..3a42bb8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2229,7 +2229,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 338eb69..bbdb774 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2464,7 +2464,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index c074378..96e9b8e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -862,7 +862,7 @@ @ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f760979..ef9fdb8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -858,7 +858,7 @@ @ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b65d34..94fc2c3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1551,7 +1551,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f55bf6d..c467c9d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1524,7 +1524,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6ca3e51..ded47de 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1497,7 +1497,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9d861d9..7717336 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2439,6 +2439,14 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch return strchrW(str, ch); } +/********************************************************************* + * wcsrchr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT_wcsrchr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) +{ + return strrchrW(str, ch); +} + /*********************************************************************** * wcslen (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3e1cb55..c26d103 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2571,7 +2571,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
61
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 October 2018