March 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : comctl32/tests: Disable a test that crashes on NT4.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 74271fc4cf13b87ad4af9c2bf643633a3637bc97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74271fc4cf13b87ad4af9c2bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 23:05:13 2009 +0100 comctl32/tests: Disable a test that crashes on NT4. --- dlls/comctl32/tests/tooltips.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 4c708a0..2b4f43f 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -291,11 +291,14 @@ static void test_gettext(void) r = SendMessageW(hwnd, TTM_ADDTOOL, 0, (LPARAM)&toolinfoW); ok(r, "Adding the tool to the tooltip failed\n"); - toolinfoW.hwnd = NULL; - toolinfoW.uId = 0x1234ABCD; - toolinfoW.lpszText = bufW; - SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); - ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); + if (0) /* crashes on NT4 */ + { + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); + } DestroyWindow(hwnd); }

1 0

Alexandre Julliard : comctl32/tests: Fix the monthcal window creation message sequence.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: ff28ec0ddd1173ca43cdb4061b969f7a81530b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff28ec0ddd1173ca43cdb4061… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 23:00:49 2009 +0100 comctl32/tests: Fix the monthcal window creation message sequence. --- dlls/comctl32/tests/monthcal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index cccb1b9..f116da5 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -53,7 +53,8 @@ static const struct message create_parent_window_seq[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_QUERYNEWPALETTE, sent|optional }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, 0 }, + { WM_WINDOWPOSCHANGED, sent|optional }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -447,7 +448,7 @@ static HWND create_parent_window(void) assert(hwnd); /* check for message sequences */ - ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_window_seq, "create parent window", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_window_seq, "create parent window", FALSE); return hwnd; }

1 0

Alexandre Julliard : user32/tests: Add more optional messages for Vista and Win9x.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 411c229654e3795d2c3f272a6cde5753e7f7e32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=411c229654e3795d2c3f272a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 6 10:38:39 2009 +0100 user32/tests: Add more optional messages for Vista and Win9x. --- dlls/user32/tests/msg.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 423b747..3a20cba 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -371,7 +371,7 @@ static const struct message WmSwitchNotMaximizedChild[] = { static const struct message WmSWP_FrameChanged_clip[] = { { WM_WINDOWPOSCHANGING, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED }, { WM_NCCALCSIZE, sent|wparam|parent, 1 }, - { WM_NCPAINT, sent|parent }, /* wparam != 1 */ + { WM_NCPAINT, sent|parent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|parent|defwinproc|optional }, { WM_ERASEBKGND, sent|parent|optional }, /* FIXME: remove optional once Wine is fixed */ { WM_NCPAINT, sent }, /* wparam != 1 */ @@ -390,12 +390,12 @@ static const struct message WmSWP_FrameChangedDeferErase[] = { { WM_NCCALCSIZE, sent|wparam|parent, 1 }, { WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_DEFERERASE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { WM_PAINT, sent|parent }, - { WM_NCPAINT, sent|beginpaint|parent }, /* wparam != 1 */ + { WM_PAINT, sent|parent|optional }, + { WM_NCPAINT, sent|beginpaint|parent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|beginpaint|parent|defwinproc|optional }, { WM_PAINT, sent }, { WM_NCPAINT, sent|beginpaint }, /* wparam != 1 */ - { WM_ERASEBKGND, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; @@ -2001,10 +2001,10 @@ static void ok_sequence_(const struct message *expected_list, const char *contex if ((expected->lParam ^ actual->lParam) & ~expected->lp_mask) dump++; } } - if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && - (expected->flags & optional)) + if ((expected->flags & optional) && + ((expected->flags ^ actual->flags) & (defwinproc|parent))) { - /* don't match messages if their defwinproc status differs */ + /* don't match optional messages if their defwinproc or parent status differs */ expected++; count++; continue; @@ -8210,6 +8210,8 @@ static const struct message ScrollWindowPaint1[] = { { WM_GETTEXT, sent|optional }, { WM_GETTEXT, sent|optional }, { WM_GETTEXT, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_GETTEXT, sent|optional }, { WM_ERASEBKGND, sent|optional }, { 0 } }; @@ -8978,6 +8980,7 @@ static void test_PeekMessage(void) ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %d\n", GetLastError()); qstatus = GetQueueStatus(qs_all_input); } + qstatus &= ~MAKELONG( 0x4000, 0x4000 ); /* sometimes set on Win95 */ ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); @@ -10438,13 +10441,19 @@ static const struct message SetActiveWindowSeq0[] = { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, + { WM_KILLFOCUS, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, - { WM_KILLFOCUS, sent|defwinproc }, + { WM_KILLFOCUS, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, @@ -10553,7 +10562,7 @@ static void test_SetActiveWindow(void) trace("SetActiveWindow(0)\n"); ret = SetActiveWindow(0); ok( ret == popup, "Failed to SetActiveWindow(0)\n"); - ok_sequence(SetActiveWindowSeq0, "SetActiveWindow(0)", TRUE); + ok_sequence(SetActiveWindowSeq0, "SetActiveWindow(0)", FALSE); flush_sequence(); trace("SetActiveWindow(hwnd), hwnd visible\n");

1 0

Alexandre Julliard : comctl32/tests: Set the listview image list after WM_CREATE has been processed.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: f493122879a8e0292732270f600f08a53e8cce5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f493122879a8e0292732270f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 23:00:36 2009 +0100 comctl32/tests: Set the listview image list after WM_CREATE has been processed. --- dlls/comctl32/tests/listview.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4033e9e..4562f2e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -748,13 +748,16 @@ static HIMAGELIST test_create_imagelist; static LRESULT CALLBACK create_test_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + LRESULT ret; + if (uMsg == WM_CREATE) { LPCREATESTRUCT lpcs = (LPCREATESTRUCT)lParam; lpcs->style |= LVS_REPORT; - SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)test_create_imagelist); } - return CallWindowProc(listviewWndProc, hwnd, uMsg, wParam, lParam); + ret = CallWindowProc(listviewWndProc, hwnd, uMsg, wParam, lParam); + if (uMsg == WM_CREATE) SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)test_create_imagelist); + return ret; } static void test_create(void)

