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

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_GetBufferFormat.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: cc68c95fee4df3128063aade5ce0a13a7542236c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc68c95fee4df3128063aade5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 24 22:32:27 2012 +0200 dmusic: Implement IDirectMusicBufferImpl_GetBufferFormat. --- dlls/dmusic/buffer.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 49609c0..f71b70a 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -161,12 +161,16 @@ static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes(LPDIRECTMUSICBUFFER ifa return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat(LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) +static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat(LPDIRECTMUSICBUFFER iface, LPGUID format) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %p): stub\n", This, pGuidFormat); + TRACE("(%p)->(%p)\n", iface, format); + if (!format) + return E_POINTER; + + *format = This->format; return S_OK; }

1 0

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_GetMaxBytes.
by Alexandre Julliard 25 Apr '12

25 Apr '12

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

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_GetRawBufferPtr.
by Alexandre Julliard 25 Apr '12

25 Apr '12

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

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

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

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

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

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

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

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