April 2012 - Wine-Commits - list.winehq.org

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_GetRawBufferPtr.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 6800851f1d939183d78dc431417014baeedc7c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6800851f1d939183d78dc4314… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 24 22:32:44 2012 +0200 dmusic: Implement IDirectMusicBufferImpl_GetRawBufferPtr. --- dlls/dmusic/buffer.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 7260c0f..63611a4 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -125,11 +125,16 @@ static HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent(LPDIRECTMUSICBUFFER if return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr(LPDIRECTMUSICBUFFER iface, LPBYTE* ppData) +static HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr(LPDIRECTMUSICBUFFER iface, LPBYTE* data) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %p): stub\n", This, ppData); + TRACE("(%p)->(%p)\n", iface, data); + + if (!data) + return E_POINTER; + + *data = This->data; return S_OK; }

1 0

Owen Rudge : mapi32: Convert message to Unicode in MAPISendMail.
by Alexandre Julliard April 25, 2012

April 25, 2012

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

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_GetMaxBytes.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 5f6a3807fd12cb8a65f5b93a2769454c724adbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6a3807fd12cb8a65f5b93a2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 24 22:32:36 2012 +0200 dmusic: Implement IDirectMusicBufferImpl_GetMaxBytes. --- dlls/dmusic/buffer.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index f71b70a..7260c0f 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -152,11 +152,16 @@ static HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes(LPDIRECTMUSICBUFFER if return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes(LPDIRECTMUSICBUFFER iface, LPDWORD pcb) +static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes(LPDIRECTMUSICBUFFER iface, LPDWORD max_bytes) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %p): stub\n", This, pcb); + TRACE("(%p)->(%p)\n", iface, max_bytes); + + if (!max_bytes) + return E_POINTER; + + *max_bytes = This->size; return S_OK; }

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 2551ff7d5cc7821453d741171362aa4db2e39af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551ff7d5cc7821453d741171… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Apr 25 21:21:41 2012 +0900 po: Update Korean translation. --- po/ko.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/ko.po b/po/ko.po index 07c0bb7..7a4c1a9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3520,16 +3520,12 @@ msgid "URI to be decoded is incorrect" msgstr "해독하는 URI가 올바르지 않음" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "열거 값이 범위를 벗어남.\n" +msgstr "분수 값이 범위를 벗어남" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "첨자가 범위를 벗어남" +msgstr "정밀도 범위를 벗어남" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Józef Kucia : d3dx9/tests: Add DDS pixel format tests for D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard April 25, 2012

April 25, 2012

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

Owen Rudge : mapi32: Add support to MAPISendMailW for ANSI fallback.
by Alexandre Julliard April 25, 2012

April 25, 2012

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

Alexandre Julliard : iphlpapi/tests: Get rid of function typedefs and use more standard names for function pointers .
by Alexandre Julliard April 25, 2012

April 25, 2012

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

Christian Costa : dmusic: Cleanup IDirectMusicBufferImpl_QueryInterface.
by Alexandre Julliard April 25, 2012

April 25, 2012

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 April 25, 2012

April 25, 2012

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

Jacek Caban : vbscript: 'property' may be both keyword and identifier.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: d856d7cd11d8845321b0ebf89ad866b3b168e9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d856d7cd11d8845321b0ebf89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 11:26:34 2012 +0200 vbscript: 'property' may be both keyword and identifier. --- dlls/vbscript/parser.y | 37 ++++++++++++++++++++++--------------- dlls/vbscript/tests/lang.vbs | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2a85272..a5f7405 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -71,6 +71,8 @@ static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,u static statement_t *link_statements(statement_t*,statement_t*); +static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; + #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -129,6 +131,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <uint> Storage Storage_opt %type <dim_decl> DimDeclList %type <const_decl> ConstDecl ConstDeclList +%type <string> Identifier %% @@ -189,25 +192,25 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; } - | tFOR tIdentifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT + | tFOR Identifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } - | tFOR tEACH tIdentifier tIN Expression tNL StatementsNl_opt tNEXT + | tFOR tEACH Identifier tIN Expression tNL StatementsNl_opt tNEXT { $$ = new_foreach_statement(ctx, $3, $5, $7); } MemberExpression - : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } + : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } + | CallExpression '.' Identifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } DimDeclList /* FIXME: Support arrays */ - : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } - | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } + : Identifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } + | Identifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } ConstDeclList : ConstDecl { $$ = $1; } | ConstDecl ',' ConstDeclList { $1->next = $3; $$ = $1; } ConstDecl - : tIdentifier '=' LiteralExpression { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; } + : Identifier '=' LiteralExpression { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; } DoType : tWHILE { $$ = TRUE; } @@ -326,7 +329,7 @@ ExpExpression UnaryExpression : LiteralExpression { $$ = $1; } | CallExpression { $$ = $1; } - | tNEW tIdentifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } + | tNEW Identifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } CallExpression @@ -350,7 +353,7 @@ PrimaryExpression | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } ClassDeclaration - : tCLASS tIdentifier tNL ClassBody tEND tCLASS tNL { $4->name = $2; $$ = $4; } + : tCLASS Identifier tNL ClassBody tEND tCLASS tNL { $4->name = $2; $$ = $4; } ClassBody : /* empty */ { $$ = new_class_decl(ctx); } @@ -367,9 +370,9 @@ PropertyDecl { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl - : Storage_opt tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB + : Storage_opt tSUB Identifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB { $$ = new_function_decl(ctx, $3, FUNC_SUB, $1, $4, $6); CHECK_ERROR; } - | Storage_opt tFUNCTION tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION + | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION { $$ = new_function_decl(ctx, $3, FUNC_FUNCTION, $1, $4, $6); CHECK_ERROR; } Storage_opt @@ -390,10 +393,14 @@ ArgumentDeclList | ArgumentDecl ',' ArgumentDeclList { $1->next = $3; $$ = $1; } ArgumentDecl - : tIdentifier { $$ = new_argument_decl(ctx, $1, TRUE); } - | tBYREF tIdentifier { $$ = new_argument_decl(ctx, $2, TRUE); } - | tBYVAL tIdentifier { $$ = new_argument_decl(ctx, $2, FALSE); } - + : Identifier { $$ = new_argument_decl(ctx, $1, TRUE); } + | tBYREF Identifier { $$ = new_argument_decl(ctx, $2, TRUE); } + | tBYVAL Identifier { $$ = new_argument_decl(ctx, $2, FALSE); } + +/* 'property' may be both keyword and identifier, depending on context */ +Identifier + : tIdentifier { $$ = $1; } + | tPROPERTY { $$ = propertyW; } %% static int parser_error(const char *str) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4380432..1015e34 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -781,4 +781,36 @@ End Sub Call ConstTestSub Dim funcconst +' Property may be used as an identifier (although it's a keyword) +Sub TestProperty + Dim Property + PROPERTY = true + Call ok(property, "property = " & property) + + for property = 1 to 2 + next +End Sub + +Call TestProperty + +Class Property + Public Sub Property() + End Sub + + Sub Test(byref property) + End Sub +End Class + +Class Property2 + Function Property() + End Function + + + Sub Test(property) + End Sub + + Sub Test2(byval property) + End Sub +End Class + reportSuccess()

1 0