May 2008 - Wine-Commits - list.winehq.org

James Hawkins : user32: Fix the BSM_ALL_RECIPS test flag.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: c659ad36e8bfc4aa849f3ba34cd9da628cf7f121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c659ad36e8bfc4aa849f3ba34… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 20 19:34:33 2008 -0500 user32: Fix the BSM_ALL_RECIPS test flag. --- dlls/user32/tests/broadcast.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 6cf27b8..c88cee7 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -265,8 +265,7 @@ static void test_noprivileges(void) BOOL ret; static const DWORD BSM_ALL_RECIPS = BSM_VXDS | BSM_NETDRIVER | - BSM_INSTALLABLEDRIVERS | - BSM_APPLICATIONS | BSM_ALLDESKTOPS; + BSM_INSTALLABLEDRIVERS | BSM_APPLICATIONS; pOpenProcessToken = (void *)GetProcAddress(advapi32, "OpenProcessToken"); pAdjustTokenPrivileges = (void *)GetProcAddress(advapi32, "AdjustTokenPrivileges");

1 0

Andrew Talbot : shell32: Remove unused file-static variable.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 0e37d57b8e40e19f5c7c4e5eb459a8565e601f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e37d57b8e40e19f5c7c4e5eb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue May 20 22:02:56 2008 +0100 shell32: Remove unused file-static variable. --- dlls/shell32/shellole.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 64b0024..19dba05 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -49,8 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); -static const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; - /************************************************************************** * Default ClassFactory types */

1 0

