November 2007 - Wine-commits

David Adam : d3dx8: Implement D3XMatrixInverse.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 43643072da6a5a22990f73e0ca44a318e29588a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43643072da6a5a22990f73e0c… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Nov 11 17:16:22 2007 +0100 d3dx8: Implement D3XMatrixInverse. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 15 ++++++++++++++- include/d3dx8math.h | 1 + 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 3d69e20..391da82 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -23,7 +23,7 @@ @ stdcall D3DXMatrixfDeterminant(ptr) @ stdcall D3DXMatrixMultiply(ptr ptr ptr) @ stdcall D3DXMatrixTranspose(ptr ptr) -@ stub D3DXMatrixInverse +@ stdcall D3DXMatrixInverse(ptr ptr ptr) @ stdcall D3DXMatrixScaling(ptr long long long) @ stdcall D3DXMatrixTranslation(ptr long long long) @ stdcall D3DXMatrixRotationX(ptr long) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index e3d565e..6179dde 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -47,6 +47,45 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm) return det; } +D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm) +{ + int a, i, j; + D3DXVECTOR4 v, vec[3]; + FLOAT cofactor, det; + + det = D3DXMatrixfDeterminant(pm); + if ( !det ) return NULL; + if ( pdeterminant ) *pdeterminant = det; + for (i=0; i<4; i++) + { + for (j=0; j<4; j++) + { + if (j != i ) + { + a = j; + if ( j > i ) a = a-1; + vec[a].x = pm->u.m[j][0]; + vec[a].y = pm->u.m[j][1]; + vec[a].z = pm->u.m[j][2]; + vec[a].w = pm->u.m[j][3]; + } + } + D3DXVec4Cross(&v, &vec[0], &vec[1], &vec[2]); + for (j=0; j<4; j++) + { + switch(j) + { + case 0: cofactor = v.x; break; + case 1: cofactor = v.y; break; + case 2: cofactor = v.z; break; + case 3: cofactor = v.w; break; + } + pout->u.m[j][i] = pow(-1.0f, i) * cofactor / det; + } + } + return pout; +} + D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup) { D3DXVECTOR3 right, rightn, up, upn, vec, vec2; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index a82c7fe..a796c6e 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -149,10 +149,11 @@ static void D3DXColorTest(void) static void D3DXMatrixTest(void) { D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; + LPD3DXMATRIX funcpointer; D3DXQUATERNION q; D3DXVECTOR3 at, axis, eye; BOOL expected, got; - FLOAT angle, expectedfloat, gotfloat; + FLOAT angle, determinant, expectedfloat, gotfloat; U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; @@ -181,6 +182,18 @@ static void D3DXMatrixTest(void) gotfloat = D3DXMatrixfDeterminant(&mat); ok(fabs( gotfloat - expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, gotfloat); +/*____________D3DXMatrixInverse______________*/ + expectedmat.m[0][0] = 16067.0f/73944.0f; expectedmat.m[0][1] = -10165.0f/147888.0f; expectedmat.m[0][2] = -2729.0f/147888.0f; expectedmat.m[0][3] = -1631.0f/49296.0f; + expectedmat.m[1][0] = -565.0f/36972.0f; expectedmat.m[1][1] = 2723.0f/73944.0f; expectedmat.m[1][2] = -1073.0f/73944.0f; expectedmat.m[1][3] = 289.0f/24648.0f; + expectedmat.m[2][0] = -389.0f/2054.0f; expectedmat.m[2][1] = 337.0f/4108.0f; expectedmat.m[2][2] = 181.0f/4108.0f; expectedmat.m[2][3] = 317.0f/4108.0f; + expectedmat.m[3][0] = 163.0f/5688.0f; expectedmat.m[3][1] = -101.0f/11376.0f; expectedmat.m[3][2] = -73.0f/11376.0f; expectedmat.m[3][3] = -127.0f/3792.0f; + expectedfloat = -147888.0f; + D3DXMatrixInverse(&gotmat,&determinant,&mat); + expect_mat(expectedmat,gotmat); + ok(fabs( determinant - expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, determinant); + funcpointer = D3DXMatrixInverse(&gotmat,NULL,&mat2); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*____________D3DXMatrixIsIdentity______________*/ expected = FALSE; got = D3DXMatrixIsIdentity(&mat3); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 40081fd..2d236df 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -260,6 +260,7 @@ typedef struct D3DXCOLOR } D3DXCOLOR, *LPD3DXCOLOR; FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm); +D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup); D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup); D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2);