1 0

Alexandre Julliard : iphlpapi/tests: Don't pass a NULL size to GetTcp/ UdpTable, it crashes on Vista.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 320286af692f10cd1e80a5729804b8399fc7c6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=320286af692f10cd1e80a5729… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 23:17:35 2009 +0100 iphlpapi/tests: Don't pass a NULL size to GetTcp/UdpTable, it crashes on Vista. --- dlls/iphlpapi/tests/iphlpapi.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 23f85ec..8e36858 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -424,15 +424,11 @@ static void testGetTcpTable(void) DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetTcpTable(NULL, NULL, FALSE); + apiReturn = gGetTcpTable(NULL, &dwSize, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetTcpTable is not supported\n"); return; } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetTcpTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = gGetTcpTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER || broken(apiReturn == ERROR_NO_DATA), /* win95 */ "GetTcpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", @@ -455,15 +451,11 @@ static void testGetUdpTable(void) DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetUdpTable(NULL, NULL, FALSE); + apiReturn = gGetUdpTable(NULL, &dwSize, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetUdpTable is not supported\n"); return; } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetUdpTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = gGetUdpTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetUdpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn);

1 0

Alexandre Julliard : ntdll/tests: Create the server port before starting the client thread.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 44d2277acded8f1f14c3fe47da4894910ef58519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d2277acded8f1f14c3fe47d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 22:09:44 2009 +0100 ntdll/tests: Create the server port before starting the client thread. Print status values in hex. --- dlls/ntdll/tests/port.c | 69 +++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index c63820a..51707e3 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -90,10 +90,7 @@ static const WCHAR PORTNAME[] = {'\\','M','y','P','o','r','t',0}; #define MAX_MESSAGE_LEN 30 -UNICODE_STRING port; -static char selfname[MAX_PATH]; -static int myARGC; -static char** myARGV; +static UNICODE_STRING port; /* Function pointers for ntdll calls */ static HMODULE hntdll = 0; @@ -155,10 +152,10 @@ static void ProcessConnectionRequest(PLPC_MESSAGE LpcMessage, PHANDLE pAcceptPor ok(!*LpcMessage->Data, "Expected empty string!\n"); status = pNtAcceptConnectPort(pAcceptPortHandle, 0, LpcMessage, 1, 0, NULL); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); status = pNtCompleteConnectPort(*pAcceptPortHandle); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); } static void ProcessLpcRequest(HANDLE PortHandle, PLPC_MESSAGE LpcMessage) @@ -173,7 +170,7 @@ static void ProcessLpcRequest(HANDLE PortHandle, PLPC_MESSAGE LpcMessage) lstrcpy((LPSTR)LpcMessage->Data, REPLY); status = pNtReplyPort(PortHandle, LpcMessage); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); ok(LpcMessage->MessageType == LPC_REQUEST, "Expected LPC_REQUEST, got %d\n", LpcMessage->MessageType); ok(!lstrcmp((LPSTR)LpcMessage->Data, REPLY), @@ -194,11 +191,11 @@ static DWORD WINAPI test_ports_client(LPVOID arg) sqos.EffectiveOnly = TRUE; status = pNtConnectPort(&PortHandle, &port, &sqos, 0, 0, &len, NULL, NULL); - todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); if (status != STATUS_SUCCESS) return 1; status = pNtRegisterThreadTerminatePort(PortHandle); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); size = FIELD_OFFSET(LPC_MESSAGE, Data) + MAX_MESSAGE_LEN; LpcMessage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); @@ -209,7 +206,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) lstrcpy((LPSTR)LpcMessage->Data, REQUEST1); status = pNtRequestPort(PortHandle, LpcMessage); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); ok(LpcMessage->MessageType == 0, "Expected 0, got %d\n", LpcMessage->MessageType); ok(!lstrcmp((LPSTR)LpcMessage->Data, REQUEST1), "Expected %s, got %s\n", REQUEST1, LpcMessage->Data); @@ -222,7 +219,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) /* Send the message and wait for the reply */ status = pNtRequestWaitReplyPort(PortHandle, LpcMessage, out); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); ok(!lstrcmp((LPSTR)out->Data, REPLY), "Expected %s, got %s\n", REPLY, out->Data); ok(out->MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->MessageType); @@ -232,34 +229,14 @@ static DWORD WINAPI test_ports_client(LPVOID arg) return 0; } -static void test_ports_server(void) +static void test_ports_server( HANDLE PortHandle ) { - OBJECT_ATTRIBUTES obj; - HANDLE PortHandle; HANDLE AcceptPortHandle; PLPC_MESSAGE LpcMessage; ULONG size; NTSTATUS status; BOOL done = FALSE; - pRtlInitUnicodeString(&port, PORTNAME); - - memset(&obj, 0, sizeof(OBJECT_ATTRIBUTES)); - obj.Length = sizeof(OBJECT_ATTRIBUTES); - obj.ObjectName = &port; - - status = pNtCreatePort(&PortHandle, &obj, 100, 100, 0); - if (status == STATUS_ACCESS_DENIED) - { - skip("Not enough rights\n"); - return; - } - todo_wine - { - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); - } - if (status != STATUS_SUCCESS) return; - size = FIELD_OFFSET(LPC_MESSAGE, Data) + MAX_MESSAGE_LEN; LpcMessage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); @@ -308,20 +285,32 @@ static void test_ports_server(void) START_TEST(port) { - HANDLE thread; - DWORD id; + OBJECT_ATTRIBUTES obj; + HANDLE port_handle; + NTSTATUS status; if (!init_function_ptrs()) return; - myARGC = winetest_get_mainargs(&myARGV); - strcpy(selfname, myARGV[0]); + pRtlInitUnicodeString(&port, PORTNAME); - thread = CreateThread(NULL, 0, test_ports_client, NULL, 0, &id); - ok(thread != NULL, "Expected non-NULL thread handle!\n"); + memset(&obj, 0, sizeof(OBJECT_ATTRIBUTES)); + obj.Length = sizeof(OBJECT_ATTRIBUTES); + obj.ObjectName = &port; - test_ports_server(); - CloseHandle(thread); + status = pNtCreatePort(&port_handle, &obj, 100, 100, 0); + if (status == STATUS_ACCESS_DENIED) skip("Not enough rights\n"); + else todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + if (status == STATUS_SUCCESS) + { + DWORD id; + HANDLE thread = CreateThread(NULL, 0, test_ports_client, NULL, 0, &id); + ok(thread != NULL, "Expected non-NULL thread handle!\n"); + + test_ports_server( port_handle ); + ok( WaitForSingleObject( thread, 10000 ) == 0, "thread didn't exit\n" ); + CloseHandle(thread); + } FreeLibrary(hntdll); }