Andrew Talbot : user32: Remove unused function.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 2956605d6107dc7607fc7fb547c21c72e62500fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2956605d6107dc7607fc7fb54… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue May 20 22:03:05 2008 +0100 user32: Remove unused function. --- dlls/user32/message.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 542298a..ce18acd 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -244,14 +244,6 @@ static inline void push_string( struct packed_message *data, LPCWSTR str ) push_data( data, str, (strlenW(str) + 1) * sizeof(WCHAR) ); } -/* retrieve a pointer to data from a packed message and increment the buffer pointer */ -static inline void *get_data( void **buffer, size_t size ) -{ - void *ret = *buffer; - *buffer = (char *)*buffer + size; - return ret; -} - /* make sure that the buffer contains a valid null-terminated Unicode string */ static inline BOOL check_string( LPCWSTR str, size_t size ) {

1 0

Andrew Talbot : rsaenh: Remove unused file-static variable.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 0ed34567792549cc0c0f42ba395a308fd8374f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed34567792549cc0c0f42ba3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue May 20 22:02:49 2008 +0100 rsaenh: Remove unused file-static variable. --- dlls/rsaenh/aes.c | 67 ----------------------------------------------------- 1 files changed, 0 insertions(+), 67 deletions(-) diff --git a/dlls/rsaenh/aes.c b/dlls/rsaenh/aes.c index c0beb14..711c181 100644 --- a/dlls/rsaenh/aes.c +++ b/dlls/rsaenh/aes.c @@ -97,73 +97,6 @@ static const ulong32 TE0[256] = { 0x7bb0b0cbUL, 0xa85454fcUL, 0x6dbbbbd6UL, 0x2c16163aUL, }; -static const ulong32 Te4[256] = { - 0x63636363UL, 0x7c7c7c7cUL, 0x77777777UL, 0x7b7b7b7bUL, - 0xf2f2f2f2UL, 0x6b6b6b6bUL, 0x6f6f6f6fUL, 0xc5c5c5c5UL, - 0x30303030UL, 0x01010101UL, 0x67676767UL, 0x2b2b2b2bUL, - 0xfefefefeUL, 0xd7d7d7d7UL, 0xababababUL, 0x76767676UL, - 0xcacacacaUL, 0x82828282UL, 0xc9c9c9c9UL, 0x7d7d7d7dUL, - 0xfafafafaUL, 0x59595959UL, 0x47474747UL, 0xf0f0f0f0UL, - 0xadadadadUL, 0xd4d4d4d4UL, 0xa2a2a2a2UL, 0xafafafafUL, - 0x9c9c9c9cUL, 0xa4a4a4a4UL, 0x72727272UL, 0xc0c0c0c0UL, - 0xb7b7b7b7UL, 0xfdfdfdfdUL, 0x93939393UL, 0x26262626UL, - 0x36363636UL, 0x3f3f3f3fUL, 0xf7f7f7f7UL, 0xccccccccUL, - 0x34343434UL, 0xa5a5a5a5UL, 0xe5e5e5e5UL, 0xf1f1f1f1UL, - 0x71717171UL, 0xd8d8d8d8UL, 0x31313131UL, 0x15151515UL, - 0x04040404UL, 0xc7c7c7c7UL, 0x23232323UL, 0xc3c3c3c3UL, - 0x18181818UL, 0x96969696UL, 0x05050505UL, 0x9a9a9a9aUL, - 0x07070707UL, 0x12121212UL, 0x80808080UL, 0xe2e2e2e2UL, - 0xebebebebUL, 0x27272727UL, 0xb2b2b2b2UL, 0x75757575UL, - 0x09090909UL, 0x83838383UL, 0x2c2c2c2cUL, 0x1a1a1a1aUL, - 0x1b1b1b1bUL, 0x6e6e6e6eUL, 0x5a5a5a5aUL, 0xa0a0a0a0UL, - 0x52525252UL, 0x3b3b3b3bUL, 0xd6d6d6d6UL, 0xb3b3b3b3UL, - 0x29292929UL, 0xe3e3e3e3UL, 0x2f2f2f2fUL, 0x84848484UL, - 0x53535353UL, 0xd1d1d1d1UL, 0x00000000UL, 0xededededUL, - 0x20202020UL, 0xfcfcfcfcUL, 0xb1b1b1b1UL, 0x5b5b5b5bUL, - 0x6a6a6a6aUL, 0xcbcbcbcbUL, 0xbebebebeUL, 0x39393939UL, - 0x4a4a4a4aUL, 0x4c4c4c4cUL, 0x58585858UL, 0xcfcfcfcfUL, - 0xd0d0d0d0UL, 0xefefefefUL, 0xaaaaaaaaUL, 0xfbfbfbfbUL, - 0x43434343UL, 0x4d4d4d4dUL, 0x33333333UL, 0x85858585UL, - 0x45454545UL, 0xf9f9f9f9UL, 0x02020202UL, 0x7f7f7f7fUL, - 0x50505050UL, 0x3c3c3c3cUL, 0x9f9f9f9fUL, 0xa8a8a8a8UL, - 0x51515151UL, 0xa3a3a3a3UL, 0x40404040UL, 0x8f8f8f8fUL, - 0x92929292UL, 0x9d9d9d9dUL, 0x38383838UL, 0xf5f5f5f5UL, - 0xbcbcbcbcUL, 0xb6b6b6b6UL, 0xdadadadaUL, 0x21212121UL, - 0x10101010UL, 0xffffffffUL, 0xf3f3f3f3UL, 0xd2d2d2d2UL, - 0xcdcdcdcdUL, 0x0c0c0c0cUL, 0x13131313UL, 0xececececUL, - 0x5f5f5f5fUL, 0x97979797UL, 0x44444444UL, 0x17171717UL, - 0xc4c4c4c4UL, 0xa7a7a7a7UL, 0x7e7e7e7eUL, 0x3d3d3d3dUL, - 0x64646464UL, 0x5d5d5d5dUL, 0x19191919UL, 0x73737373UL, - 0x60606060UL, 0x81818181UL, 0x4f4f4f4fUL, 0xdcdcdcdcUL, - 0x22222222UL, 0x2a2a2a2aUL, 0x90909090UL, 0x88888888UL, - 0x46464646UL, 0xeeeeeeeeUL, 0xb8b8b8b8UL, 0x14141414UL, - 0xdedededeUL, 0x5e5e5e5eUL, 0x0b0b0b0bUL, 0xdbdbdbdbUL, - 0xe0e0e0e0UL, 0x32323232UL, 0x3a3a3a3aUL, 0x0a0a0a0aUL, - 0x49494949UL, 0x06060606UL, 0x24242424UL, 0x5c5c5c5cUL, - 0xc2c2c2c2UL, 0xd3d3d3d3UL, 0xacacacacUL, 0x62626262UL, - 0x91919191UL, 0x95959595UL, 0xe4e4e4e4UL, 0x79797979UL, - 0xe7e7e7e7UL, 0xc8c8c8c8UL, 0x37373737UL, 0x6d6d6d6dUL, - 0x8d8d8d8dUL, 0xd5d5d5d5UL, 0x4e4e4e4eUL, 0xa9a9a9a9UL, - 0x6c6c6c6cUL, 0x56565656UL, 0xf4f4f4f4UL, 0xeaeaeaeaUL, - 0x65656565UL, 0x7a7a7a7aUL, 0xaeaeaeaeUL, 0x08080808UL, - 0xbabababaUL, 0x78787878UL, 0x25252525UL, 0x2e2e2e2eUL, - 0x1c1c1c1cUL, 0xa6a6a6a6UL, 0xb4b4b4b4UL, 0xc6c6c6c6UL, - 0xe8e8e8e8UL, 0xddddddddUL, 0x74747474UL, 0x1f1f1f1fUL, - 0x4b4b4b4bUL, 0xbdbdbdbdUL, 0x8b8b8b8bUL, 0x8a8a8a8aUL, - 0x70707070UL, 0x3e3e3e3eUL, 0xb5b5b5b5UL, 0x66666666UL, - 0x48484848UL, 0x03030303UL, 0xf6f6f6f6UL, 0x0e0e0e0eUL, - 0x61616161UL, 0x35353535UL, 0x57575757UL, 0xb9b9b9b9UL, - 0x86868686UL, 0xc1c1c1c1UL, 0x1d1d1d1dUL, 0x9e9e9e9eUL, - 0xe1e1e1e1UL, 0xf8f8f8f8UL, 0x98989898UL, 0x11111111UL, - 0x69696969UL, 0xd9d9d9d9UL, 0x8e8e8e8eUL, 0x94949494UL, - 0x9b9b9b9bUL, 0x1e1e1e1eUL, 0x87878787UL, 0xe9e9e9e9UL, - 0xcecececeUL, 0x55555555UL, 0x28282828UL, 0xdfdfdfdfUL, - 0x8c8c8c8cUL, 0xa1a1a1a1UL, 0x89898989UL, 0x0d0d0d0dUL, - 0xbfbfbfbfUL, 0xe6e6e6e6UL, 0x42424242UL, 0x68686868UL, - 0x41414141UL, 0x99999999UL, 0x2d2d2d2dUL, 0x0f0f0f0fUL, - 0xb0b0b0b0UL, 0x54545454UL, 0xbbbbbbbbUL, 0x16161616UL, -}; - static const ulong32 TD0[256] = { 0x51f4a750UL, 0x7e416553UL, 0x1a17a4c3UL, 0x3a275e96UL, 0x3bab6bcbUL, 0x1f9d45f1UL, 0xacfa58abUL, 0x4be30393UL,

1 0

Juan Lang : iphlpapi: Set the adapter' s description to its name in GetAdaptersInfo.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 199cee194f07f823c941f8501899026b6221edb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199cee194f07f823c941f8501… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue May 20 12:38:12 2008 -0700 iphlpapi: Set the adapter's description to its name in GetAdaptersInfo. --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d01fe28..f624dde 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -738,6 +738,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) /* on Win98 this is left empty, but whatever */ getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); + getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], &ptr->AddressLength, ptr->Address, &ptr->Type);