1 0

Detlef Riekenberg : shell32: Some undocumented defines and functions are now in the PSDK.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: cb113b23c4602c60d0bc4f72935b978cedf66412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb113b23c4602c60d0bc4f729… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 11 20:19:15 2007 +0100 shell32: Some undocumented defines and functions are now in the PSDK. --- dlls/shell32/undocshell.h | 18 ------------------ include/shlobj.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 5bba7da..941e7b3 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -411,11 +411,6 @@ BOOL WINAPI PathMakeUniqueNameAW( LPCVOID lpszLongName, LPCVOID lpszPathName); -BOOL WINAPI PathYetAnotherMakeUniqueName( - LPWSTR lpszBuffer, - LPCWSTR lpszPathName, - LPCWSTR lpszShortName, - LPCWSTR lpszLongName); BOOL WINAPI PathQualifyA(LPCSTR path); BOOL WINAPI PathQualifyW(LPCWSTR path); @@ -423,23 +418,10 @@ BOOL WINAPI PathQualifyW(LPCWSTR path); BOOL WINAPI PathQualifyAW(LPCVOID path); -/* PathResolve flags */ -#define PRF_CHECKEXISTANCE 0x01 -#define PRF_EXECUTABLE 0x02 -#define PRF_QUALIFYONPATH 0x04 -#define PRF_WINDOWS31 0x08 - BOOL WINAPI PathResolveAW(LPVOID lpszPath, LPCVOID *alpszPaths, DWORD dwFlags); VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int nIDDlgItem, LPCVOID lpszPath); -/* PathProcessCommand flags */ -#define PPCF_QUOTEPATH 0x01 /* implies PPCF_INCLUDEARGS */ -#define PPCF_INCLUDEARGS 0x02 -#define PPCF_NODIRECTORIES 0x10 -#define PPCF_DONTRESOLVE 0x20 -#define PPCF_PATHISRELATIVE 0x40 - HRESULT WINAPI PathProcessCommandAW(LPCVOID lpszPath, LPVOID lpszBuff, DWORD dwBuffSize, DWORD dwFlags); diff --git a/include/shlobj.h b/include/shlobj.h index bd531c8..f57883a 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1292,8 +1292,26 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *); /**************************************************************************** * Path Manipulation Routines */ + +/* PathProcessCommand flags */ +#define PPCF_ADDQUOTES 0x01 +#define PPCF_INCLUDEARGS 0x02 +#define PPCF_ADDARGUMENTS 0x03 +#define PPCF_NODIRECTORIES 0x10 +#define PPCF_DONTRESOLVE 0x20 +#define PPCF_FORCEQUALIFY 0x40 +#define PPCF_LONGESTPOSSIBLE 0x80 + +/* PathResolve flags */ +#define PRF_VERIFYEXISTS 0x01 +#define PRF_EXECUTABLE 0x02 +#define PRF_TRYPROGRAMEXTENSIONS 0x03 +#define PRF_FIRSTDIRDEF 0x04 +#define PRF_DONTFINDLINK 0x08 + VOID WINAPI PathGetShortPath(LPWSTR pszPath); LONG WINAPI PathProcessCommand(LPCWSTR, LPWSTR, int, DWORD); +BOOL WINAPI PathYetAnotherMakeUniqueName(LPWSTR, LPCWSTR, LPCWSTR, LPCWSTR); /**************************************************************************** * Drag And Drop Routines

1 0

