wine-devel February 2018

wine-devel@winehq.org

74 participants
746 discussions

[PATCH 3/5] XInput: Update state of HID device
by Aric Stewart 08 Feb '18

08 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 94 ++++++++++++++++++++++++++++++++++++++--- dlls/xinput1_3/xinput_main.c | 14 +++--- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 96 insertions(+), 13 deletions(-)

1 0

[PATCH 2/5] XInput: Detect and setup HID gamepads
by Aric Stewart 08 Feb '18

08 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_1/Makefile.in | 2 + dlls/xinput1_2/Makefile.in | 2 + dlls/xinput1_3/Makefile.in | 2 + dlls/xinput1_3/hid.c | 331 ++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 26 ++-- dlls/xinput1_3/xinput_private.h | 30 ++++ dlls/xinput1_4/Makefile.in | 2 + dlls/xinput9_1_0/Makefile.in | 2 + 8 files changed, 386 insertions(+), 11 deletions(-) create mode 100644 dlls/xinput1_3/hid.c create mode 100644 dlls/xinput1_3/xinput_private.h

1 0

[PATCH] pdh: Add PdhVbAddCounter stub.
by Andrey Gusev 08 Feb '18

08 Feb '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 72e6fa39f0..4f5d603db1 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -141,7 +141,7 @@ @ stdcall PdhValidatePathExA(ptr str) @ stdcall PdhValidatePathExW(ptr wstr) @ stdcall PdhValidatePathW(wstr) -@ stub PdhVbAddCounter +@ stdcall PdhVbAddCounter(long str long) @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index fb131bd354..c7cdac680f 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1114,6 +1114,16 @@ PDH_STATUS WINAPI PdhValidatePathExW( PDH_HLOG source, LPCWSTR path ) } /*********************************************************************** + * PdhVbAddCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhVbAddCounter(LONG query, LPCSTR path, LONG counter) +{ + FIXME("%d, %s, %d: stub!\n", query, path, counter); + + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** * PdhMakeCounterPathA (PDH.@) */ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buffer, -- 2.13.6

1 0

[PATCH] user32/tests: Remove workaround for GetComboBoxInfo() availability
by Nikolay Sivov 08 Feb '18