1 0

Jörg Höhle : dsound: Fix off by 1 heap error in DSOUND_MixerVol.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 349abe991ee50dedf16f6f65f556cbd308cf3929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349abe991ee50dedf16f6f65f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue May 20 18:15:15 2008 +0200 dsound: Fix off by 1 heap error in DSOUND_MixerVol. --- dlls/dsound/mixer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 3d3741b..7ac6e67 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -469,7 +469,7 @@ static LPBYTE DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT len) case 8: /* 8-bit WAV is unsigned, but we need to operate */ /* on signed data for this to work properly */ - for (i = 0; i < len; i+=2) { + for (i = 0; i < len-1; i+=2) { *(bpc++) = (((*(mem++) - 128) * vLeft) >> 16) + 128; *(bpc++) = (((*(mem++) - 128) * vRight) >> 16) + 128; } @@ -478,7 +478,7 @@ static LPBYTE DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT len) break; case 16: /* 16-bit WAV is signed -- much better */ - for (i = 0; i < len; i += 4) { + for (i = 0; i < len-3; i += 4) { *(bps++) = (*(mems++) * vLeft) >> 16; *(bps++) = (*(mems++) * vRight) >> 16; }

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 8019c55cc650f30a80aa6d590b15ffa496afd6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8019c55cc650f30a80aa6d590… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 20 20:03:42 2008 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/d3d.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ca0bbaf..1f71235 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1687,7 +1687,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -1750,7 +1750,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -1905,7 +1905,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -1960,7 +1960,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -2117,7 +2117,7 @@ static void DeviceLoadTest() ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; ddsd.dwWidth = 128; ddsd.dwHeight = 128; - ddsd.dwMipMapCount = i ? 4 : 8; + U2(ddsd).dwMipMapCount = i ? 4 : 8; U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; @@ -2154,7 +2154,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -2200,7 +2200,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -2317,7 +2317,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -2371,7 +2371,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -2400,7 +2400,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -2452,7 +2452,7 @@ static void DeviceLoadTest() ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; ddsd.dwWidth = i ? 32 : 128; ddsd.dwHeight = i ? 32 : 128; - if (i) ddsd.dwMipMapCount = 4; + if (i) U2(ddsd).dwMipMapCount = 4; U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; @@ -2489,7 +2489,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) { @@ -2546,7 +2546,7 @@ static void DeviceLoadTest() for (y = 0 ; y < ddsd.dwHeight; y++) { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * ddsd.lPitch); + DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); for (x = 0; x < ddsd.dwWidth; x++) {

1 0

Paul Vriens : shell32/tests: SHGetPathFromIDListA returns a BOOL not a HRESULT.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: 7361e91fdd1aa690f34a9e52be08f0aab7b69e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7361e91fdd1aa690f34a9e52b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue May 20 11:24:38 2008 +0200 shell32/tests: SHGetPathFromIDListA returns a BOOL not a HRESULT. --- dlls/shell32/tests/shelllink.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index fe923d3..ec3481a 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -178,12 +178,14 @@ static void test_get_set(void) ok(SUCCEEDED(r), "GetIDList failed (0x%08x)\n", r); if (SUCCEEDED(r)) { + BOOL ret; + strcpy(buffer,"garbage"); - r=SHGetPathFromIDListA(tmp_pidl, buffer); + ret = SHGetPathFromIDListA(tmp_pidl, buffer); todo_wine { - ok(r, "SHGetPathFromIDListA failed\n"); + ok(ret, "SHGetPathFromIDListA failed\n"); } - if (r) + if (ret) ok(lstrcmpi(buffer,str)==0, "GetIDList returned '%s'\n", buffer); }

1 0

Michael Karcher : ole32/tests: Test StringFromGUID2.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: 3d5ea201908ad1b2af1d22c1fe02af7161b2df6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5ea201908ad1b2af1d22c1f… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue May 20 09:23:46 2008 +0200 ole32/tests: Test StringFromGUID2. --- dlls/ole32/tests/compobj.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ad0a4cf..191424d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -197,6 +197,27 @@ static void test_CLSIDFromString(void) ok(IsEqualCLSID(&clsid, &CLSID_NULL), "clsid wasn't equal to CLSID_NULL\n"); } +static void test_StringFromGUID2(void) +{ + WCHAR str[50]; + int len; + /* Test corner cases for buffer size */ + len = StringFromGUID2(&CLSID_CDeviceMoniker,str,50); + ok(len == 39, "len: %d (expected 39)",len); + ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); + + memset(str,0,sizeof str); + len = StringFromGUID2(&CLSID_CDeviceMoniker,str,39); + ok(len == 39, "len: %d (expected 39)",len); + ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); + + len = StringFromGUID2(&CLSID_CDeviceMoniker,str,38); + ok(len == 0, "len: %d (expected 0)",len); + + len = StringFromGUID2(&CLSID_CDeviceMoniker,str,30); + ok(len == 0, "len: %d (expected 0)",len); +} + static void test_CoCreateInstance(void) { REFCLSID rclsid = &CLSID_MyComputer; @@ -1008,6 +1029,7 @@ START_TEST(compobj) test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString(); + test_StringFromGUID2(); test_CoCreateInstance(); test_ole_menu(); test_CoGetClassObject();

1 0

Michael Karcher : ole32/tests: Do not call Release if CoCreateInstance failed.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: a2880cc61ddccedb40f696e15d0627db74f6efff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2880cc61ddccedb40f696e15… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue May 20 09:23:00 2008 +0200 ole32/tests: Do not call Release if CoCreateInstance failed. --- dlls/ole32/tests/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 89cf9b9..ad0a4cf 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -208,7 +208,7 @@ static void test_CoCreateInstance(void) OleInitialize(NULL); hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok_ole_success(hr, "CoCreateInstance"); - IUnknown_Release(pUnk); + if(pUnk) IUnknown_Release(pUnk); OleUninitialize(); hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk);

1 0