wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Józef Kucia : d3dx9/tests: Add DDS pixel format tests for D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: b157bc7cfa3f02d5078fbc8acae5b0ab3f1d7145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b157bc7cfa3f02d5078fbc8ac… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Apr 19 21:54:22 2012 +0200 d3dx9/tests: Add DDS pixel format tests for D3DXGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/tests/surface.c | 93 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 87aa03e..996dcf5 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -138,6 +138,72 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons return D3DERR_INVALIDCALL; } +#define DDS_CAPS 0x00000001 +#define DDS_HEIGHT 0x00000002 +#define DDS_WIDTH 0x00000004 +#define DDS_PIXELFORMAT 0x00001000 + +#define DDSCAPS_TEXTURE 0x00001000 + +#define DDSPF_ALPHAPIXELS 0x00000001 +#define DDSPF_ALPHA 0x00000002 +#define DDSPF_FOURCC 0x00000004 +#define DDSPF_RGB 0x00000040 +#define DDSPF_LUMINANCE 0x00020000 + +static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, + DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, + D3DFORMAT expected_format) +{ + HRESULT hr; + D3DXIMAGE_INFO info; + struct + { + DWORD magic; + DWORD size; + DWORD flags; + DWORD height; + DWORD width; + DWORD padding[14]; + struct + { + DWORD size; + DWORD flags; + DWORD fourcc; + DWORD bpp; + DWORD rmask; + DWORD gmask; + DWORD bmask; + DWORD amask; + } pixel_format; + DWORD caps; + DWORD padding2[4]; + BYTE data[256]; + } dds; + + memset(&dds, 0, sizeof(dds)); + + dds.magic = MAKEFOURCC('D','D','S',' '); + dds.size = 124; + dds.flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; + dds.height = 4; + dds.width = 4; + dds.pixel_format.size = sizeof(dds.pixel_format); + dds.pixel_format.flags = flags; + dds.pixel_format.fourcc = fourcc; + dds.pixel_format.bpp = bpp; + dds.pixel_format.rmask = rmask; + dds.pixel_format.gmask = gmask; + dds.pixel_format.bmask = bmask; + dds.pixel_format.amask = amask; + dds.caps = DDSCAPS_TEXTURE; + + hr = D3DXGetImageInfoFromFileInMemory(&dds, sizeof(dds), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", hr, expected_format, D3D_OK); + if (SUCCEEDED(hr)) + ok(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", info.Format, expected_format); +} + static void test_D3DXGetImageInfo(void) { HRESULT hr; @@ -309,8 +375,35 @@ static void test_D3DXGetImageInfo(void) ok(info.ResourceType == D3DRTYPE_VOLUMETEXTURE, "Got resource type %#x, expected %#x\n", info.ResourceType, D3DRTYPE_VOLUMETEXTURE); ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); } else skip("Couldn't get image info from volume map in memory\n"); + + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, D3DFMT_DXT1); + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, D3DFMT_DXT2); + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, D3DFMT_DXT3); + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, D3DFMT_DXT4); + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, D3DFMT_DXT5); + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); + check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('U','Y','V','Y'), 0, 0, 0, 0, 0, D3DFMT_UYVY); + check_dds_pixel_format(DDSPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, D3DFMT_R5G6B5); + check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5); + check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4); + check_dds_pixel_format(DDSPF_RGB, 0, 8, 0xe0, 0x1c, 0x03, 0, D3DFMT_R3G3B2); + check_dds_pixel_format(DDSPF_ALPHA, 0, 8, 0, 0, 0, 0xff, D3DFMT_A8); + check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, D3DFMT_A8R3G3B2); + check_dds_pixel_format(DDSPF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, D3DFMT_X4R4G4B4); + check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10); + check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10); + check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8); + check_dds_pixel_format(DDSPF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); + check_dds_pixel_format(DDSPF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); + check_dds_pixel_format(DDSPF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); + check_dds_pixel_format(DDSPF_LUMINANCE | DDSPF_ALPHAPIXELS, 0, 16, 0x00ff, 0, 0, 0xff00, D3DFMT_A8L8); + check_dds_pixel_format(DDSPF_LUMINANCE | DDSPF_ALPHAPIXELS, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); } + hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + /* cleanup */ if(testdummy_ok) DeleteFileA("testdummy.bmp");

1 0

