January 2013 - Wine-Commits

Henri Verbeet : wined3d: Simplify select_card_amd_mesa() a bit.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: cf4f09cf8591f3233c7be7823651bc133c6ae163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4f09cf8591f3233c7be7823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 3 11:56:24 2013 +0100 wined3d: Simplify select_card_amd_mesa() a bit. We can use the same code for the Gallium and "classic" drivers, and the classic drivers are no longer supported upstream anyway. --- dlls/wined3d/directx.c | 209 +++++++++++++++++++----------------------------- 1 files changed, 82 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf4f09cf8591f3233c7be…

1 0

Henri Verbeet : ddraw: Avoid LPD3DHVERTEX.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: edf8058e3cfe0e6258f799904b20c1fb5cb4dd6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf8058e3cfe0e6258f799904… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 3 11:56:22 2013 +0100 ddraw: Avoid LPD3DHVERTEX. --- include/d3dtypes.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index d51af11..90f7981 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -472,7 +472,7 @@ typedef struct _D3DTRANSFORMDATA { DWORD dwInSize; LPVOID lpOut; DWORD dwOutSize; - LPD3DHVERTEX lpHOut; + D3DHVERTEX *lpHOut; DWORD dwClip; DWORD dwClipIntersection; DWORD dwClipUnion;

1 0

Henri Verbeet : ddraw: Avoid LPD3DTLVERTEX.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 06729ed74f7d7f4d533b74edd3a59fef773a7aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06729ed74f7d7f4d533b74edd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 3 11:56:23 2013 +0100 ddraw: Avoid LPD3DTLVERTEX. --- include/d3dtypes.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 90f7981..59ac720 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -599,7 +599,7 @@ typedef struct _D3DLIGHTDATA { DWORD dwSize; LPD3DLIGHTINGELEMENT lpIn; DWORD dwInSize; - LPD3DTLVERTEX lpOut; + D3DTLVERTEX *lpOut; DWORD dwOutSize; } D3DLIGHTDATA, *LPD3DLIGHTDATA;

1 0

Alexandre Julliard : advapi32/tests: Fix test failures on older Windows versions.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 2c0b470019c55eb22f7eda06d1390153791d6834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0b470019c55eb22f7eda06d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 3 11:57:06 2013 +0100 advapi32/tests: Fix test failures on older Windows versions. --- dlls/advapi32/tests/service.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 65702ad..2eeb40a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1856,7 +1856,9 @@ static void test_sequence(void) bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, NULL, 0, &n1); error = GetLastError(); ok(!bret, "Expected QueryServiceObjectSecurity to fail: result %d\n", bret); - ok(error == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); + ok(error == ERROR_INSUFFICIENT_BUFFER || broken(error == ERROR_INVALID_ADDRESS), + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); + if (error == ERROR_INVALID_ADDRESS) n1 = 1024; pSD = LocalAlloc(0, n1); bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, n1, &n2); ok(bret, "Expected QueryServiceObjectSecurity to succeed: result %d\n", bret);

1 0

