April 2020 - Wine-Devel - list.winehq.org

[PATCH 3/3] adsldp: Add support for searching of deleted objects.
by Dmitry Timoshkov April 13, 2020

April 13, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 15 ++++++++++++++- dlls/adsldp/tests/ldap.c | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 792a3bc034..dce462d685 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1286,6 +1286,7 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); ULONG err, i; WCHAR **props; + LDAPControlW **ctrls = NULL, *ctrls_a[2], tombstone; struct ldap_search_context *ldap_ctx; TRACE("%p,%s,%p,%u,%p\n", iface, debugstr_w(filter), names, count, res); @@ -1317,7 +1318,19 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props[count] = NULL; } - err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, ldap->search.attribtypes_only, &ldap_ctx->res); + if (ldap->search.tombstone) + { + tombstone.ldctl_oid = (WCHAR *)L"1.2.840.113556.1.4.417"; + tombstone.ldctl_iscritical = TRUE; + tombstone.ldctl_value.bv_val = NULL; + tombstone.ldctl_value.bv_len = 0; + ctrls_a[0] = &tombstone; + ctrls_a[1] = NULL; + ctrls = ctrls_a; + } + + err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, + ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e76bd2e0b6..c43d2989e6 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -515,6 +515,25 @@ todo_wine hr = IDirectorySearch_CloseSearchHandle(ds, sh); ok(hr == S_OK, "got %#x\n", hr); + pref[0].dwSearchPref = ADS_SEARCHPREF_TOMBSTONE; + pref[0].vValue.dwType = ADSTYPE_BOOLEAN; + pref[0].vValue.Integer = 1; + pref[0].dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, pref, 1); + ok(hr == S_OK, "got %#x\n", hr); + ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[0].dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); + ok(hr == HRESULT_FROM_WIN32(ERROR_DS_UNAVAILABLE_CRIT_EXTENSION) || broken(hr == S_OK) /* XP */, "got %#x\n", hr); + if (hr == S_OK) + { + hr = IDirectorySearch_GetNextRow(ds, sh); + ok(hr == HRESULT_FROM_WIN32(ERROR_DS_UNAVAILABLE_CRIT_EXTENSION), "got %#x\n", hr); + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + } + IDirectorySearch_Release(ds); IDirectoryObject_Release(dirobj); } -- 2.25.2

2 1

[PATCH 2/3] adsldp: Fix IDirectorySearch::FreeColumn() for ADSTYPE_NT_SECURITY_DESCRIPTOR.
by Dmitry Timoshkov April 13, 2020

April 13, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index de88ee994c..792a3bc034 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1758,7 +1758,7 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL if (col->hReserved) { - if (col->dwADsType == ADSTYPE_OCTET_STRING) + if (col->dwADsType == ADSTYPE_OCTET_STRING || col->dwADsType == ADSTYPE_NT_SECURITY_DESCRIPTOR) ldap_value_free_len(col->hReserved); else ldap_value_freeW(col->hReserved); -- 2.25.2

1 0

[PATCH 1/3] adsldp: Fix mapping for 1.3.6.1.4.1.1466.115.121.1.26.
by Dmitry Timoshkov April 13, 2020

April 13, 2020

According to rfc4517 1.3.6.1.4.1.1466.115.121.1.26 is IA5 String, and in an AD DC managed by Samba it's used for LDAP attributes "loginShell" and "unixHomeDirectory", so I assumed that a proper type for it is ADSTYPE_CASE_EXACT_STRING. However testing under Windows 10 shows that it's ADSTYPE_CASE_IGNORE_STRING there. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/schema.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 0611dc2920..63c95bdae6 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -96,7 +96,7 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.24")) return ADSTYPE_UTC_TIME; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.26")) - return ADSTYPE_CASE_EXACT_STRING; + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38")) -- 2.25.2

1 0

[PATCH] winspool.drv/tests: remove win9x checks and enable some tests
by Vijay Kiran Kamuju April 13, 2020

April 13, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/3] dinput8/tests: Test injecting keyboard events.
by Brendan Shanks April 13, 2020