Hans Leidekker : kernel32: Loosen requirements on what QueryDosDevice returns.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: addf895c879342bf92d302ee2b033714d39bb5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addf895c879342bf92d302ee2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Nov 11 16:05:09 2007 +0100 kernel32: Loosen requirements on what QueryDosDevice returns. --- dlls/kernel32/tests/volume.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b673947..0811ce5 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -21,12 +21,6 @@ #include "wine/test.h" #include "winbase.h" -#define CDROM "CDROM" -#define FLOPPY "FLOPPY" -#define HARDISK "HARDDISK" -#define LANMAN "LANMANREDIRECTOR" -#define RAMDISK "RAMDISK" - static HINSTANCE hdll; static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointW)(LPCWSTR, LPWSTR, DWORD); @@ -38,17 +32,16 @@ static void test_query_dos_deviceA(void) char drivestr[] = "a:"; char *p, buffer[2000]; DWORD ret; + BOOL found = FALSE; + for (;drivestr[0] <= 'z'; drivestr[0]++) { ret = QueryDosDeviceA( drivestr, buffer, sizeof(buffer)); if(ret) { for (p = buffer; *p; p++) *p = toupper(*p); - todo_wine - ok( strstr( buffer, CDROM) || strstr( buffer, FLOPPY) || - strstr( buffer, HARDISK) || strstr( buffer, LANMAN) || - strstr( buffer, RAMDISK), "expect the string %s contains %s,%s,%s,%s or %s\n", - buffer, CDROM, FLOPPY, HARDISK, LANMAN, RAMDISK); + if (strstr(buffer, "HARDDISK") || strstr(buffer, "RAMDISK")) found = TRUE; } } + todo_wine ok(found, "expected at least one devicename to contain HARDDISK or RAMDISK\n"); } static void test_GetVolumeNameForVolumeMountPointA(void)

1 0