1 0

Alexandre Julliard : iphlpapi: Implemented getInterfaceStatsByName for Solaris.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: e8f9a6fc4f32bc6c085c4007e29fa8f384aef87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f9a6fc4f32bc6c085c4007e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 19:33:26 2009 +0100 iphlpapi: Implemented getInterfaceStatsByName for Solaris. --- dlls/iphlpapi/ipstats.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index ad41e5c..a1b9981 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -161,6 +161,16 @@ static DWORD kstat_get_ui32( kstat_t *ksp, const char *name ) if (!strcmp( data[i].name, name )) return data[i].value.ui32; return 0; } + +static ULONGLONG kstat_get_ui64( kstat_t *ksp, const char *name ) +{ + unsigned int i; + kstat_named_t *data = ksp->ks_data; + + for (i = 0; i < ksp->ks_ndata; i++) + if (!strcmp( data[i].name, name )) return data[i].value.ui64; + return 0; +} #endif DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) @@ -199,6 +209,36 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) ret = NO_ERROR; } } +#elif defined(HAVE_LIBKSTAT) + { + kstat_ctl_t *kc; + kstat_t *ksp; + + if ((kc = kstat_open()) && + (ksp = kstat_lookup( kc, NULL, -1, (char *)name )) && + kstat_read( kc, ksp, NULL ) != -1 && + ksp->ks_type == KSTAT_TYPE_NAMED) + { + entry->dwMtu = 1500; /* FIXME */ + entry->dwSpeed = min( kstat_get_ui64( ksp, "ifspeed" ), ~0u ); + entry->dwInOctets = kstat_get_ui32( ksp, "rbytes" ); + entry->dwInNUcastPkts = kstat_get_ui32( ksp, "multircv" ); + entry->dwInNUcastPkts += kstat_get_ui32( ksp, "brdcstrcv" ); + entry->dwInUcastPkts = kstat_get_ui32( ksp, "ipackets" ) - entry->dwInNUcastPkts; + entry->dwInDiscards = kstat_get_ui32( ksp, "norcvbuf" ); + entry->dwInErrors = kstat_get_ui32( ksp, "ierrors" ); + entry->dwInUnknownProtos = kstat_get_ui32( ksp, "unknowns" ); + entry->dwOutOctets = kstat_get_ui32( ksp, "obytes" ); + entry->dwOutNUcastPkts = kstat_get_ui32( ksp, "multixmt" ); + entry->dwOutNUcastPkts += kstat_get_ui32( ksp, "brdcstxmt" ); + entry->dwOutUcastPkts = kstat_get_ui32( ksp, "opackets" ) - entry->dwOutNUcastPkts; + entry->dwOutDiscards = 0; /* FIXME */ + entry->dwOutErrors = kstat_get_ui32( ksp, "oerrors" ); + entry->dwOutQLen = kstat_get_ui32( ksp, "noxmtbuf" ); + ret = NO_ERROR; + } + if (kc) kstat_close( kc ); + } #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, if_nametoindex(name)};