Francois Gouget : comctl32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: a0bb28f7d98793cca4e6920e0c6114e243ccf0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0bb28f7d98793cca4e6920e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:12:31 2012 +0200 comctl32/tests: Add a trailing '\n' to an ok() call. --- dlls/comctl32/tests/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index c92ed62..71c66a5 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -326,7 +326,7 @@ static void test_gettext(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); ok(toolinfoA.lpszText == NULL, - "expected NULL, got %p", toolinfoA.lpszText); + "expected NULL, got %p\n", toolinfoA.lpszText); } else {

1 0

Owen Rudge : mapi32: Add support to MAPISendMailW for ANSI fallback.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 0eb0292eb5d7bcd44a4621c217c347b29638203a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb0292eb5d7bcd44a4621c21… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Apr 25 15:46:58 2012 +0100 mapi32: Add support to MAPISendMailW for ANSI fallback. --- dlls/mapi32/sendmail.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 4784968..da19259 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -548,6 +548,27 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, return MAPI_E_NOT_SUPPORTED; } +static lpMapiRecipDesc convert_recipient_from_unicode(lpMapiRecipDescW recipW, lpMapiRecipDesc dest) +{ + lpMapiRecipDesc ret; + + if (!recipW) + return NULL; + + if (dest) + ret = dest; + else + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc)); + + ret->ulRecipClass = recipW->ulRecipClass; + ret->lpszName = convert_from_unicode(recipW->lpszName); + ret->lpszAddress = convert_from_unicode(recipW->lpszAddress); + ret->ulEIDSize = recipW->ulEIDSize; + ret->lpEntryID = recipW->lpEntryID; + + return ret; +} + /************************************************************************** * MAPISendMailW (MAPI32.256) * @@ -578,6 +599,105 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (MAPIInitialize(NULL) == S_OK) return sendmail_extended_mapi(session, uiparam, message, flags); + if (mapiFunctions.MAPISendMail) + { + MapiMessage messageA; + ULONG ret; + + if (flags & MAPI_FORCE_UNICODE) + return MAPI_E_UNICODE_NOT_SUPPORTED; + + /* Convert to ANSI and send to MAPISendMail */ + ZeroMemory(&messageA, sizeof(MapiMessage)); + + messageA.lpszSubject = convert_from_unicode(message->lpszSubject); + messageA.lpszNoteText = convert_from_unicode(message->lpszNoteText); + messageA.lpszMessageType = convert_from_unicode(message->lpszMessageType); + messageA.lpszDateReceived = convert_from_unicode(message->lpszDateReceived); + messageA.lpszConversationID = convert_from_unicode(message->lpszConversationID); + messageA.flFlags = message->flFlags; + messageA.lpOriginator = convert_recipient_from_unicode(message->lpOriginator, NULL); + messageA.nRecipCount = message->nRecipCount; + messageA.nFileCount = message->nFileCount; + + if (message->nRecipCount && message->lpRecips) + { + lpMapiRecipDesc recipsA; + int i; + + recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount); + + for (i = 0; i < message->nRecipCount; i++) + { + convert_recipient_from_unicode(&message->lpRecips[i], &recipsA[i]); + } + + messageA.lpRecips = recipsA; + } + + if (message->nFileCount && message->lpFiles) + { + lpMapiFileDesc filesA; + int i; + + filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount); + + for (i = 0; i < message->nFileCount; i++) + { + filesA[i].flFlags = message->lpFiles[i].flFlags; + filesA[i].nPosition = message->lpFiles[i].nPosition; + filesA[i].lpszPathName = convert_from_unicode(message->lpFiles[i].lpszPathName); + filesA[i].lpszFileName = convert_from_unicode(message->lpFiles[i].lpszFileName); + filesA[i].lpFileType = message->lpFiles[i].lpFileType; + } + + messageA.lpFiles = filesA; + } + + ret = mapiFunctions.MAPISendMail(session, uiparam, &messageA, flags, reserved); + + /* Now free everything we allocated */ + if (message->lpOriginator) + { + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator->lpszName); + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator->lpszAddress); + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator); + } + + if (message->nRecipCount && message->lpRecips) + { + int i; + + for (i = 0; i < message->nRecipCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageA.lpRecips[i].lpszName); + HeapFree(GetProcessHeap(), 0, messageA.lpRecips[i].lpszAddress); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpRecips); + } + + if (message->nFileCount && message->lpFiles) + { + int i; + + for (i = 0; i < message->nFileCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageA.lpFiles[i].lpszPathName); + HeapFree(GetProcessHeap(), 0, messageA.lpFiles[i].lpszFileName); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpFiles); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpszSubject); + HeapFree(GetProcessHeap(), 0, messageA.lpszNoteText); + HeapFree(GetProcessHeap(), 0, messageA.lpszDateReceived); + HeapFree(GetProcessHeap(), 0, messageA.lpszConversationID); + + return ret; + } + /* Display an error message since we apparently have no mail clients */ LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR));