08 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/combo.c | 58 ++++++----------------------------------------- dlls/user32/tests/msg.c | 12 ++-------- 2 files changed, 9 insertions(+), 61 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 6dbdafb257..ad706ea754 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -287,13 +287,6 @@ static void test_WM_LBUTTONDOWN(void) static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; static const CHAR stringFormat[] = "%2d"; BOOL ret; - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); - - pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo){ - win_skip("GetComboBoxInfo is not available\n"); - return; - } hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, hMainWnd, (HMENU)COMBO_ID, NULL, 0); @@ -307,7 +300,7 @@ static void test_WM_LBUTTONDOWN(void) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -448,20 +441,13 @@ static void test_editselection(void) COMBOBOXINFO cbInfo; BOOL ret; DWORD len; - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); char edit[20]; - pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo){ - win_skip("GetComboBoxInfo is not available\n"); - return; - } - /* Build a combo */ hCombo = build_combo(CBS_SIMPLE); cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -515,7 +501,7 @@ static void test_editselection(void) hCombo = build_combo(CBS_SIMPLE); cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -584,7 +570,6 @@ static LRESULT CALLBACK test_window_proc(HWND hwnd, UINT msg, WPARAM wParam, LPA static void test_editselection_focus(DWORD style) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hEdit, hButton; COMBOBOXINFO cbInfo; BOOL ret; @@ -592,17 +577,10 @@ static void test_editselection_focus(DWORD style) char buffer[16] = {0}; DWORD len; - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } - hCombo = build_combo(style); cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -649,18 +627,11 @@ static void test_editselection_focus(DWORD style) static void test_listbox_styles(DWORD cb_style) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND combo; COMBOBOXINFO info; DWORD style, exstyle, expect_style, expect_exstyle; BOOL ret; - pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo){ - win_skip("GetComboBoxInfo is not available\n"); - return; - } - expect_style = WS_CHILD|WS_CLIPSIBLINGS|LBS_COMBOBOX|LBS_HASSTRINGS|LBS_NOTIFY; if (cb_style == CBS_SIMPLE) { @@ -676,7 +647,7 @@ static void test_listbox_styles(DWORD cb_style) combo = build_combo(cb_style); info.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(combo, &info); + ret = GetComboBoxInfo(combo, &info); ok(ret, "Failed to get combobox info structure.\n"); style = GetWindowLongW( info.hwndList, GWL_STYLE ); @@ -704,7 +675,6 @@ static void test_listbox_styles(DWORD cb_style) static void test_listbox_size(DWORD style) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hList; COMBOBOXINFO cbInfo; UINT x, y; @@ -739,13 +709,6 @@ static void test_listbox_size(DWORD style) {10, 100, TRUE}, }; - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } - for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) { const struct list_size_info *info_test = &info_height[test]; @@ -762,7 +725,7 @@ static void test_listbox_size(DWORD style) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); hList = cbInfo.hwndList; @@ -808,24 +771,17 @@ static void test_listbox_size(DWORD style) static void test_WS_VSCROLL(void) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hList; COMBOBOXINFO info; DWORD style; BOOL ret; int i; - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } info.cbSize = sizeof(info); hCombo = build_combo(CBS_DROPDOWNLIST); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &info); + ret = GetComboBoxInfo(hCombo, &info); ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); hList = info.hwndList; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f391ab9ce0..1d569a37d5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6834,7 +6834,6 @@ static void test_combobox_messages(void) { HWND parent, combo, button, edit, lbox; LRESULT ret; - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); COMBOBOXINFO cbInfo; BOOL res; @@ -6879,13 +6878,6 @@ static void test_combobox_messages(void) DestroyWindow(parent); /* Start again. Test combobox text selection when getting and losing focus */ - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } - parent = CreateWindowExA(0, "TestParentClass", "Parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, NULL); ok(parent != 0, "Failed to create parent window\n"); @@ -6896,7 +6888,7 @@ static void test_combobox_messages(void) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - res = pGetComboBoxInfo(combo, &cbInfo); + res = GetComboBoxInfo(combo, &cbInfo); ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); edit = cbInfo.hwndItem; @@ -6955,7 +6947,7 @@ static void test_combobox_messages(void) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - res = pGetComboBoxInfo(combo, &cbInfo); + res = GetComboBoxInfo(combo, &cbInfo); ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); lbox = cbInfo.hwndList; lbox_window_proc = (WNDPROC)SetWindowLongPtrA(lbox, GWLP_WNDPROC, -- 2.15.1

2 1

[PATCH] xmllite: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 08 Feb '18

08 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xmllite/xmllite_private.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 702fadbd67..7884e27453 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -21,22 +21,7 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#include "wine/heap.h" static inline void *m_alloc(IMalloc *imalloc, size_t len) { -- 2.14.3

2 1

[PATCH] xmllite/tests: Use the global HeapAlloc() wrappers
by Nikolay Sivov 08 Feb '18

08 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/reader.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 00337764a6..3cdc177e0b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -30,20 +30,21 @@ #include "ole2.h" #include "xmllite.h" #include "wine/test.h" +#include "wine/heap.h" DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str) { int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; } static void free_str(WCHAR *str) { - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); } static int strcmp_wa(const WCHAR *str1, const char *stra) @@ -408,9 +409,7 @@ static ULONG WINAPI testinput_Release(IUnknown *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -426,7 +425,7 @@ static HRESULT testinput_createinstance(void **ppObj) { testinput *input; - input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); + input = heap_alloc(sizeof(*input)); if(!input) return E_OUTOFMEMORY; input->IUnknown_iface.lpVtbl = &testinput_vtbl; -- 2.15.1

1 0

[PATCH 3/3] testbot: Don't include incomplete VM operations in statistics.
by Francois Gouget 08 Feb '18

08 Feb '18

Including a revert operation that started a couple of seconds ago but has not yet completed in the average revert time would distort the result (particularly if restricting the analysis to the recent past). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index c04a1e437..5122dc36f 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -311,6 +311,7 @@ sub GetActivity($;$) my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name}; next if (!$LastVMStatus); $LastVMStatus->{end} = $Counters->{now}; + $LastVMStatus->{ongoing} = 1; if ($LastVMStatus->{status} eq "unknown") { $LastVMStatus->{status} = $VM->Status; @@ -422,8 +423,11 @@ sub GetStatistics($) my $Status = $VMStatus->{status}; my $Time = $VMStatus->{end} - $VMStatus->{start}; - _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); - _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); + if (!$VMStatus->{ongoing}) + { + _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); + _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); + } if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/) { $VMStats->{"busy.elapsed"} += $Time; -- 2.15.1

1 0

[PATCH 2/3] testbot: Fix the duration of some VM operations.
by Francois Gouget 08 Feb '18

08 Feb '18

Sometimes a RecordGroup containing VM status information is followed by a RecordGroup containing only VM result information. This typically happens when a VM is running a task which ends in the 'boterror' state. However this VM result RecordGroup does not mean the VM is no longer in the 'running' state so it should not be used to set the previous group's 'end' time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5d8ee5f2a..c04a1e437 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -226,19 +226,25 @@ sub GetActivity($;$) { my $StatusVMs = $Group->{statusvms}; my $ResultVMs = $Group->{resultvms}; - next if (!$StatusVMs and !$ResultVMs); - if ($LastGroup) + if ($StatusVMs) { - $LastGroup->{end} = $Group->{start}; - foreach my $Counter ('runnable', 'queued') + if ($LastGroup) { - if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) + $LastGroup->{end} = $Group->{start}; + foreach my $Counter ('runnable', 'queued') { - $Group->{$Counter} = $LastGroup->{$Counter}; + if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) + { + $Group->{$Counter} = $LastGroup->{$Counter}; + } } } + $LastGroup = $Group; + } + elsif (!$ResultVMs) + { + next; } - $LastGroup = $Group; foreach my $VM (@{$VMs->GetItems()}) { -- 2.15.1

1 0

[PATCH 1/3] testbot: Fix the activity start and end times.
by Francois Gouget 08 Feb '18

08 Feb '18

Even if the last job completed hours ago, the period covered by the data we have in the jobs table always goes all the way up to now. Also it starts with when the oldest job on record was submitted, whether that job completed successfully or not. Similarly the data in our activity records always covers everything up until the present. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 8c22e0144..5d8ee5f2a 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,11 +43,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub _UpdateMax($$) -{ - $_[0] = $_[1] if (!defined $_[0] or $_[0] < $_[1]); -} - =pod =over 12 @@ -345,6 +340,7 @@ sub GetStatistics($) foreach my $Job (@{$Jobs->GetItems()}) { $GlobalStats->{"jobs.count"}++; + _UpdateMin($GlobalStats->{start}, $Job->Submitted); my $IsSpecialJob; my $Steps = $Job->Steps; @@ -386,9 +382,6 @@ sub GetStatistics($) my $Time = $Job->Ended - $Job->Submitted; _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; - - _UpdateMin($GlobalStats->{start}, $Job->Submitted); - _UpdateMax($GlobalStats->{end}, $Job->Ended); } } @@ -408,7 +401,6 @@ sub GetStatistics($) foreach my $Group (@$Activity) { _UpdateMin($VMsStats->{start}, $Group->{start}); - _UpdateMax($VMsStats->{end}, $Group->{end}); next if (!$Group->{statusvms}); my ($IsGroupBusy, %IsHostBusy); @@ -464,6 +456,9 @@ sub GetStatistics($) $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; } } + + # The end is now! + $GlobalStats->{end} = $VMsStats->{end} = $Counters->{now}; $GlobalStats->{elapsed} = $GlobalStats->{end} - $GlobalStats->{start}; $HostsStats->{elapsed} = $VMsStats->{elapsed} = $VMsStats->{end} - $VMsStats->{start}; -- 2.15.1