1 0

Alexandre Julliard : iphlpapi: Implemented GetUdpStatistics for Solaris.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 026491d8e55e37ed2603b918b6467c882c3628c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026491d8e55e37ed2603b918b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 19:30:07 2009 +0100 iphlpapi: Implemented GetUdpStatistics for Solaris. --- dlls/iphlpapi/ipstats.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 7db48c6..ad41e5c 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -765,6 +765,31 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) ret = NO_ERROR; } } +#elif defined(HAVE_LIBKSTAT) + { + static char udp[] = "udp"; + kstat_ctl_t *kc; + kstat_t *ksp; + MIB_UDPTABLE *udp_table; + + if ((kc = kstat_open()) && + (ksp = kstat_lookup( kc, udp, 0, udp )) && + kstat_read( kc, ksp, NULL ) != -1 && + ksp->ks_type == KSTAT_TYPE_NAMED) + { + stats->dwInDatagrams = kstat_get_ui32( ksp, "inDatagrams" ); + stats->dwNoPorts = 0; /* FIXME */ + stats->dwInErrors = kstat_get_ui32( ksp, "inErrors" ); + stats->dwOutDatagrams = kstat_get_ui32( ksp, "outDatagrams" ); + if (!AllocateAndGetUdpTableFromStack( &udp_table, FALSE, GetProcessHeap(), 0 )) + { + stats->dwNumAddrs = udp_table->dwNumEntries; + HeapFree( GetProcessHeap(), 0, udp_table ); + } + ret = NO_ERROR; + } + if (kc) kstat_close( kc ); + } #elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS};

1 0