1 0

Owen Rudge : mapi32: Convert message to Unicode in MAPISendMail.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 590c4d91d964dcfd71a40ef4d236f694045d6155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=590c4d91d964dcfd71a40ef4d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Apr 25 15:46:52 2012 +0100 mapi32: Convert message to Unicode in MAPISendMail. --- dlls/mapi32/sendmail.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 8242e11..4784968 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -65,6 +65,21 @@ static LPSTR convert_from_unicode(LPCWSTR wstr) return str; } +static LPWSTR convert_to_unicode(LPSTR str) +{ + LPWSTR wstr; + DWORD len; + + if (!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + wstr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, len); + + return wstr; +} + /* Internal function to send a message via Extended MAPI. Wrapper around the Simple MAPI function MAPISendMail. @@ -474,10 +489,55 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, return mapiFunctions.MAPISendMail(session, uiparam, message, flags, reserved); /* Check if we have an Extended MAPI provider - if so, use our wrapper */ -#if 0 if (MAPIInitialize(NULL) == S_OK) - return sendmail_extended_mapi(session, uiparam, message, flags); -#endif + { + MapiMessageW messageW; + ULONG ret; + + ZeroMemory(&messageW, sizeof(MapiMessageW)); + + /* Convert the entries we need to Unicode */ + messageW.lpszSubject = convert_to_unicode(message->lpszSubject); + messageW.lpszNoteText = convert_to_unicode(message->lpszNoteText); + messageW.nFileCount = message->nFileCount; + + if (message->nFileCount && message->lpFiles) + { + lpMapiFileDescW filesW; + int i; + + filesW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDescW) * message->nFileCount); + + for (i = 0; i < message->nFileCount; i++) + { + filesW[i].lpszPathName = convert_to_unicode(message->lpFiles[i].lpszPathName); + filesW[i].lpszFileName = convert_to_unicode(message->lpFiles[i].lpszFileName); + } + + messageW.lpFiles = filesW; + } + + ret = sendmail_extended_mapi(session, uiparam, &messageW, flags); + + /* Now free everything we allocated */ + if (message->nFileCount && message->lpFiles) + { + int i; + + for (i = 0; i < message->nFileCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageW.lpFiles[i].lpszPathName); + HeapFree(GetProcessHeap(), 0, messageW.lpFiles[i].lpszFileName); + } + + HeapFree(GetProcessHeap(), 0, messageW.lpFiles); + } + + HeapFree(GetProcessHeap(), 0, messageW.lpszSubject); + HeapFree(GetProcessHeap(), 0, messageW.lpszNoteText); + + return ret; + } /* Display an error message since we apparently have no mail clients */ LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR));

1 0

Owen Rudge : mapi32: Convert sendmail_extended_mapi to Unicode.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 7877e657def9aa4f56b4f9725bed972ce0f2f847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7877e657def9aa4f56b4f9725… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Apr 25 15:46:47 2012 +0100 mapi32: Convert sendmail_extended_mapi to Unicode. --- dlls/mapi32/sendmail.c | 129 +++++++++++++++++++++++++++++++++++++++++------- include/mapi.h | 1 + 2 files changed, 111 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7877e657def9aa4f56b4f…

1 0

Piotr Caban : jscript: Fix toExponential behavior when exponent is 0.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: cc6205f10c1e2658912fe646ae4f70488c9ca7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6205f10c1e2658912fe646a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 25 12:10:18 2012 +0200 jscript: Fix toExponential behavior when exponent is 0. --- dlls/jscript/number.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index d296b79..8f6eeab 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -206,9 +206,12 @@ static inline void number_to_exponential(double val, int prec, BSTR *out) str[size++] = '-'; dec_point = -dec_point; } - for(str[size]='0', size+=exp_size-1; dec_point>0; dec_point/=10) - str[size--] = '0'+dec_point%10; - size += exp_size+1; + size += exp_size; + do { + str[--size] = '0'+dec_point%10; + dec_point /= 10; + }while(dec_point>0); + size += exp_size; str[size] = 0; *out = str;

1 0

Alexandre Julliard : iphlpapi/tests: Get rid of function typedefs and use more standard names for function pointers .
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 99c6eb0dd02e7612ecc7cac502a449aa6dac0cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c6eb0dd02e7612ecc7cac50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 25 17:16:24 2012 +0200 iphlpapi/tests: Get rid of function typedefs and use more standard names for function pointers. --- dlls/iphlpapi/tests/iphlpapi.c | 312 ++++++++++++++++------------------------ 1 files changed, 123 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99c6eb0dd02e7612ecc7c…

1 0