April 13, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Don't leak hwnd or di in case of errors. dlls/dinput8/tests/device.c | 108 ++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index f3e7b54235..ea5ab75109 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -742,6 +742,113 @@ static void test_mouse_keyboard(void) DestroyWindow(hwnd); } +static void test_keyboard_events(void) +{ + HRESULT hr; + HWND hwnd = INVALID_HANDLE_VALUE; + IDirectInput8A *di; + IDirectInputDevice8A *di_keyboard; + DIPROPDWORD dp; + DIDEVICEOBJECTDATA obj_data[10]; + DWORD data_size; + BYTE kbdata[256]; + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&di); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("test_keyboard_events requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8Create failed: %08x\n", hr); + + hr = IDirectInput8_Initialize(di, GetModuleHandleA(NULL), DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("test_keyboard_events requires dinput8\n"); + IDirectInput8_Release(di); + return; + } + ok(SUCCEEDED(hr), "IDirectInput8_Initialize failed: %08x\n", hr); + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + hr = IDirectInput8_CreateDevice(di, &GUID_SysKeyboard, &di_keyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput8_CreateDevice failed: %08x\n", hr); + hr = IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE); + ok(SUCCEEDED(hr), "IDirectInput8_SetCooperativeLevel failed: %08x\n", hr); + hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwObj = 0; + dp.diph.dwHow = DIPH_DEVICE; + dp.dwData = ARRAY_SIZE(obj_data); + IDirectInputDevice8_SetProperty(di_keyboard, DIPROP_BUFFERSIZE, &(dp.diph)); + + hr = IDirectInputDevice8_Acquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + + /* Test injecting keyboard events with both VK and scancode given. */ + keybd_event(VK_SPACE, DIK_SPACE, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); + + keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + /* Test injecting keyboard events with scancode=0. + * Windows DInput ignores the VK, sets scancode 0 to be pressed, and GetDeviceData returns no elements. */ + keybd_event(VK_SPACE, 0, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[0], "Expected key 0 state down\n"); + + keybd_event(VK_SPACE, 0, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_Unacquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Unacquire failed: %08x\n", hr); + + IDirectInputDevice8_Release(di_keyboard); + IDirectInput8_Release(di); + + DestroyWindow(hwnd); +} + START_TEST(device) { CoInitialize(NULL); @@ -749,6 +856,7 @@ START_TEST(device) test_action_mapping(); test_save_settings(); test_mouse_keyboard(); + test_keyboard_events(); CoUninitialize(); } -- 2.24.1

2 4

[PATCH 2/2] shell32: Allow SHFileOperation FO_MOVE operations originating from a wildcard unconditionally.
by Lorenzo Ferrillo April 12, 2020

April 12, 2020

Current wine implementation of SHFileOperation FO_MOVE don't allow wildcard move operations involving more then 1 file unless the move operation also involve a folder. This patch allow wildcard move operations to work also in this case Fix Wine bug:https://bugs.winehq.org/show_bug.cgi?id=39269 Signed-off-by: Lorenzo Ferrillo <lorenzofersteam(a)live.it> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db3914..ab8454a357 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1424,7 +1424,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const } if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) && - !flFrom->bAnyDirectories && + !flFrom->bAnyDirectories && !flFrom->bAnyFromWildcard && flFrom->dwNumFiles > flTo->dwNumFiles) { return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index ca7876c846..31da9727cd 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2743,13 +2743,13 @@ static void test_move_wildchar(void) set_curr_dir_path(from, "testdir2\\*.*\0"); set_curr_dir_path(to, "test4.txt\0"); retval = SHFileOperationA(&shfo); - todo_wine ok(retval == ERROR_SUCCESS, "SHFileOperation failed\n"); - todo_wine ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); + ok(retval == ERROR_SUCCESS, "SHFileOperation failed\n"); + ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); ok(file_exists("testdir2"), "dir should not be moved\n"); - todo_wine ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); - todo_wine ok(!file_exists("testdir2\\two.txt"), "file should be moved\n"); - todo_wine ok(file_exists("test4.txt\\one.txt"), "file should be moved here\n"); - todo_wine ok(file_exists("test4.txt\\two.txt"), "file should be moved here\n"); + ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); + ok(!file_exists("testdir2\\two.txt"), "file should be moved\n"); + ok(file_exists("test4.txt\\one.txt"), "file should be moved here\n"); + ok(file_exists("test4.txt\\two.txt"), "file should be moved here\n"); DeleteFileA("test4.txt\\one.txt"); DeleteFileA("test4.txt\\two.txt"); -- 2.26.0

2 1

[PATCH 1/2] shell32/test: Add more tests for SHFileOperation for FO_MOVE wildcard operation
by Lorenzo Ferrillo April 12, 2020

April 12, 2020

