October 2011 - Wine-commits

Andrew Talbot : ntdll: Mark some fall-throughs in a switch statement.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: c228ecba3918a2e6fd3a27c2e7a8c4296467729c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c228ecba3918a2e6fd3a27c2e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 17:51:42 2011 +0100 ntdll: Mark some fall-throughs in a switch statement. --- dlls/ntdll/sec.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index c8e8a4d..5e27730 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -166,12 +166,19 @@ NTSTATUS WINAPI RtlAllocateAndInitializeSid ( switch( nSubAuthorityCount ) { case 8: tmp_sid->SubAuthority[7]= nSubAuthority7; + /* fall through */ case 7: tmp_sid->SubAuthority[6]= nSubAuthority6; + /* fall through */ case 6: tmp_sid->SubAuthority[5]= nSubAuthority5; + /* fall through */ case 5: tmp_sid->SubAuthority[4]= nSubAuthority4; + /* fall through */ case 4: tmp_sid->SubAuthority[3]= nSubAuthority3; + /* fall through */ case 3: tmp_sid->SubAuthority[2]= nSubAuthority2; + /* fall through */ case 2: tmp_sid->SubAuthority[1]= nSubAuthority1; + /* fall through */ case 1: tmp_sid->SubAuthority[0]= nSubAuthority0; break; }

1 0

Andrew Talbot : oleaut32: Mark some fall-throughs in a switch statement.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: c9a8d3bd8906932130cd98b667574031895f83f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a8d3bd8906932130cd98b66… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 17:51:45 2011 +0100 oleaut32: Mark some fall-throughs in a switch statement. --- dlls/oleaut32/typelib2.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index d761491..fd4e547 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -899,11 +899,13 @@ static HRESULT ctl2_encode_variant( mask = 0x3ffffff; if(V_UI4(&v)>0x3ffffff) break; + /* fall through */ case VT_I1: case VT_UI1: case VT_BOOL: - if(!mask) - mask = 0xff; + if(!mask) + mask = 0xff; + /* fall through */ case VT_I2: case VT_UI2: if(!mask)

1 0

Frédéric Delanoy : cmd: Consistently use infinitive forms in commands help summary.
by Alexandre Julliard 08 Oct '11

08 Oct '11

1 0

Frédéric Delanoy : cmd: Make PAUSE accept any keypress instead of a full input line.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: e0ec3e400df12f682bf279e3588d7656a7298c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ec3e400df12f682bf279e35… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 7 01:02:08 2011 +0200 cmd: Make PAUSE accept any keypress instead of a full input line. --- po/ar.po | 83 +++++++++++++++++++++-------------------- po/bg.po | 83 +++++++++++++++++++++-------------------- po/ca.po | 83 +++++++++++++++++++++-------------------- po/cs.po | 83 +++++++++++++++++++++-------------------- po/da.po | 85 ++++++++++++++++++++++-------------------- po/de.po | 85 ++++++++++++++++++++++-------------------- po/el.po | 83 +++++++++++++++++++++-------------------- po/en.po | 94 ++++++++++++++++++++++++----------------------- po/en_US.po | 94 ++++++++++++++++++++++++----------------------- po/eo.po | 83 +++++++++++++++++++++-------------------- po/es.po | 85 ++++++++++++++++++++++-------------------- po/fa.po | 83 +++++++++++++++++++++-------------------- po/fi.po | 83 +++++++++++++++++++++-------------------- po/fr.po | 85 ++++++++++++++++++++++-------------------- po/he.po | 85 ++++++++++++++++++++++-------------------- po/hi.po | 83 +++++++++++++++++++++-------------------- po/hu.po | 83 +++++++++++++++++++++-------------------- po/it.po | 85 ++++++++++++++++++++++-------------------- po/ja.po | 85 ++++++++++++++++++++++-------------------- po/ko.po | 85 ++++++++++++++++++++++-------------------- po/lt.po | 85 ++++++++++++++++++++++-------------------- po/ml.po | 83 +++++++++++++++++++++-------------------- po/nb_NO.po | 84 +++++++++++++++++++++-------------------- po/nl.po | 85 ++++++++++++++++++++++-------------------- po/or.po | 83 +++++++++++++++++++++-------------------- po/pa.po | 83 +++++++++++++++++++++-------------------- po/pl.po | 85 ++++++++++++++++++++++-------------------- po/pt_BR.po | 85 ++++++++++++++++++++++-------------------- po/pt_PT.po | 84 +++++++++++++++++++++-------------------- po/rm.po | 83 +++++++++++++++++++++-------------------- po/ro.po | 85 ++++++++++++++++++++++-------------------- po/ru.po | 85 ++++++++++++++++++++++-------------------- po/sk.po | 83 +++++++++++++++++++++-------------------- po/sl.po | 85 ++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 83 +++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 83 +++++++++++++++++++++-------------------- po/sv.po | 85 ++++++++++++++++++++++-------------------- po/te.po | 83 +++++++++++++++++++++-------------------- po/th.po | 83 +++++++++++++++++++++-------------------- po/tr.po | 84 +++++++++++++++++++++-------------------- po/uk.po | 85 ++++++++++++++++++++++-------------------- po/wa.po | 83 +++++++++++++++++++++-------------------- po/wine.pot | 83 +++++++++++++++++++++-------------------- po/zh_CN.po | 83 +++++++++++++++++++++-------------------- po/zh_TW.po | 83 +++++++++++++++++++++-------------------- programs/cmd/builtins.c | 21 +++++++--- programs/cmd/cmd.rc | 11 +++-- 47 files changed, 1960 insertions(+), 1866 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0ec3e400df12f682bf27…

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

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

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

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

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

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