Bruno Jesus : iphlpapi/tests: Add SetTcpEntry tests.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 8dde502f0ec7da338ec2b492d1451d8ea25b2a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dde502f0ec7da338ec2b492d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 25 01:50:21 2012 -0300 iphlpapi/tests: Add SetTcpEntry tests. --- dlls/iphlpapi/tests/iphlpapi.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index ec388a3..e9e4021 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -67,6 +67,7 @@ typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_A typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); typedef DWORD (WINAPI *GetExtendedTcpTableFunc)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); +typedef DWORD (WINAPI *SetTcpEntryFunc)(PMIB_TCPROW); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -89,6 +90,7 @@ static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; static NotifyAddrChangeFunc gNotifyAddrChange = NULL; static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; static GetExtendedTcpTableFunc gGetExtendedTcpTable = NULL; +static SetTcpEntryFunc gSetTcpEntry = NULL; static void loadIPHlpApi(void) { @@ -134,6 +136,8 @@ static void loadIPHlpApi(void) hLibrary, "CancelIPChangeNotify"); gGetExtendedTcpTable = (GetExtendedTcpTableFunc)GetProcAddress( hLibrary, "GetExtendedTcpTable"); + gSetTcpEntry = (SetTcpEntryFunc)GetProcAddress( + hLibrary, "SetTcpEntry"); } } @@ -159,6 +163,7 @@ static void freeIPHlpApi(void) gNotifyAddrChange = NULL; gCancelIPChangeNotify = NULL; gGetExtendedTcpTable = NULL; + gSetTcpEntry = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -651,6 +656,27 @@ static void testGetUdpTable(void) } } +static void testSetTcpEntry(void) +{ + DWORD ret; + MIB_TCPROW row; + + memset(&row, 0, sizeof(row)); + if(0) /* This test crashes in OS >= VISTA */ + { + ret = gSetTcpEntry(NULL); + ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); + } + + ret = gSetTcpEntry(&row); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); + + row.dwState = MIB_TCP_STATE_DELETE_TCB; + ret = gSetTcpEntry(&row); + todo_wine ok( ret == ERROR_MR_MID_NOT_FOUND || broken(ret == ERROR_INVALID_PARAMETER), + "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); +} + /* still-to-be-tested NT4-onward functions: CreateIpForwardEntry @@ -664,7 +690,6 @@ SetIpForwardEntry SetIpNetEntry SetIpStatistics SetIpTTL -SetTcpEntry */ static void testWinNT4Functions(void) { @@ -679,6 +704,7 @@ static void testWinNT4Functions(void) testGetUdpStatistics(); testGetTcpTable(); testGetUdpTable(); + testSetTcpEntry(); } static void testGetInterfaceInfo(void)

1 0

Christian Costa : dmusic: Cleanup IDirectMusicBufferImpl_QueryInterface.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: ae6fb7511d6ef08646b5fea392fbb982a513f182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6fb7511d6ef08646b5fea39… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 24 22:33:01 2012 +0200 dmusic: Cleanup IDirectMusicBufferImpl_QueryInterface. --- dlls/dmusic/buffer.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 3c3395d..838ceee 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -27,18 +27,23 @@ static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicB } /* IDirectMusicBufferImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface(LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface(LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ret_iface) { - IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - TRACE("(%p, (%s, %p)\n",This,debugstr_dmguid(riid),ppobj); - if (IsEqualIID (riid, &IID_IUnknown) - || IsEqualIID (riid, &IID_IDirectMusicBuffer)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - WARN("(%p, (%s, %p): not found\n",This,debugstr_dmguid(riid),ppobj); - return E_NOINTERFACE; + TRACE("(%p)->(%s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDirectMusicBuffer)) + { + IDirectMusicBuffer_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + WARN("(%p)->(%s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); + + return E_NOINTERFACE; } static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface)

1 0

Christian Costa : dmusic: Display new ref in IDirectMusicBufferImpl_AddRef and IDirectMusicBufferImpl_Release .
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 76a778be97ec894357c68a02ccc794e9ccc7cb01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a778be97ec894357c68a02c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 24 22:32:52 2012 +0200 dmusic: Display new ref in IDirectMusicBufferImpl_AddRef and IDirectMusicBufferImpl_Release. --- dlls/dmusic/buffer.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 63611a4..3c3395d 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -41,33 +41,33 @@ static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface(LPDIRECTMUSICBUFFER return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) +static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This->data); - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->data); + HeapFree(GetProcessHeap(), 0, This); + } + + DMUSIC_UnlockModule(); - DMUSIC_UnlockModule(); - - return refCount; + return ref; } /* IDirectMusicBufferImpl IDirectMusicBuffer part: */

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
72
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 April 2012