wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Owen Rudge : d3dx10: Add stub for d3dx10_39.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: fb8d7cdedf6afea8ffd245e32bb0b2510e413ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8d7cdedf6afea8ffd245e32… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 18 16:02:06 2010 -0500 d3dx10: Add stub for d3dx10_39. --- configure | 1 + configure.ac | 1 + dlls/d3dx10_39/Makefile.in | 12 +++ dlls/d3dx10_39/d3dx10_39.spec | 180 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_39/d3dx10_39_main.c | 63 ++++++++++++++ dlls/d3dx10_39/version.rc | 26 ++++++ 6 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb8d7cdedf6afea8ffd24…

1 0

Owen Rudge : d3dx10: Add stub for d3dx10_40.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 662cbb16f8f0d2e84cc14f2262b4c8e4d634f2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=662cbb16f8f0d2e84cc14f226… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 18 16:02:03 2010 -0500 d3dx10: Add stub for d3dx10_40. --- configure | 1 + configure.ac | 1 + dlls/d3dx10_40/Makefile.in | 12 +++ dlls/d3dx10_40/d3dx10_40.spec | 176 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_40/d3dx10_40_main.c | 63 ++++++++++++++ dlls/d3dx10_40/version.rc | 26 ++++++ 6 files changed, 279 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=662cbb16f8f0d2e84cc14…

1 0

Owen Rudge : d3dx10: Add stub for d3dx10_41.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 17591cc3bfb38a243e2477b2f1fe831cb988320d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17591cc3bfb38a243e2477b2f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 18 16:01:59 2010 -0500 d3dx10: Add stub for d3dx10_41. --- configure | 1 + configure.ac | 1 + dlls/d3dx10_41/Makefile.in | 12 +++ dlls/d3dx10_41/d3dx10_41.spec | 176 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_41/d3dx10_41_main.c | 63 ++++++++++++++ dlls/d3dx10_41/version.rc | 26 ++++++ 6 files changed, 279 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17591cc3bfb38a243e247…

1 0

Owen Rudge : d3dx10: Add stub for d3dx10_42.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: e5d9e12c7229aa980d11b94a9f3169dd29074345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d9e12c7229aa980d11b94a9… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 18 16:01:57 2010 -0500 d3dx10: Add stub for d3dx10_42. --- configure | 1 + configure.ac | 1 + dlls/d3dx10_42/Makefile.in | 12 +++ dlls/d3dx10_42/d3dx10_42.spec | 176 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_42/d3dx10_42_main.c | 63 ++++++++++++++ dlls/d3dx10_42/version.rc | 26 ++++++ 6 files changed, 279 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5d9e12c7229aa980d11b…

1 0

Owen Rudge : d3dx10: Add stub for d3dx10_43.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 3c5b2e6e50c8bab10e1b71543196dfb3f6d94102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5b2e6e50c8bab10e1b71543… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 18 16:01:53 2010 -0500 d3dx10: Add stub for d3dx10_43. --- configure | 1 + configure.ac | 1 + dlls/d3dx10_43/Makefile.in | 12 +++ dlls/d3dx10_43/d3dx10_43.spec | 176 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 63 ++++++++++++++ dlls/d3dx10_43/version.rc | 26 ++++++ 6 files changed, 279 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c5b2e6e50c8bab10e1b7…

1 0