Dmitry Timoshkov : wineps.drv/generic.ppd: Change default page extents to A4 to match *DefaultPageSize.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 2b455abb93b732c06c18bd6c66fb578502f3182d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b455abb93b732c06c18bd6c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 3 14:07:47 2013 +0800 wineps.drv/generic.ppd: Change default page extents to A4 to match *DefaultPageSize. --- dlls/wineps.drv/generic.ppd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/generic.ppd b/dlls/wineps.drv/generic.ppd index ccc4f63..b6e4628 100644 --- a/dlls/wineps.drv/generic.ppd +++ b/dlls/wineps.drv/generic.ppd @@ -61,7 +61,7 @@ *PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice" *CloseUI: *PageRegion -*DefaultImageableArea: Letter +*DefaultImageableArea: A4 *ImageableArea Letter/US Letter: "18 18 594 774" *ImageableArea Legal/US Legal: "18 18 594 990" *ImageableArea Executive/Executive: "18 18 504 738" @@ -75,7 +75,7 @@ *ImageableArea EnvDL/EnvDL: "18 36 294 588" *ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" -*DefaultPaperDimension: Letter +*DefaultPaperDimension: A4 *PaperDimension Letter/Letter: "612 792" *PaperDimension Legal/Legal: "612 1008" *PaperDimension Executive/Executive: "522 756"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: c903135dbee0d0aaa5e28fdd982ea32960b5df29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c903135dbee0d0aaa5e28fdd9… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jan 3 05:18:19 2013 +0100 po: Update German translation. --- po/de.po | 56 ++++++++++++++++++++++++-------------------------------- 1 files changed, 24 insertions(+), 32 deletions(-) diff --git a/po/de.po b/po/de.po index 6d8bdee..5faa994 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-12-13 02:22+0100\n" +"PO-Revision-Date: 2013-01-03 05:17+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -10196,27 +10196,27 @@ msgstr "" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "'Division durch Null'-Fehler.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "Operand erwartet.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Unerwarteter Netzwerkfehler.\n" +msgstr "Operator erwartet.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "Klammern stimmen nicht überein.\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"Zahl ungültig formatiert - muss dezimal (12),\n" +" hexadezimal (0x34) oder oktal (056) sein.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10438,79 +10438,71 @@ msgstr "Die folgenden Dienste laufen:\n" #: netstat.rc:27 msgid "CLOSED" -msgstr "" +msgstr "GESCHLOSSEN" #: netstat.rc:28 msgid "LISTENING" -msgstr "" +msgstr "LAUSCHEND" #: netstat.rc:29 msgid "SYN_SENT" -msgstr "" +msgstr "SYN_GSNDT" #: netstat.rc:30 msgid "SYN_RCVD" -msgstr "" +msgstr "SYN_EMPF" #: netstat.rc:31 msgid "ESTABLISHED" -msgstr "" +msgstr "HERGESTELLT" #: netstat.rc:32 msgid "FIN_WAIT1" -msgstr "" +msgstr "ABSCH_WARTEN1" #: netstat.rc:33 msgid "FIN_WAIT2" -msgstr "" +msgstr "ABSCH_WARTEN2" #: netstat.rc:34 msgid "CLOSE_WAIT" -msgstr "" +msgstr "SCHLIESSEN_WARTEN" #: netstat.rc:35 msgid "CLOSING" -msgstr "" +msgstr "SCHLIESSEND" #: netstat.rc:36 msgid "LAST_ACK" -msgstr "" +msgstr "LETZTES_ACK" #: netstat.rc:37 msgid "TIME_WAIT" -msgstr "" +msgstr "ZEIT_WARTEN" #: netstat.rc:38 msgid "DELETE_TCB" -msgstr "" +msgstr "TCB_LOESCHEN" #: netstat.rc:40 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "LAN-Verbindung" +msgstr "Aktive Verbindungen" #: netstat.rc:41 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:42 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "E-Mail-Adresse" +msgstr "Lokale Adresse" #: netstat.rc:43 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Straße" +msgstr "Entfernte Adresse" #: netstat.rc:44 -#, fuzzy -#| msgid "Status" msgid "State" -msgstr "Status" +msgstr "Zustand" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Jacek Caban : atl100: Added AtlAdvise implementation.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: e57b22b960c086ed4ce789c9cd881870be24e61f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57b22b960c086ed4ce789c9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 11:45:44 2013 +0100 atl100: Added AtlAdvise implementation. --- dlls/atl100/atl.c | 22 ++++++- dlls/atl100/tests/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 128 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 1033952..00d62de 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -41,10 +41,26 @@ static ICatRegister *catreg; /*********************************************************************** * AtlAdvise [atl100.@] */ -HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID *iid, LPDWORD pdw) +HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID *iid, DWORD *pdw) { - FIXME("%p %p %p %p\n", pUnkCP, pUnk, iid, pdw); - return E_FAIL; + IConnectionPointContainer *container; + IConnectionPoint *cp; + HRESULT hres; + + TRACE("%p %p %p %p\n", pUnkCP, pUnk, iid, pdw); + + hres = IUnknown_QueryInterface(pUnkCP, &IID_IConnectionPointContainer, (void**)&container); + if(FAILED(hres)) + return hres; + + hres = IConnectionPointContainer_FindConnectionPoint(container, iid, &cp); + IConnectionPointContainer_Release(container); + if(FAILED(hres)) + return hres; + + hres = IConnectionPoint_Advise(cp, pUnk, pdw); + IConnectionPoint_Release(cp); + return hres; } /*********************************************************************** diff --git a/dlls/atl100/tests/Makefile.in b/dlls/atl100/tests/Makefile.in index 7af0bcd..0b8353e 100644 --- a/dlls/atl100/tests/Makefile.in +++ b/dlls/atl100/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = atl100.dll -IMPORTS = atl100 oleaut32 ole32 advapi32 +IMPORTS = uuid atl100 oleaut32 ole32 advapi32 EXTRADEFS = -D_ATL_VER=_ATL_VER_100 C_SRCS = \ diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index c640003..8b5edae 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -20,6 +20,7 @@ #include <stdio.h> #define COBJMACROS +#define CONST_VTABLE #include <atlbase.h> @@ -207,6 +208,132 @@ static void test_typelib(void) ITypeLib_Release(typelib); } +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IConnectionPoint, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **ppCPC) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, + DWORD *pdwCookie) +{ + ok(pUnkSink == (IUnknown*)0xdead0000, "pUnkSink = %p\n", pUnkSink); + *pdwCookie = 0xdeadbeef; + return S_OK; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, + IEnumConnections **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = +{ + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + +static IConnectionPoint ConnectionPoint = { &ConnectionPointVtbl }; + +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + ok(IsEqualGUID(riid, &CLSID_Test), "unexpected riid\n"); + *ppCP = &ConnectionPoint; + return S_OK; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + +static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointContainerVtbl }; + +static void test_cp(void) +{ + DWORD cookie = 0; + HRESULT hres; + + hres = AtlAdvise((IUnknown*)&ConnectionPointContainer, (IUnknown*)0xdead0000, &CLSID_Test, &cookie); + ok(hres == S_OK, "AtlAdvise failed: %08x\n", hres); + ok(cookie == 0xdeadbeef, "cookie = %x\n", cookie); +} + START_TEST(atl) { CoInitialize(NULL); @@ -214,6 +341,7 @@ START_TEST(atl) test_winmodule(); test_regcat(); test_typelib(); + test_cp(); CoUninitialize(); }

