March 2018 - Wine-Devel - list.winehq.org

[PATCH] msvcrt: gets() should handle EOF on stdin gracefully
by James Woodcock March 2, 2018

March 2, 2018

I was asked to send the patch for Bug 44550 here. ReactOS ftp.exe enters an endless loop when the user closes stdin by entering CTRL-Z. This patch makes gets() and wgets() return EOF if the input buffer is empty and stdin is closed. diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6d0c1ae60c..136f9e68be 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4717,6 +4717,13 @@ char * CDECL MSVCRT_gets(char *buf) cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) if(cc != '\r') *buf++ = (char)cc; + if ((cc == MSVCRT_EOF) && (buf_start == buf)) /* If nothing read, return 0*/ + { + TRACE(":nothing read\n"); + MSVCRT__unlock_file(MSVCRT_stdin); + return NULL; + } + *buf = '\0'; TRACE("got '%s'\n", buf_start); @@ -4739,6 +4746,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) if (cc != '\r') *buf++ = (MSVCRT_wchar_t)cc; } + + if ((cc == MSVCRT_WEOF) && (ws == buf)) /* If nothing read, return 0*/ + { + TRACE(":nothing read\n"); + MSVCRT__unlock_file(MSVCRT_stdin); + return NULL; + } + *buf = '\0'; TRACE("got %s\n", debugstr_w(ws));

2 1

[PATCH] d3dx9: Improve argument validation in CloneEffect()
by Nikolay Sivov March 2, 2018