Austin Lund : comctl32/tests: DateTimePicker and MonthCalendar controls only support Gregorian calendar.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 8fdb1bec125a1b7d2d711a684a7da4cd2b23cb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdb1bec125a1b7d2d711a684… Author: Austin Lund <austin.lund(a)gmail.com> Date: Thu Aug 19 15:50:04 2010 +1000 comctl32/tests: DateTimePicker and MonthCalendar controls only support Gregorian calendar. --- dlls/comctl32/tests/datetime.c | 18 +++++++++++++----- dlls/comctl32/tests/monthcal.c | 13 ++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 83f8e03..8b902ba 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -659,7 +659,7 @@ static void test_dtm_set_and_get_system_time(void) static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; - char buff[16], time[16]; + CHAR buff[16], time[16], caltype[3]; HWND hWnd; LRESULT ret; @@ -677,11 +677,19 @@ static void test_wm_set_get_text(void) ok(ret != 0, "Expected non-zero return value\n"); SetLastError(0xdeadbeef); - ret = GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); + ret = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ICALENDARTYPE, caltype, 3); if (ret == 0) - skip("GetDateFormat failed, returned %ld, error %d\n", ret, GetLastError()); - else - ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + skip("Must know local calendar type (%x)\n", GetLastError()); + else if (atoi(caltype) != CAL_GREGORIAN) + skip("DateTimePicker Control only supports Gregorian calendar (type: %s)\n", caltype); + else { + SetLastError(0xdeadbeef); + ret = GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); + if (ret == 0) + skip("GetDateFormat failed, returned %ld, error %d\n", ret, GetLastError()); + else + ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + } DestroyWindow(hWnd); } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index f3db522..52e16c3 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -781,9 +781,20 @@ static void test_currdate(void) static void test_firstDay(void) { int res, fday, i, prev; - CHAR b[128]; + CHAR b[128], caltype[3]; LCID lcid = LOCALE_USER_DEFAULT; HWND hwnd; + LRESULT ret; + + SetLastError(0xdeadbeef); + ret = GetLocaleInfoA(lcid, LOCALE_ICALENDARTYPE, caltype, 3); + if (ret == 0) { + skip("Must know local calendar type (%x)\n", GetLastError()); + return; + } else if (atoi(caltype) != CAL_GREGORIAN) { + skip("MonthCalendar Control only supports Gregorian calendar (type: %s)\n", caltype); + return; + } hwnd = create_monthcal_control(0);

1 0

Mikko Rasa : crypt32: Only clear *pcbDecoded on error in CryptVerifyMessageSignature.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: a4435e3adc6f35b66ea9e724f434dbc32be05627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4435e3adc6f35b66ea9e724f… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Aug 18 22:32:41 2010 +0300 crypt32: Only clear *pcbDecoded on error in CryptVerifyMessageSignature. --- dlls/crypt32/message.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 7551cce..779959a 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -194,13 +194,13 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, if (ppSignerCert) *ppSignerCert = NULL; - if (pcbDecoded) - *pcbDecoded = 0; if (!pVerifyPara || pVerifyPara->cbSize != sizeof(CRYPT_VERIFY_MESSAGE_PARA) || GET_CMSG_ENCODING_TYPE(pVerifyPara->dwMsgAndCertEncodingType) != PKCS_7_ASN_ENCODING) { + if(pcbDecoded) + *pcbDecoded = 0; SetLastError(E_INVALIDARG); return FALSE; } @@ -246,6 +246,8 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, } CryptMsgClose(msg); } + if(!ret && pcbDecoded) + *pcbDecoded = 0; TRACE("returning %d\n", ret); return ret; }

1 0

Misha Koshelev : d3dx9: Add tests for FVF <-> declaration conversion.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 46050fb3770f4c46a336d3137310bb2f81bf0887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46050fb3770f4c46a336d3137… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Aug 18 15:57:49 2010 -0500 d3dx9: Add tests for FVF <-> declaration conversion. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 12 ++ dlls/d3dx9_36/tests/mesh.c | 400 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 4 files changed, 414 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46050fb3770f4c46a336d…

1 0