1 0

Jacek Caban : atl100: Added AtlUnadvise implementation.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 6de3e39aa440cdb75fdfd1071d164cd7445cc24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de3e39aa440cdb75fdfd1071… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 11:45:54 2013 +0100 atl100: Added AtlUnadvise implementation. --- dlls/atl100/atl.c | 20 ++++++++++++++++++-- dlls/atl100/tests/atl.c | 13 +++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 00d62de..4e2ba9f 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -68,8 +68,24 @@ HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID *iid, DWORD */ HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID *iid, DWORD dw) { - FIXME("%p %p %d\n", pUnkCP, iid, dw); - return S_OK; + IConnectionPointContainer *container; + IConnectionPoint *cp; + HRESULT hres; + + TRACE("%p %p %d\n", pUnkCP, iid, dw); + + hres = IUnknown_QueryInterface(pUnkCP, &IID_IConnectionPointContainer, (void**)&container); + if(FAILED(hres)) + return hres; + + hres = IConnectionPointContainer_FindConnectionPoint(container, iid, &cp); + IConnectionPointContainer_Release(container); + if(FAILED(hres)) + return hres; + + hres = IConnectionPoint_Unadvise(cp, dw); + IConnectionPoint_Release(cp); + return hres; } /*********************************************************************** diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 8b5edae..963b39e 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -242,18 +242,22 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi return E_NOTIMPL; } +static int advise_cnt; + static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, DWORD *pdwCookie) { ok(pUnkSink == (IUnknown*)0xdead0000, "pUnkSink = %p\n", pUnkSink); *pdwCookie = 0xdeadbeef; + advise_cnt++; return S_OK; } static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + ok(dwCookie == 0xdeadbeef, "dwCookie = %x\n", dwCookie); + advise_cnt--; + return S_OK; } static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, @@ -332,6 +336,11 @@ static void test_cp(void) hres = AtlAdvise((IUnknown*)&ConnectionPointContainer, (IUnknown*)0xdead0000, &CLSID_Test, &cookie); ok(hres == S_OK, "AtlAdvise failed: %08x\n", hres); ok(cookie == 0xdeadbeef, "cookie = %x\n", cookie); + ok(advise_cnt == 1, "advise_cnt = %d\n", advise_cnt); + + hres = AtlUnadvise((IUnknown*)&ConnectionPointContainer, &CLSID_Test, 0xdeadbeef); + ok(hres == S_OK, "AtlUnadvise failed: %08x\n", hres); + ok(!advise_cnt, "advise_cnt = %d\n", advise_cnt); } START_TEST(atl)

1 0

Jacek Caban : user32: Initialize cbSize of NONCLIENTMETRICSW struct in GetSystemMetrics.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: ded419707ac75182259cd58d5c5e3904532d933d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded419707ac75182259cd58d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 11:45:02 2013 +0100 user32: Initialize cbSize of NONCLIENTMETRICSW struct in GetSystemMetrics. --- dlls/user32/sysparams.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5029902..175753c 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2419,6 +2419,7 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_RESERVED4: return 0; case SM_CXMIN: + ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); get_text_metr_size( get_display_dc(), &ncm.lfCaptionFont, NULL, &ret ); return 3 * ncm.iCaptionWidth + ncm.iCaptionHeight + 4 * ret + 2 * GetSystemMetrics(SM_CXFRAME) + 4; @@ -2428,6 +2429,7 @@ INT WINAPI GetSystemMetrics( INT index ) get_entry( &entry_CAPTIONWIDTH, 0, &ret ); return max( 8, ret ); case SM_CYSIZE: + ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iCaptionHeight; case SM_CXFRAME: @@ -2486,12 +2488,14 @@ INT WINAPI GetSystemMetrics( INT index ) get_entry( &entry_SMCAPTIONWIDTH, 0, &ret ); return ret; case SM_CYSMSIZE: + ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iSmCaptionHeight; case SM_CXMENUSIZE: get_entry( &entry_MENUWIDTH, 0, &ret ); return ret; case SM_CYMENUSIZE: + ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iMenuHeight; case SM_ARRANGE: @@ -2529,6 +2533,7 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CYMENUCHECK: { TEXTMETRICW tm; + ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); get_text_metr_size( get_display_dc(), &ncm.lfMenuFont, &tm, NULL); return tm.tmHeight <= 0 ? 13 : ((tm.tmHeight + tm.tmExternalLeading + 1) / 2) * 2 - 1;

1 0

André Hentschel : netstat: Parse command line arguments.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: c25c7f804988a782b2eb7f515f322b51b5557f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25c7f804988a782b2eb7f515… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 21:37:45 2013 +0100 netstat: Parse command line arguments. --- programs/netstat/netstat.c | 60 ++++++++++++++++++++++++++++++++++++------- programs/netstat/netstat.h | 12 +++++++++ 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 999e409..dede96d 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -24,7 +24,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(netstat); +static const WCHAR ipW[] = {'I', 'P', 0}; +static const WCHAR ipv6W[] = {'I', 'P', 'v', '6', 0}; +static const WCHAR icmpW[] = {'I', 'C', 'M', 'P', 0}; +static const WCHAR icmpv6W[] = {'I', 'C', 'M', 'P', 'v', '6', 0}; static const WCHAR tcpW[] = {'T', 'C', 'P', 0}; +static const WCHAR tcpv6W[] = {'T', 'C', 'P', 'v', '6', 0}; +static const WCHAR udpW[] = {'U', 'D', 'P', 0}; +static const WCHAR udpv6W[] = {'U', 'D', 'P', 'v', '6', 0}; + static const WCHAR fmtport[] = {'%', 'd', 0}; static const WCHAR fmtip[] = {'%', 'd', '.', '%', 'd', '.', '%', 'd', '.', '%', 'd', 0}; static const WCHAR fmtn[] = {'\n', 0}; @@ -181,26 +189,58 @@ static void NETSTAT_tcp_table(void) HeapFree(GetProcessHeap(), 0, table); } +static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[]) +{ + if (!strcmpiW(name, ipW)) return PROT_IP; + if (!strcmpiW(name, ipv6W)) return PROT_IPV6; + if (!strcmpiW(name, icmpW)) return PROT_ICMP; + if (!strcmpiW(name, icmpv6W)) return PROT_ICMPV6; + if (!strcmpiW(name, tcpW)) return PROT_TCP; + if (!strcmpiW(name, tcpv6W)) return PROT_TCPV6; + if (!strcmpiW(name, udpW)) return PROT_UDP; + if (!strcmpiW(name, udpv6W)) return PROT_UDPV6; + return PROT_UNKNOWN; +} + int wmain(int argc, WCHAR *argv[]) { WSADATA wsa_data; - if (argc > 1) - { - int i; - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); - } - if (WSAStartup(MAKEWORD(2, 2), &wsa_data)) { WINE_ERR("WSAStartup failed: %d\n", WSAGetLastError()); return 1; } - NETSTAT_tcp_table(); + if (argc == 1) + { + /* No options */ + NETSTAT_tcp_table(); + return 0; + } + + while (argv[1] && argv[1][0] == '-') + { + switch (argv[1][1]) + { + case 'p': + argv++; argc--; + if (argc == 1) return 1; + switch (NETSTAT_get_protocol(argv[1])) + { + case PROT_TCP: + NETSTAT_tcp_table(); + break; + default: + WINE_FIXME("Protocol not yet implemented: %s\n", debugstr_w(argv[1])); + } + break; + default: + WINE_FIXME("Unknown option: %s\n", debugstr_w(argv[1])); + return 1; + } + argv++; argc--; + } return 0; } diff --git a/programs/netstat/netstat.h b/programs/netstat/netstat.h index b51a81f..dc4fb1e 100644 --- a/programs/netstat/netstat.h +++ b/programs/netstat/netstat.h @@ -18,6 +18,18 @@ #include <windows.h> +typedef enum _NETSTATPROTOCOLS { + PROT_UNKNOWN, + PROT_IP, + PROT_IPV6, + PROT_ICMP, + PROT_ICMPV6, + PROT_TCP, + PROT_TCPV6, + PROT_UDP, + PROT_UDPV6, +} NETSTATPROTOCOLS; + #define IDS_TCP_CLOSED 1 #define IDS_TCP_LISTENING 2 #define IDS_TCP_SYN_SENT 3

1 0