FO_MOVE SHFileOperation has a bug where move operations originating with a wildcard that are involving multiple source files (>1) do not work under wine unless there operation move also a folder. Fix in the next patch Analysis of the bug: https://bugs.winehq.org/show_bug.cgi?id=39269 Signed-off-by: Lorenzo Ferrillo <lorenzofersteam(a)live.it> --- dlls/shell32/tests/shlfileop.c | 65 ++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c7244042..ca7876c846 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2697,6 +2697,69 @@ static BOOL is_old_shell32(void) return FALSE; } + +static void test_move_wildchar(void) +{ + SHFILEOPSTRUCTA shfo; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; + DWORD retval; + + clean_after_shfo_tests(); + + CreateDirectoryA("test4.txt", NULL); + CreateDirectoryA("testdir2", NULL); + createTestFile("testdir2\\one.txt"); + + shfo.hwnd = NULL; + shfo.wFunc = FO_MOVE; + shfo.pFrom = from; + shfo.pTo = to; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_NOCONFIRMMKDIR; + shfo.hNameMappings = NULL; + shfo.lpszProgressTitle = NULL; + shfo.fAnyOperationsAborted = FALSE; + + set_curr_dir_path(from, "testdir2\\*.*\0"); + set_curr_dir_path(to, "test4.txt\0"); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "SHFileOperation failed\n"); + ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); + ok(file_exists("testdir2"), "dir should not be moved\n"); + ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); + ok(file_exists("test4.txt\\one.txt"), "file should be moved here\n"); + + DeleteFileA("test4.txt\\one.txt"); + DeleteFileA("testdir2\\one.txt"); + RemoveDirectoryA("test4.txt"); + RemoveDirectoryA("testdir2"); + + CreateDirectoryA("test4.txt", NULL); + CreateDirectoryA("testdir2", NULL); + createTestFile("testdir2\\one.txt"); + createTestFile("testdir2\\two.txt"); + + shfo.fAnyOperationsAborted = FALSE; + set_curr_dir_path(from, "testdir2\\*.*\0"); + set_curr_dir_path(to, "test4.txt\0"); + retval = SHFileOperationA(&shfo); + todo_wine ok(retval == ERROR_SUCCESS, "SHFileOperation failed\n"); + todo_wine ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); + ok(file_exists("testdir2"), "dir should not be moved\n"); + todo_wine ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); + todo_wine ok(!file_exists("testdir2\\two.txt"), "file should be moved\n"); + todo_wine ok(file_exists("test4.txt\\one.txt"), "file should be moved here\n"); + todo_wine ok(file_exists("test4.txt\\two.txt"), "file should be moved here\n"); + + DeleteFileA("test4.txt\\one.txt"); + DeleteFileA("test4.txt\\two.txt"); + DeleteFileA("testdir2\\one.txt"); + DeleteFileA("testdir2\\two.txt"); + RemoveDirectoryA("test4.txt"); + RemoveDirectoryA("testdir2"); + +} + START_TEST(shlfileop) { clean_after_shfo_tests(); @@ -2742,4 +2805,6 @@ START_TEST(shlfileop) test_unicode(); test_shlmenu(); + + test_move_wildchar(); } -- 2.26.0

2 1

[PATCH 1/4] iphlpapi: MacOS struct sockaddr is 4 byte aligned on 64 bit.
by Stefan Dösinger April 12, 2020

April 12, 2020

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- This fixes random crashes in AllocateAndGetIpNetTableFromStack on MacOS Catalina. Netmask sockaddr_ins only have enough bytes to store the bits of the netmask that are non-zero, which are 0 for the default route - this leads to a 4 byte struct in the array. As a result we read the gateway wrong on 64 bit builds. That was survivable at least as far as memory allocations go, but since Catalina there is one more struct sockaddr in the route info for some routes - RTA_IFA. Thanks to the wrong offset from the netmask we added a byte originating from the gateway's IP address to the RTA_IFA pointer and tried to read the address only to realize later that we don't know what to do anyway. Depending on the IP address and if the route in question is towards the end of the routing table we might read beyond the memory buffer. A similar problem occurs with AF_LINK sockaddrs which have a size of 20 bytes, which we incorrectly aligned to 24. See https://opensource.apple.com/source/network_cmds/network_cmds-596/netstat.t…. --- dlls/iphlpapi/ipstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index efb4d64c90..94fb4af5fa 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -145,7 +145,7 @@ #ifndef ROUNDUP #define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) + ((a) > 0 ? (1 + (((a) - 1) | (sizeof(uint32_t) - 1))) : sizeof(uint32_t)) #endif #ifndef ADVANCE #define ADVANCE(x, n) (x += ROUNDUP(((struct sockaddr *)n)->sa_len)) -- 2.24.1 (Apple Git-126)

1 4

[PATCH 2/2] winapi_test: Add a 'last;', to optimize.
by Serge Gautherie April 12, 2020

April 12, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/winapi_test | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8..4f8e9de 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -877,6 +877,7 @@ foreach my $type_name (sort(keys(%type_names_used))) { my $type_name2type = $file2types{$pointer_size}{"include/$header"}; if (exists($type_name2type{$type_name})) { $found = 1; + last; } } -- 2.10.0.windows.1

1 0

[PATCH 1/2] winapi_test: Fix 'if (!defined $type_size)' use in _refresh().
by Serge Gautherie April 12, 2020

April 12, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- 'Use of uninitialized value $type_size in multiplication (*) at tools/winapi/c_type.pm line 244.' --- tools/winapi/c_type.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index b00cf81..c6aeb6a 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -239,8 +239,14 @@ sub _refresh($) } else { - print STDERR "$type_name -> type_size=undef, count=$count\n" if (!defined $type_size); - $type_size *= int($count); + if (!defined $type_size) + { + print STDERR "$type_name -> type_size=undef, count=$count\n"; + } + else + { + $type_size *= int($count); + } } } if ($bitfield_size != 0) -- 2.10.0.windows.1

1 0