Oldřich Jedlička : ddraw/tests: Add test for bad size of surface caps in CreateSurface.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: e474eb81e036984c1254adc75cd1258210332534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e474eb81e036984c1254adc75… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Wed Aug 18 22:01:53 2010 +0200 ddraw/tests: Add test for bad size of surface caps in CreateSurface. --- dlls/ddraw/tests/dsurface.c | 138 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 76bfc7e..8cdcd92 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -25,6 +25,7 @@ #include <assert.h> #include "wine/test.h" +#include "wine/exception.h" #include "ddraw.h" #include "d3d.h" #include "unknwn.h" @@ -3569,6 +3570,142 @@ static void BackBufferAttachmentFlipTest(void) DestroyWindow(window); } +static void CreateSurfaceBadCapsSizeTest(void) +{ + DDSURFACEDESC ddsd_ok; + DDSURFACEDESC ddsd_bad1; + DDSURFACEDESC ddsd_bad2; + DDSURFACEDESC ddsd_bad3; + DDSURFACEDESC ddsd_bad4; + DDSURFACEDESC2 ddsd2_ok; + DDSURFACEDESC2 ddsd2_bad1; + DDSURFACEDESC2 ddsd2_bad2; + DDSURFACEDESC2 ddsd2_bad3; + DDSURFACEDESC2 ddsd2_bad4; + IDirectDrawSurface *surf; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7; + HRESULT hr; + IDirectDraw2 *dd2; + IDirectDraw4 *dd4; + IDirectDraw7 *dd7; + + const DWORD caps = DDSCAPS_OFFSCREENPLAIN; + + memset(&ddsd_ok, 0, sizeof(ddsd_ok)); + ddsd_ok.dwSize = sizeof(ddsd_ok); + ddsd_ok.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd_ok.dwWidth = 64; + ddsd_ok.dwHeight = 64; + ddsd_ok.ddsCaps.dwCaps = caps; + memcpy(&ddsd_bad1, &ddsd_ok, sizeof(ddsd_bad1)); + ddsd_bad1.dwSize--; + memcpy(&ddsd_bad2, &ddsd_ok, sizeof(ddsd_bad2)); + ddsd_bad2.dwSize++; + memcpy(&ddsd_bad3, &ddsd_ok, sizeof(ddsd_bad3)); + ddsd_bad3.dwSize = 0; + memcpy(&ddsd_bad4, &ddsd_ok, sizeof(ddsd_bad4)); + ddsd_bad4.dwSize = sizeof(DDSURFACEDESC2); + + memset(&ddsd2_ok, 0, sizeof(ddsd2_ok)); + ddsd2_ok.dwSize = sizeof(ddsd2_ok); + ddsd2_ok.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2_ok.dwWidth = 64; + ddsd2_ok.dwHeight = 64; + ddsd2_ok.ddsCaps.dwCaps = caps; + memcpy(&ddsd2_bad1, &ddsd2_ok, sizeof(ddsd2_bad1)); + ddsd2_bad1.dwSize--; + memcpy(&ddsd2_bad2, &ddsd2_ok, sizeof(ddsd2_bad2)); + ddsd2_bad2.dwSize++; + memcpy(&ddsd2_bad3, &ddsd2_ok, sizeof(ddsd2_bad3)); + ddsd2_bad3.dwSize = 0; + memcpy(&ddsd2_bad4, &ddsd2_ok, sizeof(ddsd2_bad4)); + ddsd2_bad4.dwSize = sizeof(DDSURFACEDESC); + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd_ok, &surf, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + IDirectDrawSurface_Release(surf); + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad1, &surf, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad2, &surf, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad3, &surf, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad4, &surf, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw2_CreateSurface(dd2, &ddsd_ok, &surf, NULL); + ok(SUCCEEDED(hr), "IDirectDraw2_CreateSurface failed: 0x%08x\n", hr); + IDirectDrawSurface_Release(surf); + + hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad1, &surf, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad2, &surf, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad3, &surf, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad4, &surf, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + + IDirectDraw2_Release(dd2); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_ok, &surf4, NULL); + ok(SUCCEEDED(hr), "IDirectDraw4_CreateSurface failed: 0x%08x\n", hr); + IDirectDrawSurface4_Release(surf4); + + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad1, &surf4, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad2, &surf4, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad3, &surf4, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad4, &surf4, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + + IDirectDraw4_Release(dd4); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_ok, &surf7, NULL); + ok(SUCCEEDED(hr), "IDirectDraw7_CreateSurface failed: 0x%08x\n", hr); + IDirectDrawSurface7_Release(surf7); + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad1, &surf7, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad2, &surf7, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad3, &surf7, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad4, &surf7, NULL); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { HRESULT ret; @@ -3624,5 +3761,6 @@ START_TEST(dsurface) GetDCFormatTest(); BackBufferCreateSurfaceTest(); BackBufferAttachmentFlipTest(); + CreateSurfaceBadCapsSizeTest(); ReleaseDirectDraw(); }

1 0