March 2, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 9 +++++ dlls/d3dx9_36/tests/effect.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f8c480303c..a98495e555 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4367,6 +4367,15 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, FIXME("(%p)->(%p, %p): stub\n", This, device, effect); + if (!effect) + return D3DERR_INVALIDCALL; + + if (This->base_effect.flags & D3DXFX_NOT_CLONEABLE) + return E_FAIL; + + if (!device) + return D3DERR_INVALIDCALL; + return E_NOTIMPL; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 1900f3eac1..28dcf47cd3 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7294,6 +7294,91 @@ static void test_effect_null_shader(void) DestroyWindow(window); } +static void test_effect_clone(IDirect3DDevice9 *device) +{ + D3DPRESENT_PARAMETERS present_parameters; + ID3DXEffect *effect, *cloned; + IDirect3DDevice9 *device2; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + + /* D3DXFX_NOT_CLONEABLE */ + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, D3DXFX_NOT_CLONEABLE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, NULL, &cloned); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + hr = effect->lpVtbl->CloneEffect(effect, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, device, &cloned); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + effect->lpVtbl->Release(effect); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, NULL, &cloned); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + hr = effect->lpVtbl->CloneEffect(effect, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, device, &cloned); +todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); +if (hr == D3D_OK) +{ + ok(cloned != effect, "Expected new effect instance.\n"); + cloned->lpVtbl->Release(cloned); +} + /* Try with different device. */ + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Failed to get IDirect3D9 pointer.\n"); + + window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a test window.\n"); + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device2); + ok(SUCCEEDED(hr), "Failed to create IDirect3DDevice9 object, hr %#x\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, device2, &cloned); +todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); +if (hr == D3D_OK) +{ + ok(cloned != effect, "Expected new effect instance.\n"); + cloned->lpVtbl->Release(cloned); +} + IDirect3DDevice9_Release(device2); + IDirect3D9_Release(d3d); + DestroyWindow(window); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -7346,6 +7431,7 @@ START_TEST(effect) test_effect_large_address_aware_flag(device); test_effect_get_pass_desc(device); test_effect_skip_constants(device); + test_effect_clone(device); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.16.1

4 5

[PATCH] kernelbase: Implement PathCchAddBackslash()/PathCchAddBackslashEx()
by Nikolay Sivov March 2, 2018

March 2, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Added separate source file - on Win10 older path manipulation functions from shlwapi are reimplemented in kernelbase.dll, so we'll need to move them there too in order to avoid forwarding to shlwapi. .../api-ms-win-core-path-l1-1-0.spec | 4 +- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/path.c | 67 ++++++++++ dlls/kernelbase/tests/path.c | 136 +++++++++++++++++++++ include/pathcch.h | 2 + tools/make_specfiles | 1 + 7 files changed, 212 insertions(+), 5 deletions(-) create mode 100644 dlls/kernelbase/path.c diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index cb10d89773..287c5d61d9 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub PathAllocCanonicalize @ stub PathAllocCombine -@ stub PathCchAddBackslash -@ stub PathCchAddBackslashEx +@ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash +@ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx @ stub PathCchAddExtension @ stub PathCchAppend @ stub PathCchAppendEx diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 74df98ce2d..a7db45e4c1 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,4 +1,5 @@ MODULE = kernelbase.dll C_SRCS = \ - main.c + main.c \ + path.c diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index aa67372cf5..eafe5ab9dd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1029,8 +1029,8 @@ @ stdcall PathAppendW(wstr wstr) shlwapi.PathAppendW @ stdcall PathCanonicalizeA(ptr str) shlwapi.PathCanonicalizeA @ stdcall PathCanonicalizeW(ptr wstr) shlwapi.PathCanonicalizeW -# @ stub PathCchAddBackslash -# @ stub PathCchAddBackslashEx +@ stdcall PathCchAddBackslash(wstr long) +@ stdcall PathCchAddBackslashEx(wstr long ptr ptr) # @ stub PathCchAddExtension # @ stub PathCchAppend # @ stub PathCchAppendEx diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c new file mode 100644 index 0000000000..373c34e979 --- /dev/null +++ b/dlls/kernelbase/path.c @@ -0,0 +1,67 @@ +/* + * Copyright 2018 Nikolay Sivov + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "pathcch.h" +#include "strsafe.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(path); + +HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) +{ + return PathCchAddBackslashEx(path, size, NULL, NULL); +} + +HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, SIZE_T *remaining) +{ + BOOL needs_termination; + SIZE_T length; + + TRACE("%s, %lu, %p, %p\n", debugstr_w(path), size, endptr, remaining); + + length = strlenW(path); + needs_termination = size && length && path[length - 1] != '\\'; + + if (length >= (needs_termination ? size - 1 : size)) + { + if (endptr) *endptr = NULL; + if (remaining) *remaining = 0; + return STRSAFE_E_INSUFFICIENT_BUFFER; + } + + if (!needs_termination) + { + if (endptr) *endptr = path + length; + if (remaining) *remaining = size - length; + return S_FALSE; + } + + path[length++] = '\\'; + path[length] = 0; + + if (endptr) *endptr = path + length; + if (remaining) *remaining = size - length; + + return S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index fbe1d3be2f..47c77b8c34 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -29,6 +29,8 @@ #include "wine/test.h" +HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); +HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); static const struct @@ -113,11 +115,145 @@ static void test_PathCchCombineEx(void) } } +struct addbackslash_test +{ + const char *path; + const char *result; + HRESULT hr; + SIZE_T size; + SIZE_T remaining; +}; + +static const struct addbackslash_test addbackslash_tests[] = +{ + { "C:", "C:\\", S_OK, MAX_PATH, MAX_PATH - 3 }, + { "a.txt", "a.txt\\", S_OK, MAX_PATH, MAX_PATH - 6 }, + { "a/b", "a/b\\", S_OK, MAX_PATH, MAX_PATH - 4 }, + + { "C:\\", "C:\\", S_FALSE, MAX_PATH, MAX_PATH - 3 }, + { "C:\\", "C:\\", S_FALSE, 4, 1 }, + + { "C:", "C:", STRSAFE_E_INSUFFICIENT_BUFFER, 2, 0 }, + { "C:", "C:", STRSAFE_E_INSUFFICIENT_BUFFER, 3, 1 }, + { "C:\\", "C:\\", STRSAFE_E_INSUFFICIENT_BUFFER, 2, 0 }, + { "C:\\", "C:\\", STRSAFE_E_INSUFFICIENT_BUFFER, 3, 0 }, + { "C:\\", "C:\\", STRSAFE_E_INSUFFICIENT_BUFFER, 0, 0 }, + { "C:", "C:", STRSAFE_E_INSUFFICIENT_BUFFER, 0, 0 }, +}; + +static void test_PathCchAddBackslash(void) +{ + WCHAR pathW[MAX_PATH]; + unsigned int i; + HRESULT hr; + + if (!pPathCchAddBackslash) + { + win_skip("PathCchAddBackslash() is not availale.\n"); + return; + } + + pathW[0] = 0; + hr = pPathCchAddBackslash(pathW, 0); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + ok(pathW[0] == 0, "Unexpected path.\n"); + + pathW[0] = 0; + hr = pPathCchAddBackslash(pathW, 1); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(pathW[0] == 0, "Unexpected path.\n"); + + pathW[0] = 0; + hr = pPathCchAddBackslash(pathW, 2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(pathW[0] == 0, "Unexpected path.\n"); + + for (i = 0; i < sizeof(addbackslash_tests)/sizeof(addbackslash_tests[0]); i++) + { + const struct addbackslash_test *test = &addbackslash_tests[i]; + char path[MAX_PATH]; + + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + hr = pPathCchAddBackslash(pathW, test->size); + ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); + + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, sizeof(path)/sizeof(path[0]), NULL, NULL); + ok(!strcmp(path, test->result), "%u: unexpected resulting path %s.\n", i, path); + } +} + +static void test_PathCchAddBackslashEx(void) +{ + WCHAR pathW[MAX_PATH]; + SIZE_T remaining; + unsigned int i; + HRESULT hr; + WCHAR *ptrW; + + if (!pPathCchAddBackslashEx) + { + win_skip("PathCchAddBackslashEx() is not availale.\n"); + return; + } + + pathW[0] = 0; + hr = pPathCchAddBackslashEx(pathW, 0, NULL, NULL); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + ok(pathW[0] == 0, "Unexpected path.\n"); + + pathW[0] = 0; + ptrW = (void *)0xdeadbeef; + remaining = 123; + hr = pPathCchAddBackslashEx(pathW, 1, &ptrW, &remaining); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(pathW[0] == 0, "Unexpected path.\n"); + ok(ptrW == pathW, "Unexpected endptr %p.\n", ptrW); + ok(remaining == 1, "Unexpected remaining size.\n"); + + pathW[0] = 0; + hr = pPathCchAddBackslashEx(pathW, 2, NULL, NULL); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(pathW[0] == 0, "Unexpected path.\n"); + + for (i = 0; i < sizeof(addbackslash_tests)/sizeof(addbackslash_tests[0]); i++) + { + const struct addbackslash_test *test = &addbackslash_tests[i]; + char path[MAX_PATH]; + + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + hr = pPathCchAddBackslashEx(pathW, test->size, NULL, NULL); + ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); + + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, sizeof(path)/sizeof(path[0]), NULL, NULL); + ok(!strcmp(path, test->result), "%u: unexpected resulting path %s.\n", i, path); + + ptrW = (void *)0xdeadbeef; + remaining = 123; + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + hr = pPathCchAddBackslashEx(pathW, test->size, &ptrW, &remaining); + ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); + if (SUCCEEDED(hr)) + { + ok(ptrW == (pathW + lstrlenW(pathW)), "%u: unexpected end pointer.\n", i); + ok(remaining == test->remaining, "%u: unexpected remaining buffer length.\n", i); + } + else + { + ok(ptrW == NULL, "%u: unexpecred end pointer.\n", i); + ok(remaining == 0, "%u: unexpected remaining buffer length.\n", i); + } + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); + pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); + pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); test_PathCchCombineEx(); + test_PathCchAddBackslash(); + test_PathCchAddBackslashEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 8831c5238d..2b2aed4c8f 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -23,4 +23,6 @@ #define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 #define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 +HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); +HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); diff --git a/tools/make_specfiles b/tools/make_specfiles index 1e8a894277..e9bc1f4d8d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -303,6 +303,7 @@ my @dll_groups = [ "kernelbase", "api-ms-win-appmodel-runtime-l1-1-2", + "api-ms-win-core-path-l1-1-0", "api-ms-win-core-quirks-l1-1-0", "api-ms-win-security-grouppolicy-l1-1-0", ], -- 2.16.1

1 0

[PATCH 4/4] wbemprox/tests: Add tests for Win32_Printer.
by Hans Leidekker March 2, 2018

March 2, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 93d07ea28b..d95fdd970b 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1641,6 +1641,71 @@ static void test_Win32_VideoController( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Printer( IWbemServices *services ) +{ + static const WCHAR deviceidW[] = + {'D','e','v','i','c','e','I','d',0}; + static const WCHAR locationW[] = + {'L','o','c','a','t','i','o','n',0}; + static const WCHAR portnameW[] = + {'P','o','r','t','N','a','m','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','r','i','n','t','e','r',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_Printer not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, deviceidW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "deviceid %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, locationW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "location %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, portnameW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "portname %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + } + + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1684,6 +1749,7 @@ START_TEST(query) test_Win32_IP4RouteTable( services ); test_Win32_Processor( services ); test_Win32_VideoController( services ); + test_Win32_Printer( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.11.0

1 0

[PATCH 3/4] wbemprox: Provide DeviceID, Location and PortName for printers.
by Hans Leidekker March 2, 2018

March 2, 2018

From: Michael Müller <michael(a)fds-team.de> For bug 40539. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 752325e6a2..33a951b0ca 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -269,6 +269,8 @@ static const WCHAR prop_localdatetimeW[] = {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; +static const WCHAR prop_locationW[] = + {'L','o','c','a','t','i','o','n',0}; static const WCHAR prop_lockpresentW[] = {'L','o','c','k','P','r','e','s','e','n','t',0}; static const WCHAR prop_macaddressW[] = @@ -315,6 +317,8 @@ static const WCHAR prop_pixelsperxlogicalinchW[] = {'P','i','x','e','l','s','P','e','r','X','L','o','g','i','c','a','l','I','n','c','h',0}; static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; +static const WCHAR prop_portnameW[] = + {'P','o','r','t','N','a','m','e',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_primaryW[] = @@ -604,11 +608,14 @@ static const struct column col_physicalmemory[] = static const struct column col_printer[] = { { prop_attributesW, CIM_UINT32 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_drivernameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_horizontalresolutionW, CIM_UINT32 }, { prop_localW, CIM_BOOLEAN }, + { prop_locationW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_networkW, CIM_BOOLEAN } + { prop_networkW, CIM_BOOLEAN }, + { prop_portnameW, CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_process[] = { @@ -1018,11 +1025,14 @@ struct record_physicalmemory struct record_printer { UINT32 attributes; + const WCHAR *device_id; const WCHAR *drivername; UINT32 horizontalresolution; int local; + const WCHAR *location; const WCHAR *name; int network; + const WCHAR *portname; }; struct record_process { @@ -2505,10 +2515,12 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e static enum fill_status fill_printer( struct table *table, const struct expr *cond ) { + static const WCHAR fmtW[] = {'P','r','i','n','t','e','r','%','d',0}; struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; DWORD i, offset = 0, count = 0, size = 0, num_rows = 0; + WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; @@ -2529,11 +2541,15 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co { rec = (struct record_printer *)(table->data + offset); rec->attributes = info[i].Attributes; + sprintfW( id, fmtW, i ); + rec->device_id = heap_strdupW( id ); rec->drivername = heap_strdupW( info[i].pDriverName ); rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; rec->local = -1; + rec->location = heap_strdupW( info[i].pLocation ); rec->name = heap_strdupW( info[i].pPrinterName ); rec->network = 0; + rec->portname = heap_strdupW( info[i].pPortName ); if (!match_row( table, i, cond, &status )) { free_row_values( table, i ); -- 2.11.0

1 0

[PATCH 2/4] wbemprox/tests: Add a test for Win32_OperatingSystem.FreePhysicalMemory.
by Hans Leidekker March 2, 2018

March 2, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7028d7bfc5..93d07ea28b 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1090,7 +1090,7 @@ static void test_SystemSecurity( IWbemServices *services ) SysFreeString( class ); } -static void test_OperatingSystem( IWbemServices *services ) +static void test_Win32_OperatingSystem( IWbemServices *services ) { static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', @@ -1098,6 +1098,7 @@ static void test_OperatingSystem( IWbemServices *services ) static const WCHAR buildnumberW[] = {'B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; + static const WCHAR freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; static const WCHAR ostypeW[] = {'O','S','T','y','p','e',0}; @@ -1154,6 +1155,15 @@ static void test_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, freephysicalmemoryW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get free physical memory size %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "freephysicalmemory %s\n", wine_dbgstr_w(V_BSTR(&val)) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get name %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); @@ -1239,7 +1249,7 @@ static void test_OperatingSystem( IWbemServices *services ) SysFreeString( wql ); } -static void test_ComputerSystemProduct( IWbemServices *services ) +static void test_Win32_ComputerSystemProduct( IWbemServices *services ) { static const WCHAR identifyingnumberW[] = {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; @@ -1333,7 +1343,7 @@ static void test_ComputerSystemProduct( IWbemServices *services ) SysFreeString( wql ); } -static void test_PhysicalMemory( IWbemServices *services ) +static void test_Win32_PhysicalMemory( IWbemServices *services ) { static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; @@ -1382,7 +1392,7 @@ static void test_PhysicalMemory( IWbemServices *services ) SysFreeString( wql ); } -static void test_IP4RouteTable( IWbemServices *services ) +static void test_Win32_IP4RouteTable( IWbemServices *services ) { static const WCHAR destinationW[] = {'D','e','s','t','i','n','a','t','i','o','n',0}; static const WCHAR interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; @@ -1668,10 +1678,10 @@ START_TEST(query) test_query_async( services ); test_GetNames( services ); test_SystemSecurity( services ); - test_OperatingSystem( services ); - test_ComputerSystemProduct( services ); - test_PhysicalMemory( services ); - test_IP4RouteTable( services ); + test_Win32_OperatingSystem( services ); + test_Win32_ComputerSystemProduct( services ); + test_Win32_PhysicalMemory( services ); + test_Win32_IP4RouteTable( services ); test_Win32_Processor( services ); test_Win32_VideoController( services ); -- 2.11.0

1 0

[PATCH 1/4] wbemprox: Add FreePhysicalMemory to Win32_OperatingSystem.
by Hans Leidekker March 2, 2018

March 2, 2018

From: Michael Müller <michael(a)fds-team.de> For bug 43357. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9dfc939caf..752325e6a2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -231,6 +231,8 @@ static const WCHAR prop_flavorW[] = {'F','l','a','v','o','r',0}; static const WCHAR prop_freespaceW[] = {'F','r','e','e','S','p','a','c','e',0}; +static const WCHAR prop_freephysicalmemoryW[] = + {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_horizontalresolutionW[] = @@ -559,6 +561,7 @@ static const struct column col_os[] = { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_freephysicalmemoryW, CIM_UINT64 }, { prop_installdateW, CIM_DATETIME }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, @@ -972,6 +975,7 @@ struct record_operatingsystem const WCHAR *codeset; const WCHAR *countrycode; const WCHAR *csdversion; + UINT64 freephysicalmemory; const WCHAR *installdate; const WCHAR *lastbootuptime; const WCHAR *localdatetime; @@ -1362,6 +1366,15 @@ static UINT64 get_total_physical_memory(void) return status.ullTotalPhys; } +static UINT64 get_available_physical_memory(void) +{ + MEMORYSTATUSEX status; + + status.dwLength = sizeof(status); + if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024; + return status.ullAvailPhys; +} + static WCHAR *get_computername(void) { WCHAR *ret; @@ -2941,6 +2954,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); rec->csdversion = ver.szCSDVersion[0] ? heap_strdupW( ver.szCSDVersion ) : NULL; + rec->freephysicalmemory = get_available_physical_memory() / 1024; rec->installdate = os_installdateW; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); -- 2.11.0

1 0

[PATCH 4/4] secur32: Add support for NameFullyQualifiedDN to GetComputerObjectName.
by Dmitry Timoshkov March 2, 2018

March 2, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/sysinfo.c | 11 +++++----- dlls/secur32/secur32.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 09f2484b7b..db982aa82f 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -165,14 +165,15 @@ static void test_sysinfo(void) if (hr != S_OK) { skip("Computer is not part of a domain, skipping the tests\n"); - IADsADSystemInfo_Release(sysinfo); - return; + goto done; } SysFreeString(bstr); hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); - ok(hr == S_OK, "got %#x\n", hr); - if (hr == S_OK) SysFreeString(bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + if (hr != S_OK) goto done; + SysFreeString(bstr); hr = IADsADSystemInfo_get_SiteName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); @@ -201,7 +202,7 @@ static void test_sysinfo(void) hr = IADsADSystemInfo_GetAnyDCName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); if (hr == S_OK) SysFreeString(bstr); - +done: IADsADSystemInfo_Release(sysinfo); } diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 889883c2bd..bece2b7398 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1021,6 +1021,56 @@ BOOLEAN WINAPI GetComputerObjectNameW( } break; case NameFullyQualifiedDN: + { + static const WCHAR cnW[] = { 'C','N','=',0 }; + static const WCHAR ComputersW[] = { 'C','N','=','C','o','m','p','u','t','e','r','s',0 }; + static const WCHAR dcW[] = { 'D','C','=',0 }; + static const WCHAR commaW[] = { ',',0 }; + WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len, size; + WCHAR *suffix; + + size = sizeof(name) / sizeof(name[0]); + if (!GetComputerNameW(name, &size)) + { + status = FALSE; + break; + } + + len = strlenW(cnW) + size + 1 + strlenW(ComputersW) + 1 + strlenW(dcW); + suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.'); + if (suffix) + { + *suffix++ = 0; + len += 1 + strlenW(dcW) + strlenW(suffix); + } + len += strlenW(domainInfo->DnsDomainName.Buffer); + + if (lpNameBuffer && *nSize > len) + { + lstrcpyW(lpNameBuffer, cnW); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, ComputersW); + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, dcW); + lstrcatW(lpNameBuffer, domainInfo->DnsDomainName.Buffer); + if (suffix) + { + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, dcW); + lstrcatW(lpNameBuffer, suffix); + } + status = TRUE; + } + else /* just requesting length required */ + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; + } + *nSize = len + 1; + break; + } case NameDisplay: case NameUniqueId: case NameCanonical: -- 2.16.2

1 0

[PATCH 3/4] advapi32: Also initialize DnsDomainName and DnsForestName in LsaQueryInformationPolicy.
by Dmitry Timoshkov March 2, 2018

March 2, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/lsa.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index ca357688fc..95bfe09446 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -799,7 +799,19 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); } - /* FIXME: also set DnsDomainName and DnsForestName */ + dwSize = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameExW(ComputerNameDnsDomain, xdi->dns_domain_name, &dwSize)) + { + xdi->info.DnsDomainName.Buffer = xdi->dns_domain_name; + xdi->info.DnsDomainName.Length = dwSize * sizeof(WCHAR); + xdi->info.DnsDomainName.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + TRACE("setting DnsDomainName to %s\n", debugstr_w(xdi->info.DnsDomainName.Buffer)); + + xdi->info.DnsForestName.Buffer = xdi->dns_domain_name; + xdi->info.DnsForestName.Length = dwSize * sizeof(WCHAR); + xdi->info.DnsForestName.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + TRACE("setting DnsForestName to %s\n", debugstr_w(xdi->info.DnsForestName.Buffer)); + } dwSize = sizeof(xdi->domain_sid); if (ADVAPI_GetComputerSid(&computer_sid.sid) && GetWindowsAccountDomainSid(&computer_sid.sid, &xdi->domain_sid.sid, &dwSize)) -- 2.16.2

1 0

[PATCH 2/4] advapi32: Return correct short domain name.
by Dmitry Timoshkov March 2, 2018

March 2, 2018

Also remove suffix and uppercase the returned name as Windows does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/lsa.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index f2fcc0701b..ca357688fc 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -786,11 +786,16 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( if (!xdi) return STATUS_NO_MEMORY; dwSize = MAX_COMPUTERNAME_LENGTH + 1; - if (GetComputerNameW(xdi->domain_name, &dwSize)) + if (GetComputerNameExW(ComputerNamePhysicalDnsDomain, xdi->domain_name, &dwSize)) { + WCHAR *dot; + + dot = strrchrW(xdi->domain_name, '.'); + if (dot) *dot = 0; + struprW(xdi->domain_name); xdi->info.Name.Buffer = xdi->domain_name; - xdi->info.Name.Length = dwSize * sizeof(WCHAR); - xdi->info.Name.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + xdi->info.Name.Length = strlenW(xdi->domain_name) * sizeof(WCHAR); + xdi->info.Name.MaximumLength = xdi->info.Name.Length + sizeof(WCHAR); TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); } -- 2.16.2

1 0