wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

André Hentschel : tools: Upgrade the config.guess/ config.sub scripts.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 2843d4f831aac681cdd42ee8fad950b93bce6875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2843d4f831aac681cdd42ee8f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 30 16:24:34 2011 +0200 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 223 +++++++++++++++++++++++++++------------------------- tools/config.sub | 122 ++++++++++++++++++----------- 2 files changed, 192 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2843d4f831aac681cdd42…

1 0

Louis Lenders : dwmapi: Add stub for DwmRegisterThumbnail.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 09dfda553c6afb26f2ac063d4549885f181620b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dfda553c6afb26f2ac063d4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 30 12:30:10 2011 +0200 dwmapi: Add stub for DwmRegisterThumbnail. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 10 ++++++++++ include/dwmapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 8e01cac..8f8f7a3 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -36,7 +36,7 @@ @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize -@ stub DwmRegisterThumbnail +@ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration @ stub DwmSetPresentParameters @ stdcall DwmSetWindowAttribute(long long ptr long) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1bc000..39a9918 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -198,3 +198,13 @@ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attrib return E_NOTIMPL; } + +/********************************************************************** + * DwmRegisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_id) +{ + FIXME("(%p %p %p) stub\n", dest, src, thumbnail_id); + + return E_NOTIMPL; +} diff --git a/include/dwmapi.h b/include/dwmapi.h index ecc515c..b2546ae 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -30,6 +30,7 @@ extern "C" { #endif DECLARE_HANDLE(HTHUMBNAIL); +typedef HTHUMBNAIL *PHTHUMBNAIL; typedef struct _MilMatrix3x2D { @@ -60,6 +61,7 @@ DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmIsCompositionEnabled(BOOL*); +DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL);

1 0

Bernhard Loos : ntdll: Implement the NamedPipeConfiguration value for the FilePipeLocalInformation class of NtQueryInformationFile .
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 07b681e04a19d9e95c1039c0a791608ef5897617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b681e04a19d9e95c1039c0a… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Sep 29 11:21:14 2011 +0200 ntdll: Implement the NamedPipeConfiguration value for the FilePipeLocalInformation class of NtQueryInformationFile. --- dlls/ntdll/file.c | 13 ++++++++++++- dlls/ntdll/tests/pipe.c | 7 ++++++- include/wine/server_protocol.h | 4 ++-- server/named_pipe.c | 1 + server/protocol.def | 1 + server/request.h | 9 +++++---- server/trace.c | 1 + 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 278da5d..53984f9 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1960,7 +1960,18 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, { pli->NamedPipeType = (reply->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) ? FILE_PIPE_TYPE_MESSAGE : FILE_PIPE_TYPE_BYTE; - pli->NamedPipeConfiguration = 0; /* FIXME */ + switch (reply->sharing) + { + case FILE_SHARE_READ: + pli->NamedPipeConfiguration = FILE_PIPE_OUTBOUND; + break; + case FILE_SHARE_WRITE: + pli->NamedPipeConfiguration = FILE_PIPE_INBOUND; + break; + case FILE_SHARE_READ | FILE_SHARE_WRITE: + pli->NamedPipeConfiguration = FILE_PIPE_FULL_DUPLEX; + break; + } pli->MaximumInstances = reply->maxinstances; pli->CurrentInstances = reply->instances; pli->InboundQuota = reply->insize; diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index e7c49b8..29bb6da 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -181,7 +181,8 @@ static void test_create(void) IO_STATUS_BLOCK iosb; static const DWORD access[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE}; - static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; + static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; + static const DWORD pipe_config[]= { 1, 0, 2 }; for (j = 0; j < sizeof(sharing) / sizeof(DWORD); j++) { for (k = 0; k < sizeof(access) / sizeof(DWORD); k++) { @@ -196,12 +197,16 @@ static void test_create(void) res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); + ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", + info.NamedPipeConfiguration, pipe_config[j]); hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0); if (hclient != INVALID_HANDLE_VALUE) { res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n", res, access[k], sharing[j]); + ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", + info.NamedPipeConfiguration, pipe_config[j]); CloseHandle(hclient); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9db7f78..e0b0ac8 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3063,11 +3063,11 @@ struct get_named_pipe_info_reply { struct reply_header __header; unsigned int flags; + unsigned int sharing; unsigned int maxinstances; unsigned int instances; unsigned int outsize; unsigned int insize; - char __pad_28[4]; }; @@ -5637,6 +5637,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 426 +#define SERVER_PROTOCOL_VERSION 427 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/named_pipe.c b/server/named_pipe.c index d6c1383..d720b17 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1026,6 +1026,7 @@ DECL_HANDLER(get_named_pipe_info) } reply->flags = server->pipe->flags; + reply->sharing = server->pipe->sharing; reply->maxinstances = server->pipe->maxinstances; reply->instances = server->pipe->instances; reply->insize = server->pipe->insize; diff --git a/server/protocol.def b/server/protocol.def index 71524a4..bec2e3c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2208,6 +2208,7 @@ enum message_type obj_handle_t handle; @REPLY unsigned int flags; + unsigned int sharing; unsigned int maxinstances; unsigned int instances; unsigned int outsize; diff --git a/server/request.h b/server/request.h index 2d4528a..b875e30 100644 --- a/server/request.h +++ b/server/request.h @@ -1489,10 +1489,11 @@ C_ASSERT( sizeof(struct create_named_pipe_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_named_pipe_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, flags) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, maxinstances) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, instances) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, outsize) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, insize) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, sharing) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, maxinstances) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, instances) == 20 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, outsize) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, insize) == 28 ); C_ASSERT( sizeof(struct get_named_pipe_info_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, parent) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, owner) == 16 ); diff --git a/server/trace.c b/server/trace.c index 670958a..188eee4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2629,6 +2629,7 @@ static void dump_get_named_pipe_info_request( const struct get_named_pipe_info_r static void dump_get_named_pipe_info_reply( const struct get_named_pipe_info_reply *req ) { fprintf( stderr, " flags=%08x", req->flags ); + fprintf( stderr, ", sharing=%08x", req->sharing ); fprintf( stderr, ", maxinstances=%08x", req->maxinstances ); fprintf( stderr, ", instances=%08x", req->instances ); fprintf( stderr, ", outsize=%08x", req->outsize );