1 0

[PATCH 5/5] secur32: Implement QueryContextAttributesA(SECPKG_ATTR_NEGOTIATION_INFO) in the LSA wrapper.
by Hans Leidekker 08 Feb '18

08 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/lsa.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 511e24a90a..b93006a24f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -554,6 +554,32 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, U return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); } +static SecPkgInfoA *package_infoWtoA( const SecPkgInfoW *info ) +{ + SecPkgInfoA *ret; + int size_name = WideCharToMultiByte( CP_ACP, 0, info->Name, -1, NULL, 0, NULL, NULL ); + int size_comment = WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, NULL, 0, NULL, NULL ); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_CHAR *)(ret + 1); + WideCharToMultiByte( CP_ACP, 0, info->Name, -1, ret->Name, size_name, NULL, NULL ); + ret->Comment = ret->Name + size_name; + WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, ret->Comment, size_comment, NULL, NULL ); + return ret; +} + +static SECURITY_STATUS nego_info_WtoA( const SecPkgContext_NegotiationInfoW *infoW, + SecPkgContext_NegotiationInfoA *infoA ) +{ + infoA->NegotiationState = infoW->NegotiationState; + if (!(infoA->PackageInfo = package_infoWtoA( infoW->PackageInfo ))) return SEC_E_INSUFFICIENT_MEMORY; + return SEC_E_OK; +} + static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) { TRACE("%p %d %p\n", context, attribute, buffer); @@ -565,6 +591,18 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U case SECPKG_ATTR_SIZES: return lsa_QueryContextAttributesW( context, attribute, buffer ); + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW infoW; + SecPkgContext_NegotiationInfoA *infoA = (SecPkgContext_NegotiationInfoA *)buffer; + SECURITY_STATUS status = lsa_QueryContextAttributesW( context, SECPKG_ATTR_NEGOTIATION_INFO, &infoW ); + + if (status != SEC_E_OK) return status; + status = nego_info_WtoA( &infoW, infoA ); + FreeContextBuffer( infoW.PackageInfo ); + return status; + } + #define X(x) case (x) : FIXME(#x" stub\n"); break X(SECPKG_ATTR_ACCESS_TOKEN); X(SECPKG_ATTR_AUTHORITY); @@ -578,7 +616,6 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U X(SECPKG_ATTR_SESSION_KEY); X(SECPKG_ATTR_STREAM_SIZES); X(SECPKG_ATTR_TARGET_INFORMATION); - X(SECPKG_ATTR_NEGOTIATION_INFO); #undef X default: FIXME( "unknown attribute %u\n", attribute ); -- 2.11.0

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
75
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-devel February 2018