Detlef Riekenberg : ntdll: Implement RtlIpv4AddressToString / RtlIpv4AddressToStringEx.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 4aef9446ba1f92481e36bd08da79a2d885afad3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aef9446ba1f92481e36bd08d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Aug 18 20:28:24 2010 +0200 ntdll: Implement RtlIpv4AddressToString / RtlIpv4AddressToStringEx. --- dlls/ntdll/ntdll.spec | 8 ++-- dlls/ntdll/rtl.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 122 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8441b41..574b4c3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -690,10 +690,10 @@ @ stdcall RtlInterlockedPushEntrySList(ptr ptr) @ stdcall RtlInterlockedPushListSList(ptr ptr ptr long) # @ stub RtlInvertRangeList -# @ stub RtlIpv4AddressToStringA -# @ stub RtlIpv4AddressToStringExA -@ stdcall RtlIpv4AddressToStringExW(ptr ptr ptr ptr) -# @ stub RtlIpv4AddressToStringW +@ stdcall RtlIpv4AddressToStringA(ptr ptr) +@ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) +@ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) +@ stdcall RtlIpv4AddressToStringW(ptr ptr) # @ stub RtlIpv4StringToAddressA # @ stub RtlIpv4StringToAddressExA @ stdcall RtlIpv4StringToAddressExW(ptr ptr wstr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 301b30c..5b8527b 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -30,14 +30,20 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #include "ntstatus.h" #define NONAMELESSSTRUCT #define WIN32_NO_STATUS +#define USE_WS_PREFIX #include "windef.h" #include "winternl.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/unicode.h" #include "ntdll_misc.h" +#include "inaddr.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -904,14 +910,122 @@ NTSTATUS WINAPI RtlIpv4StringToAddressExW(PULONG IP, PULONG Port, return STATUS_SUCCESS; } -NTSTATUS WINAPI RtlIpv4AddressToStringExW (PULONG IP, PULONG Port, - LPWSTR Buffer, PULONG MaxSize) +/*********************************************************************** + * RtlIpv4AddressToStringExW [NTDLL.@] + * + * Convert the given ipv4 address and optional the port to a string + * + * PARAMS + * pin [I] PTR to the ip address to convert (network byte order) + * port [I] optional port to convert (network byte order) + * buffer [O] destination buffer for the result + * psize [IO] PTR to available/used size of the destination buffer + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_INVALID_PARAMETER + * + */ +NTSTATUS WINAPI RtlIpv4AddressToStringExW(const IN_ADDR *pin, USHORT port, LPWSTR buffer, PULONG psize) { - FIXME("(%p,%p,%p,%p): stub\n", IP, Port, Buffer, MaxSize); + WCHAR tmp_ip[32]; + static const WCHAR fmt_ip[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + static const WCHAR fmt_port[] = {':','%','u',0}; + ULONG needed; - return STATUS_SUCCESS; + if (!pin || !buffer || !psize) + return STATUS_INVALID_PARAMETER; + + TRACE("(%p:0x%x, %d, %p, %p:%d)\n", pin, pin->S_un.S_addr, port, buffer, psize, *psize); + + needed = sprintfW(tmp_ip, fmt_ip, + pin->S_un.S_un_b.s_b1, pin->S_un.S_un_b.s_b2, + pin->S_un.S_un_b.s_b3, pin->S_un.S_un_b.s_b4); + + if (port) needed += sprintfW(tmp_ip + needed, fmt_port, ntohs(port)); + + if (*psize > needed) { + *psize = needed + 1; + strcpyW(buffer, tmp_ip); + return STATUS_SUCCESS; + } + + *psize = needed + 1; + return STATUS_INVALID_PARAMETER; +} + +/*********************************************************************** + * RtlIpv4AddressToStringExA [NTDLL.@] + * + * Convert the given ipv4 address and optional the port to a string + * + * See RtlIpv4AddressToStringExW + */ +NTSTATUS WINAPI RtlIpv4AddressToStringExA(const IN_ADDR *pin, USHORT port, LPSTR buffer, PULONG psize) +{ + CHAR tmp_ip[32]; + ULONG needed; + + if (!pin || !buffer || !psize) + return STATUS_INVALID_PARAMETER; + + TRACE("(%p:0x%x, %d, %p, %p:%d)\n", pin, pin->S_un.S_addr, port, buffer, psize, *psize); + + needed = sprintf(tmp_ip, "%u.%u.%u.%u", + pin->S_un.S_un_b.s_b1, pin->S_un.S_un_b.s_b2, + pin->S_un.S_un_b.s_b3, pin->S_un.S_un_b.s_b4); + + if (port) needed += sprintf(tmp_ip + needed, ":%u", ntohs(port)); + + if (*psize > needed) { + *psize = needed + 1; + strcpy(buffer, tmp_ip); + return STATUS_SUCCESS; + } + + *psize = needed + 1; + return STATUS_INVALID_PARAMETER; } +/*********************************************************************** + * RtlIpv4AddressToStringW [NTDLL.@] + * + * Convert the given ipv4 address to a string + * + * PARAMS + * pin [I] PTR to the ip address to convert (network byte order) + * buffer [O] destination buffer for the result (at least 16 character) + * + * RETURNS + * PTR to the 0 character at the end of the converted string + * + */ +WCHAR * WINAPI RtlIpv4AddressToStringW(const IN_ADDR *pin, LPWSTR buffer) +{ + ULONG size = 16; + + if (RtlIpv4AddressToStringExW(pin, 0, buffer, &size)) size = 0; + return buffer + size - 1; +} + +/*********************************************************************** + * RtlIpv4AddressToStringA [NTDLL.@] + * + * Convert the given ipv4 address to a string + * + * See RtlIpv4AddressToStringW + */ +CHAR * WINAPI RtlIpv4AddressToStringA(const IN_ADDR *pin, LPSTR buffer) +{ + ULONG size = 16; + + if (RtlIpv4AddressToStringExA(pin, 0, buffer, &size)) size = 0; + return buffer + size - 1; +} + +/*********************************************************************** + * get_pointer_obfuscator (internal) + */ static DWORD_PTR get_pointer_obfuscator( void ) { static DWORD_PTR pointer_obfuscator;

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
89
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 August 2010