1 0

Bernhard Loos : server: Correctly implement permission checking for named pipes.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 9034e694a36df25fadd654c29a13bdd1444bbd6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9034e694a36df25fadd654c29… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Sep 29 11:20:50 2011 +0200 server: Correctly implement permission checking for named pipes. --- dlls/ntdll/tests/pipe.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 10 +++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 26c38b0..e7c49b8 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -172,6 +172,55 @@ static void test_create_invalid(void) CloseHandle(handle); } +static void test_create(void) +{ + HANDLE hserver; + NTSTATUS res; + int j, k; + FILE_PIPE_LOCAL_INFORMATION info; + IO_STATUS_BLOCK iosb; + + static const DWORD access[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE}; + static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; + + for (j = 0; j < sizeof(sharing) / sizeof(DWORD); j++) { + for (k = 0; k < sizeof(access) / sizeof(DWORD); k++) { + HANDLE hclient; + BOOL should_succeed = TRUE; + + res = create_pipe(&hserver, sharing[j], FILE_SYNCHRONOUS_IO_NONALERT); + if (res) { + ok(0, "NtCreateNamedPipeFile returned %x, sharing: %x\n", res, sharing[j]); + continue; + } + + res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); + + hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0); + if (hclient != INVALID_HANDLE_VALUE) { + res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n", + res, access[k], sharing[j]); + CloseHandle(hclient); + } + + if (access[k] & GENERIC_WRITE) + should_succeed &= !!(sharing[j] & FILE_SHARE_WRITE); + if (access[k] & GENERIC_READ) + should_succeed &= !!(sharing[j] & FILE_SHARE_READ); + + if (should_succeed) + ok(hclient != INVALID_HANDLE_VALUE, "CreateFile failed for sharing %x, access: %x, GetLastError: %d\n", + sharing[j], access[k], GetLastError()); + else + ok(hclient == INVALID_HANDLE_VALUE, "CreateFile succeded for sharing %x, access: %x\n", sharing[j], access[k]); + + CloseHandle(hserver); + } + } +} + static BOOL ioapc_called; static void CALLBACK ioapc(void *arg, PIO_STATUS_BLOCK io, ULONG reserved) { @@ -419,6 +468,9 @@ START_TEST(pipe) trace("starting invalid create tests\n"); test_create_invalid(); + trace("starting create tests\n"); + test_create(); + trace("starting overlapped tests\n"); test_overlapped(); diff --git a/server/named_pipe.c b/server/named_pipe.c index 750f3bc..d6c1383 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -804,6 +804,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc struct named_pipe *pipe = (struct named_pipe *)obj; struct pipe_server *server; struct pipe_client *client; + unsigned int pipe_sharing; int fds[2]; if (!(server = find_available_server( pipe ))) @@ -812,6 +813,15 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } + pipe_sharing = server->pipe->sharing; + if (((access & GENERIC_READ) && !(pipe_sharing & FILE_SHARE_READ)) || + ((access & GENERIC_WRITE) && !(pipe_sharing & FILE_SHARE_WRITE))) + { + set_error( STATUS_ACCESS_DENIED ); + release_object( server ); + return NULL; + } + if ((client = create_pipe_client( options ))) { if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds ))

1 0

Bernhard Loos : server: It' s possible to call NtQueryInformationFile on a pipe if it was opened with access 0 .
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: e4c2a6d1cdc5c56404414afb1dd0ecc51938a4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c2a6d1cdc5c56404414afb1… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Sep 29 11:20:42 2011 +0200 server: It's possible to call NtQueryInformationFile on a pipe if it was opened with access 0. --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 358e702..26c38b0 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -160,7 +160,7 @@ static void test_create_invalid(void) ok(!res, "NtCreateNamedPipeFile returned %x\n", res); res = pNtQueryInformationFile(handle, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); - todo_wine ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %x\n", res); + ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %x\n", res); /* test FILE_CREATE creation disposition */ res = pNtCreateNamedPipeFile(&handle2, SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /*FILE_CREATE*/, diff --git a/server/named_pipe.c b/server/named_pipe.c index 66664bb..750f3bc 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1005,9 +1005,12 @@ DECL_HANDLER(get_named_pipe_info) server = get_pipe_server_obj( current->process, req->handle, FILE_READ_ATTRIBUTES ); if (!server) { + if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) + return; + clear_error(); client = (struct pipe_client *)get_handle_obj( current->process, req->handle, - FILE_READ_ATTRIBUTES, &pipe_client_ops ); + 0, &pipe_client_ops ); if (!client) return; server = client->server; }

1 0

André Hentschel : ole32: Return if out of memory ( Coverity).
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: c2015d334121729dc01eb1e90c39eb561589ac32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2015d334121729dc01eb1e90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 28 19:58:57 2011 +0200 ole32: Return if out of memory (Coverity). --- dlls/ole32/rpc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 8ac5d2d..35971e0 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -539,7 +539,10 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, if (msg->Buffer) status = RPC_S_OK; else - status = ERROR_OUTOFMEMORY; + { + HeapFree(GetProcessHeap(), 0, channel_hook_data); + return E_OUTOFMEMORY; + } } else status = I_RpcGetBuffer(msg);

1 0

Dmitry Timoshkov : user32: Add support for iPaddedBorderWidth in NONCLIENTMETRICS.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 70caadbf34807e96ed8543abd7efddc302b7798c URL: http://source.winehq.org/git/wine.git/?a=commit;h=70caadbf34807e96ed8543abd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 8 20:11:34 2011 +0900 user32: Add support for iPaddedBorderWidth in NONCLIENTMETRICS. --- dlls/user32/sysparams.c | 28 ++++++++++++++++++++++------ dlls/user32/tests/dialog.c | 2 +- dlls/user32/tests/generated.c | 36 ++++++++++++++++++++++++------------ dlls/user32/tests/sysparams.c | 37 +++++++++++++++++++++++++++++-------- include/winuser.h | 2 ++ 5 files changed, 78 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70caadbf34807e96ed854…

1 0

Charles Davis : iphlpapi: Implement GetUdpTable() on Mac OS and the BSDs.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 0cae7c5087f7bfa1bb48d440ebfd06588c3b9dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cae7c5087f7bfa1bb48d440e… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 7 19:56:54 2011 -0600 iphlpapi: Implement GetUdpTable() on Mac OS and the BSDs. --- dlls/iphlpapi/ipstats.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 8847e09..0a74748 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1531,6 +1531,76 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOr } else ret = ERROR_NOT_SUPPORTED; } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN) + { + size_t Len = 0; + char *Buf = NULL; + struct xinpgen *pXIG, *pOrigXIG; + + if (sysctlbyname ("net.inet.udp.pcblist", NULL, &Len, NULL, 0) < 0) + { + ERR ("Failure to read net.inet.udp.pcblist via sysctlbyname!\n"); + ret = ERROR_NOT_SUPPORTED; + goto done; + } + + Buf = HeapAlloc (GetProcessHeap (), 0, Len); + if (!Buf) + { + ret = ERROR_OUTOFMEMORY; + goto done; + } + + if (sysctlbyname ("net.inet.udp.pcblist", Buf, &Len, NULL, 0) < 0) + { + ERR ("Failure to read net.inet.udp.pcblist via sysctlbyname!\n"); + ret = ERROR_NOT_SUPPORTED; + goto done; + } + + /* Might be nothing here; first entry is just a header it seems */ + if (Len <= sizeof (struct xinpgen)) goto done; + + pOrigXIG = (struct xinpgen *)Buf; + pXIG = pOrigXIG; + + for (pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len); + pXIG->xig_len > sizeof (struct xinpgen); + pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len)) + { + struct inpcb *pINData; + struct xsocket *pSockData; + + pINData = &((struct xinpcb *)pXIG)->xi_inp; + pSockData = &((struct xinpcb *)pXIG)->xi_socket; + + /* Ignore sockets for other protocols */ + if (pSockData->xso_protocol != IPPROTO_UDP) + continue; + + /* Ignore PCBs that were freed while generating the data */ + if (pINData->inp_gencnt > pOrigXIG->xig_gen) + continue; + + /* we're only interested in IPv4 addresses */ + if (!(pINData->inp_vflag & INP_IPV4) || + (pINData->inp_vflag & INP_IPV6)) + continue; + + /* If all 0's, skip it */ + if (!pINData->inp_laddr.s_addr && + !pINData->inp_lport) + continue; + + /* Fill in structure details */ + row.dwLocalAddr = pINData->inp_laddr.s_addr; + row.dwLocalPort = pINData->inp_lport; + if (!(table = append_udp_row( heap, flags, table, &count, &row ))) break; + } + + done: + HeapFree (GetProcessHeap (), 0, Buf); + } #else FIXME( "not implemented\n" ); ret = ERROR_NOT_SUPPORTED;