Alexandre Julliard : iphlpapi: Implemented GetTcpStatistics for Solaris.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 62740f72d75801417afc464a36978b7c12a7847b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62740f72d75801417afc464a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 19:27:54 2009 +0100 iphlpapi: Implemented GetTcpStatistics for Solaris. --- dlls/iphlpapi/ipstats.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index e8e8781..7db48c6 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -649,6 +649,36 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) ret = NO_ERROR; } } +#elif defined(HAVE_LIBKSTAT) + { + static char tcp[] = "tcp"; + kstat_ctl_t *kc; + kstat_t *ksp; + + if ((kc = kstat_open()) && + (ksp = kstat_lookup( kc, tcp, 0, tcp )) && + kstat_read( kc, ksp, NULL ) != -1 && + ksp->ks_type == KSTAT_TYPE_NAMED) + { + stats->dwRtoAlgorithm = kstat_get_ui32( ksp, "rtoAlgorithm" ); + stats->dwRtoMin = kstat_get_ui32( ksp, "rtoMin" ); + stats->dwRtoMax = kstat_get_ui32( ksp, "rtoMax" ); + stats->dwMaxConn = kstat_get_ui32( ksp, "maxConn" ); + stats->dwActiveOpens = kstat_get_ui32( ksp, "activeOpens" ); + stats->dwPassiveOpens = kstat_get_ui32( ksp, "passiveOpens" ); + stats->dwAttemptFails = kstat_get_ui32( ksp, "attemptFails" ); + stats->dwEstabResets = kstat_get_ui32( ksp, "estabResets" ); + stats->dwCurrEstab = kstat_get_ui32( ksp, "currEstab" ); + stats->dwInSegs = kstat_get_ui32( ksp, "inSegs" ); + stats->dwOutSegs = kstat_get_ui32( ksp, "outSegs" ); + stats->dwRetransSegs = kstat_get_ui32( ksp, "retransSegs" ); + stats->dwInErrs = kstat_get_ui32( ksp, "inErrs" ); + stats->dwOutRsts = kstat_get_ui32( ksp, "outRsts" ); + stats->dwNumConns = kstat_get_ui32( ksp, "connTableSize" ); + ret = NO_ERROR; + } + if (kc) kstat_close( kc ); + } #elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) { #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */

1 0

Alexandre Julliard : configure: Add check for libkstat on Solaris.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: de1d7fbe9889ebdc47c8c70d96af829f7a15c543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1d7fbe9889ebdc47c8c70d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 18:45:32 2009 +0100 configure: Add check for libkstat on Solaris. --- configure | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ include/config.h.in | 6 ++++ 3 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f182c34..2d77fe1 100755 --- a/configure +++ b/configure @@ -661,6 +661,7 @@ CRTLIBS LDPATH BUILTINFLAG EXTRACFLAGS +LIBKSTAT FONTCONFIGINCL CUPSINCL AUDIOIOLIBS @@ -6074,6 +6075,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -6099,6 +6101,7 @@ for ac_header in \ io.h \ jack/jack.h \ jpeglib.h \ + kstat.h \ lber.h \ lcms.h \ lcms/lcms.h \ @@ -17087,6 +17090,85 @@ esac fi +if test "$ac_cv_header_kstat_h" = "yes" +then + { $as_echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 +$as_echo_n "checking for kstat_open in -lkstat... " >&6; } +if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkstat $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char kstat_open (); +int +main () +{ +return kstat_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_kstat_kstat_open=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_kstat_kstat_open=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 +$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } +if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBKSTAT 1 +_ACEOF + + LIBKSTAT="-lkstat" + +fi + +fi + { $as_echo "$as_me:$LINENO: checking for -lodbc" >&5 $as_echo_n "checking for -lodbc... " >&6; } if test "${ac_cv_lib_soname_odbc+set}" = set; then diff --git a/configure.ac b/configure.ac index c5ac0db..f70222f 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,7 @@ AC_CHECK_HEADERS(\ io.h \ jack/jack.h \ jpeglib.h \ + kstat.h \ lber.h \ lcms.h \ lcms/lcms.h \ @@ -1296,6 +1297,14 @@ fi WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], [libpng ${notice_platform}development files not found, PNG won't be supported.]) +dnl **** Check for libkstat **** +if test "$ac_cv_header_kstat_h" = "yes" +then + AC_CHECK_LIB(kstat,kstat_open, + [AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the `kstat' library (-lkstat).]) + AC_SUBST(LIBKSTAT,"-lkstat")]) +fi + dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) diff --git a/include/config.h.in b/include/config.h.in index 575bb8e..f3bd775 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -273,6 +273,9 @@ /* Define to 1 if you have the `kqueue' function. */ #undef HAVE_KQUEUE +/* Define to 1 if you have the <kstat.h> header file. */ +#undef HAVE_KSTAT_H + /* Define to 1 if you have the <lber.h> header file. */ #undef HAVE_LBER_H @@ -324,6 +327,9 @@ /* Define to 1 if you have the `i386' library (-li386). */ #undef HAVE_LIBI386 +/* Define to 1 if you have the `kstat' library (-lkstat). */ +#undef HAVE_LIBKSTAT + /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO

1 0