Juan Lang : rsaenh: Check pad bytes for consistency when decrypting.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: f6833c4d096f9f9ceedef77c8d9bf63edaf74ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6833c4d096f9f9ceedef77c8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 11 12:33:09 2007 -0800 rsaenh: Check pad bytes for consistency when decrypting. --- dlls/rsaenh/rsaenh.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4bb64ab..7dc1cf2 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2127,8 +2127,20 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, if (Final) { if (pbData[*pdwDataLen-1] && pbData[*pdwDataLen-1] <= pCryptKey->dwBlockLen && - pbData[*pdwDataLen-1] < *pdwDataLen) - *pdwDataLen -= pbData[*pdwDataLen-1]; + pbData[*pdwDataLen-1] < *pdwDataLen) { + BOOL padOkay = TRUE; + + /* check that every bad byte has the same value */ + for (i = 1; padOkay && i < pbData[*pdwDataLen-1]; i++) + if (pbData[*pdwDataLen - i - 1] != pbData[*pdwDataLen - 1]) + padOkay = FALSE; + if (padOkay) + *pdwDataLen -= pbData[*pdwDataLen-1]; + else { + SetLastError(NTE_BAD_DATA); + return FALSE; + } + } else { SetLastError(NTE_BAD_DATA); return FALSE;

1 0

Maarten Lankhorst : dsound: Return primary_done when no mixing needs to be done instead of 0.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 8de6c8b4a97389475a36b494bca037ac1c596ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de6c8b4a97389475a36b494b… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Sat Nov 10 20:15:21 2007 +0100 dsound: Return primary_done when no mixing needs to be done instead of 0. --- dlls/dsound/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 6598b03..7c570bc 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -590,7 +590,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi TRACE("primary_done=%d, mixlen (primary) = %i\n", primary_done, mixlen); if (!mixlen) - return 0; + return primary_done; /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization

1 0

Dan Kegel : advapi32: Fix buffer overrun in tests/registry.c: wine_debugstr_wn().
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 89b9af77147cfc5afdb90bafb81228cd9bc4399e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b9af77147cfc5afdb90bafb… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Nov 11 06:33:03 2007 -0800 advapi32: Fix buffer overrun in tests/registry.c:wine_debugstr_wn(). --- dlls/advapi32/tests/registry.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 017dab3..1c50d2a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -56,7 +56,6 @@ static char *get_temp_buffer( int size ) return ret; } -/* default implementation of wine_dbgstr_an */ static const char *wine_debugstr_an( const char *str, int n ) { static const char hex[16] = "0123456789abcdef"; @@ -108,10 +107,10 @@ static const char *wine_debugstr_an( const char *str, int n ) return res; } -/* default implementation of wine_dbgstr_wn */ static const char *wine_debugstr_wn( const WCHAR *str, int n ) { char *dst, *res; + size_t size; if (!HIWORD(str)) { @@ -122,11 +121,11 @@ static const char *wine_debugstr_wn( const WCHAR *str, int n ) } if (n == -1) n = lstrlenW(str); if (n < 0) n = 0; - else if (n > 200) n = 200; + size = 12 + min( 300, n * 5); dst = res = get_temp_buffer( n * 5 + 7 ); *dst++ = 'L'; *dst++ = '"'; - while (n-- > 0) + while (n-- > 0 && dst <= res + size - 10) { WCHAR c = *str++; switch (c) @@ -148,7 +147,7 @@ static const char *wine_debugstr_wn( const WCHAR *str, int n ) } } *dst++ = '"'; - if (*str) + if (n > 0) { *dst++ = '.'; *dst++ = '.';

1 0

Maarten Lankhorst : dsound: Reassign pointers back to null when destroying structure.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 8c3f9c8c7efc6a2b183e941ed753a9a7e0579753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3f9c8c7efc6a2b183e941ed… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Sun Nov 11 16:00:41 2007 +0100 dsound: Reassign pointers back to null when destroying structure. --- dlls/dsound/dsound.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index ea94713..7b2d5d6 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -359,6 +359,7 @@ static ULONG WINAPI IDirectSound_IUnknown_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { + ((IDirectSoundImpl*)This->pds)->pUnknown = NULL; IDirectSoundImpl_Release(This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); @@ -437,6 +438,7 @@ static ULONG WINAPI IDirectSound_IDirectSound_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { + ((IDirectSoundImpl*)This->pds)->pDS = NULL; IDirectSoundImpl_Release(This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); @@ -598,6 +600,7 @@ static ULONG WINAPI IDirectSound8_IUnknown_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { + ((IDirectSoundImpl*)This->pds)->pUnknown = NULL; IDirectSoundImpl_Release(This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); @@ -676,6 +679,7 @@ static ULONG WINAPI IDirectSound8_IDirectSound_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { + ((IDirectSoundImpl*)This->pds)->pDS = NULL; IDirectSoundImpl_Release(This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); @@ -837,6 +841,7 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { + ((IDirectSoundImpl*)This->pds)->pDS8 = NULL; IDirectSoundImpl_Release(This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This);

1 0

Rob Shearman : ntdll: Initialise the part of the buffer to be written to a file in the file test .
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 6c8ed9efbed5c4fb644de6af774e4e71379ef2db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8ed9efbed5c4fb644de6af7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Nov 11 13:56:50 2007 +0000 ntdll: Initialise the part of the buffer to be written to a file in the file test. --- dlls/ntdll/tests/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index af143f2..f182719 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -101,6 +101,8 @@ static void read_file_test(void) LARGE_INTEGER offset; HANDLE event = CreateEventA( NULL, TRUE, FALSE, NULL ); + buffer[0] = 1; + if (!create_pipe( &read, &write, FILE_FLAG_OVERLAPPED, 4096 )) return; /* try read with no data */

1 0

Rob Shearman : server: In set_user_object_info len is in bytes, not WCHARs.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 6d113489631fe4301fa194d1590146aaef673903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d113489631fe4301fa194d15… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Nov 11 12:28:18 2007 +0000 server: In set_user_object_info len is in bytes, not WCHARs. --- server/winstation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 5755ba9..55e72ab 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -596,7 +596,7 @@ DECL_HANDLER(set_user_object_info) const WCHAR *ptr, *name = get_object_name( obj, &len ); /* if there is a backslash return the part of the name after it */ - if (name && (ptr = memchrW( name, '\\', len ))) + if (name && (ptr = memchrW( name, '\\', len/sizeof(WCHAR) ))) { len -= (ptr + 1 - name) * sizeof(WCHAR); name = ptr + 1;

1 0

Rob Shearman : oleaut32: Handle non-byref safe arrays in VARIANT_UserFree.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 6539b3801d983491034526d63d3e1b544acf706b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6539b3801d983491034526d63… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Nov 11 12:28:41 2007 +0000 oleaut32: Handle non-byref safe arrays in VARIANT_UserFree. --- dlls/oleaut32/usrmarshal.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 49381b3..3f84fab 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -661,7 +661,12 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar) if (!ref) return; if(vt & VT_ARRAY) - LPSAFEARRAY_UserFree(pFlags, V_ARRAYREF(pvar)); + { + if (vt & VT_BYREF) + LPSAFEARRAY_UserFree(pFlags, V_ARRAYREF(pvar)); + else + LPSAFEARRAY_UserFree(pFlags, &V_ARRAY(pvar)); + } else { switch (vt)

1 0