1 0

Charles Davis : loader: Fix constant address warning on Mac OS.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: ec37157b06ac41b268799de1a48721eacd15dc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec37157b06ac41b268799de1a… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 7 16:05:25 2011 -0600 loader: Fix constant address warning on Mac OS. --- loader/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/loader/main.c b/loader/main.c index 8434d81..11f475b 100644 --- a/loader/main.c +++ b/loader/main.c @@ -219,7 +219,9 @@ int main( int argc, char *argv[] ) } } +#ifndef __APPLE__ if (wine_main_preload_info) +#endif { for (i = 0; wine_main_preload_info[i].size; i++) reserve_area( wine_main_preload_info[i].addr, wine_main_preload_info[i].size );

1 0

Andrew Talbot : msvcrt: Remove a superfluous semicolon.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 5f16eb9c48e2a066555eedcd5479b76ef7852e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f16eb9c48e2a066555eedcd5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Oct 7 21:24:47 2011 +0100 msvcrt: Remove a superfluous semicolon. --- dlls/msvcrt/errno.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index a03b5ef..6094eae 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -164,7 +164,7 @@ void msvcrt_set_errno(int err) ERR_MAPS(ERROR_INVALID_HANDLE, MSVCRT_EBADF); ERR_CASE(ERROR_OUTOFMEMORY) ERR_CASE(ERROR_INVALID_BLOCK) - ERR_CASE(ERROR_NOT_ENOUGH_QUOTA); + ERR_CASE(ERROR_NOT_ENOUGH_QUOTA) ERR_MAPS(ERROR_ARENA_TRASHED, MSVCRT_ENOMEM); ERR_MAPS(ERROR_BUSY, MSVCRT_EBUSY); ERR_CASE(ERROR_ALREADY_EXISTS)

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011